allow classes derived from wxTopLevelWidnow to use other GTK widget than GtkWindow
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27543 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
3c5487b144
commit
63c5efa344
@ -345,6 +345,10 @@ bool wxTopLevelWindowGTK::Create( wxWindow *parent,
|
||||
|
||||
m_insertCallback = (wxInsertChildFunction) wxInsertChildInTopLevelWindow;
|
||||
|
||||
// NB: m_widget may be !=NULL if it was created by derived class' Create,
|
||||
// e.g. in wxTaskBarIconAreaGTK
|
||||
if (m_widget == NULL)
|
||||
{
|
||||
GtkWindowType win_type = GTK_WINDOW_TOPLEVEL;
|
||||
|
||||
if (style & wxFRAME_TOOL_WINDOW)
|
||||
@ -361,6 +365,7 @@ bool wxTopLevelWindowGTK::Create( wxWindow *parent,
|
||||
}
|
||||
|
||||
m_widget = gtk_window_new( win_type );
|
||||
}
|
||||
|
||||
if (m_parent && (((GTK_IS_WINDOW(m_parent->m_widget)) &&
|
||||
(GetExtraStyle() & wxTOPLEVEL_EX_DIALOG)) ||
|
||||
|
@ -345,6 +345,10 @@ bool wxTopLevelWindowGTK::Create( wxWindow *parent,
|
||||
|
||||
m_insertCallback = (wxInsertChildFunction) wxInsertChildInTopLevelWindow;
|
||||
|
||||
// NB: m_widget may be !=NULL if it was created by derived class' Create,
|
||||
// e.g. in wxTaskBarIconAreaGTK
|
||||
if (m_widget == NULL)
|
||||
{
|
||||
GtkWindowType win_type = GTK_WINDOW_TOPLEVEL;
|
||||
|
||||
if (style & wxFRAME_TOOL_WINDOW)
|
||||
@ -361,6 +365,7 @@ bool wxTopLevelWindowGTK::Create( wxWindow *parent,
|
||||
}
|
||||
|
||||
m_widget = gtk_window_new( win_type );
|
||||
}
|
||||
|
||||
if (m_parent && (((GTK_IS_WINDOW(m_parent->m_widget)) &&
|
||||
(GetExtraStyle() & wxTOPLEVEL_EX_DIALOG)) ||
|
||||
|
Loading…
Reference in New Issue
Block a user