Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

allow classes derived from wxTopLevelWidnow to use other GTK widget than GtkWindow

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27543 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2004-05-31 22:10:37 +00:00
parent 3c5487b144
commit 63c5efa344
2 changed files with 38 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/gtk/toplevel.cpp
View File

@@ -345,22 +345,27 @@ bool wxTopLevelWindowGTK::Create( wxWindow *parent,
m_insertCallback = (wxInsertChildFunction) wxInsertChildInTopLevelWindow; m_insertCallback = (wxInsertChildFunction) wxInsertChildInTopLevelWindow;
GtkWindowType win_type = GTK_WINDOW_TOPLEVEL; // NB: m_widget may be !=NULL if it was created by derived class' Create,
// e.g. in wxTaskBarIconAreaGTK
if (style & wxFRAME_TOOL_WINDOW) if (m_widget == NULL)
win_type = GTK_WINDOW_POPUP;
if (GetExtraStyle() & wxTOPLEVEL_EX_DIALOG)
{ {
// there is no more GTK_WINDOW_DIALOG in 2.0 GtkWindowType win_type = GTK_WINDOW_TOPLEVEL;
#ifdef __WXGTK20__
win_type = GTK_WINDOW_TOPLEVEL;
#else
win_type = GTK_WINDOW_DIALOG;
#endif
}
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)) && if (m_parent && (((GTK_IS_WINDOW(m_parent->m_widget)) &&
(GetExtraStyle() & wxTOPLEVEL_EX_DIALOG)) || (GetExtraStyle() & wxTOPLEVEL_EX_DIALOG)) ||

33
src/gtk1/toplevel.cpp
View File

@@ -345,22 +345,27 @@ bool wxTopLevelWindowGTK::Create( wxWindow *parent,
m_insertCallback = (wxInsertChildFunction) wxInsertChildInTopLevelWindow; m_insertCallback = (wxInsertChildFunction) wxInsertChildInTopLevelWindow;
GtkWindowType win_type = GTK_WINDOW_TOPLEVEL; // NB: m_widget may be !=NULL if it was created by derived class' Create,
// e.g. in wxTaskBarIconAreaGTK
if (style & wxFRAME_TOOL_WINDOW) if (m_widget == NULL)
win_type = GTK_WINDOW_POPUP;
if (GetExtraStyle() & wxTOPLEVEL_EX_DIALOG)
{ {
// there is no more GTK_WINDOW_DIALOG in 2.0 GtkWindowType win_type = GTK_WINDOW_TOPLEVEL;
#ifdef __WXGTK20__
win_type = GTK_WINDOW_TOPLEVEL;
#else
win_type = GTK_WINDOW_DIALOG;
#endif
}
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)) && if (m_parent && (((GTK_IS_WINDOW(m_parent->m_widget)) &&
(GetExtraStyle() & wxTOPLEVEL_EX_DIALOG)) || (GetExtraStyle() & wxTOPLEVEL_EX_DIALOG)) ||