X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/13111b2ac81e694d6b69822dff61838ae66052b2..43b5058d590c7acf58e5f75ec015e717d03830a2:/src/gtk/minifram.cpp?ds=sidebyside diff --git a/src/gtk/minifram.cpp b/src/gtk/minifram.cpp index bdcc5ef8a9..7b0c2ad433 100644 --- a/src/gtk/minifram.cpp +++ b/src/gtk/minifram.cpp @@ -35,8 +35,9 @@ extern bool g_isIdle; // data //----------------------------------------------------------------------------- -extern bool g_blockEventsOnDrag; -extern bool g_blockEventsOnScroll; +extern bool g_blockEventsOnDrag; +extern bool g_blockEventsOnScroll; +extern GtkWidget *wxRootWindow; //----------------------------------------------------------------------------- // local functions @@ -317,12 +318,14 @@ bool wxMiniFrame::Create( wxWindow *parent, wxWindowID id, const wxString &title wxFrame::Create( parent, id, title, pos, size, style, name ); + if ((m_parent) && (GTK_IS_WINDOW(m_parent->m_widget))) + gtk_window_set_transient_for( GTK_WINDOW(m_widget), GTK_WINDOW(m_parent->m_widget) ); + if ((style & wxSYSTEM_MENU) && ((style & wxCAPTION) || (style & wxTINY_CAPTION_HORIZ) || (style & wxTINY_CAPTION_VERT))) { GdkBitmap *mask = (GdkBitmap*) NULL; - GdkWindow *parent = (GdkWindow*) &gdk_root_parent; - GdkPixmap *pixmap = gdk_pixmap_create_from_xpm_d( parent, &mask, NULL, cross_xpm ); + GdkPixmap *pixmap = gdk_pixmap_create_from_xpm_d( wxRootWindow->window, &mask, NULL, cross_xpm ); GtkWidget *pw = gtk_pixmap_new( pixmap, mask ); gdk_bitmap_unref( mask );