diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2013-04-20 23:37:10 -0400 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2013-04-20 23:37:10 -0400 |
| commit | 1507ba79ec9f4b25686222b6eaed33d50cdcb7cc (patch) | |
| tree | 161fa3bb6ef31a9330445ced189241cc82c7e7fb /gtk/gtkapplicationwindow.c | |
| parent | 2d84ebeeb8aa111f263632139023f31f6ee329dd (diff) | |
| download | gtk+-1507ba79ec9f4b25686222b6eaed33d50cdcb7cc.tar.gz | |
csd: Drop content_window
Instead of reparenting the content, use input-only windows to
set cursors and capture clicks on the window frame. This avoids
some of the problems that were introduced by content_window, such
as black flashes and non-working opacity.
Diffstat (limited to 'gtk/gtkapplicationwindow.c')
| -rw-r--r-- | gtk/gtkapplicationwindow.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/gtk/gtkapplicationwindow.c b/gtk/gtkapplicationwindow.c index 532c1d4717..541baf6a03 100644 --- a/gtk/gtkapplicationwindow.c +++ b/gtk/gtkapplicationwindow.c @@ -258,9 +258,6 @@ gtk_application_window_update_menubar (GtkApplicationWindow *window) window->priv->menubar = gtk_menu_bar_new_from_model (G_MENU_MODEL (combined)); gtk_widget_set_parent (window->priv->menubar, GTK_WIDGET (window)); - if (_gtk_window_get_content_window (GTK_WINDOW (window)) != NULL) - gtk_widget_set_parent_window (window->priv->menubar, - _gtk_window_get_content_window (GTK_WINDOW (window))); gtk_widget_show_all (window->priv->menubar); g_object_unref (combined); @@ -763,10 +760,6 @@ gtk_application_window_real_realize (GtkWidget *widget) GTK_WIDGET_CLASS (gtk_application_window_parent_class) ->realize (widget); - if (window->priv->menubar != NULL) - gtk_widget_set_parent_window (window->priv->menubar, - _gtk_window_get_content_window (GTK_WINDOW (window))); - #ifdef GDK_WINDOWING_X11 { GdkWindow *gdkwindow; |