diff --git a/src/gtk/toplevel.cpp b/src/gtk/toplevel.cpp index 04bb0b4ca0..b91b944750 100644 --- a/src/gtk/toplevel.cpp +++ b/src/gtk/toplevel.cpp @@ -345,22 +345,27 @@ bool wxTopLevelWindowGTK::Create( wxWindow *parent, m_insertCallback = (wxInsertChildFunction) wxInsertChildInTopLevelWindow; - GtkWindowType win_type = GTK_WINDOW_TOPLEVEL; - - if (style & wxFRAME_TOOL_WINDOW) - win_type = GTK_WINDOW_POPUP; - - if (GetExtraStyle() & wxTOPLEVEL_EX_DIALOG) + // NB: m_widget may be !=NULL if it was created by derived class' Create, + // e.g. in wxTaskBarIconAreaGTK + if (m_widget == NULL) { - // there is no more GTK_WINDOW_DIALOG in 2.0 -#ifdef __WXGTK20__ - win_type = GTK_WINDOW_TOPLEVEL; -#else - win_type = GTK_WINDOW_DIALOG; -#endif - } + GtkWindowType win_type = GTK_WINDOW_TOPLEVEL; - m_widget = gtk_window_new( win_type ); + if (style & wxFRAME_TOOL_WINDOW) + win_type = GTK_WINDOW_POPUP; + + if (GetExtraStyle() & wxTOPLEVEL_EX_DIALOG) + { + // there is no more GTK_WINDOW_DIALOG in 2.0 +#ifdef __WXGTK20__ + win_type = GTK_WINDOW_TOPLEVEL; +#else + win_type = GTK_WINDOW_DIALOG; +#endif + } + + m_widget = gtk_window_new( win_type ); + } if (m_parent && (((GTK_IS_WINDOW(m_parent->m_widget)) && (GetExtraStyle() & wxTOPLEVEL_EX_DIALOG)) || diff --git a/src/gtk1/toplevel.cpp b/src/gtk1/toplevel.cpp index 04bb0b4ca0..b91b944750 100644 --- a/src/gtk1/toplevel.cpp +++ b/src/gtk1/toplevel.cpp @@ -345,22 +345,27 @@ bool wxTopLevelWindowGTK::Create( wxWindow *parent, m_insertCallback = (wxInsertChildFunction) wxInsertChildInTopLevelWindow; - GtkWindowType win_type = GTK_WINDOW_TOPLEVEL; - - if (style & wxFRAME_TOOL_WINDOW) - win_type = GTK_WINDOW_POPUP; - - if (GetExtraStyle() & wxTOPLEVEL_EX_DIALOG) + // NB: m_widget may be !=NULL if it was created by derived class' Create, + // e.g. in wxTaskBarIconAreaGTK + if (m_widget == NULL) { - // there is no more GTK_WINDOW_DIALOG in 2.0 -#ifdef __WXGTK20__ - win_type = GTK_WINDOW_TOPLEVEL; -#else - win_type = GTK_WINDOW_DIALOG; -#endif - } + GtkWindowType win_type = GTK_WINDOW_TOPLEVEL; - m_widget = gtk_window_new( win_type ); + if (style & wxFRAME_TOOL_WINDOW) + win_type = GTK_WINDOW_POPUP; + + if (GetExtraStyle() & wxTOPLEVEL_EX_DIALOG) + { + // there is no more GTK_WINDOW_DIALOG in 2.0 +#ifdef __WXGTK20__ + win_type = GTK_WINDOW_TOPLEVEL; +#else + win_type = GTK_WINDOW_DIALOG; +#endif + } + + m_widget = gtk_window_new( win_type ); + } if (m_parent && (((GTK_IS_WINDOW(m_parent->m_widget)) && (GetExtraStyle() & wxTOPLEVEL_EX_DIALOG)) ||