X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/00a395425ca9bc2af88f24d56324779c726fba94..db2d879ad4bdd492daee48bf2829760b92d8e50e:/src/gtk/frame.cpp diff --git a/src/gtk/frame.cpp b/src/gtk/frame.cpp index 1f8dcc9d63..ddf2120556 100644 --- a/src/gtk/frame.cpp +++ b/src/gtk/frame.cpp @@ -304,7 +304,7 @@ END_EVENT_TABLE() IMPLEMENT_DYNAMIC_CLASS(wxFrame,wxWindow) -wxFrame::wxFrame() +void wxFrame::Init() { m_frameMenuBar = (wxMenuBar *) NULL; m_frameStatusBar = (wxStatusBar *) NULL; @@ -315,7 +315,6 @@ wxFrame::wxFrame() m_mainWidget = (GtkWidget*) NULL; m_menuBarDetached = FALSE; m_toolBarDetached = FALSE; - m_insertCallback = (wxInsertChildFunction) NULL; m_insertInClientArea = TRUE; } @@ -323,17 +322,8 @@ wxFrame::wxFrame( wxWindow *parent, wxWindowID id, const wxString &title, const wxPoint &pos, const wxSize &size, long style, const wxString &name ) { - m_frameMenuBar = (wxMenuBar *) NULL; - m_frameStatusBar = (wxStatusBar *) NULL; - m_frameToolBar = (wxToolBar *) NULL; - m_sizeSet = FALSE; - m_miniEdge = 0; - m_miniTitle = 0; - m_mainWidget = (GtkWidget*) NULL; - m_menuBarDetached = FALSE; - m_toolBarDetached = FALSE; - m_insertCallback = (wxInsertChildFunction) NULL; - m_insertInClientArea = TRUE; + Init(); + Create( parent, id, title, pos, size, style, name ); } @@ -742,6 +732,14 @@ void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), int width, int height m_resizing = FALSE; } +void wxFrame::MakeModal( bool modal ) +{ + if (modal) + gtk_grab_add( m_widget ); + else + gtk_grab_remove( m_widget ); +} + void wxFrame::OnInternalIdle() { if (!m_sizeSet && GTK_WIDGET_REALIZED(m_wxwindow))