X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/94f145095605aa3aafaab289b9d3e1630587f821..bd996abe63a8ed6aa07b26856a0d7935002e3e81:/src/gtk1/frame.cpp diff --git a/src/gtk1/frame.cpp b/src/gtk1/frame.cpp index 48b191aaa0..acad4c3355 100644 --- a/src/gtk1/frame.cpp +++ b/src/gtk1/frame.cpp @@ -216,7 +216,7 @@ bool wxFrame::Create( wxWindow *parent, long style, const wxString &name ) { - bool rt = wxTopLevelWindow::Create(parent, id, title, pos, sizeOrig, + bool rt = wxTopLevelWindow::Create(parent, id, title, pos, sizeOrig, style, name); m_insertCallback = (wxInsertChildFunction) wxInsertChildInFrame; return rt; @@ -235,7 +235,7 @@ wxFrame::~wxFrame() void wxFrame::DoGetClientSize( int *width, int *height ) const { wxASSERT_MSG( (m_widget != NULL), wxT("invalid frame") ); - + wxTopLevelWindow::DoGetClientSize( width, height ); if (height) @@ -253,7 +253,7 @@ void wxFrame::DoGetClientSize( int *width, int *height ) const #if wxUSE_STATUSBAR // status bar - if (m_frameStatusBar && m_frameStatusBar->IsShown()) + if (m_frameStatusBar && m_frameStatusBar->IsShown()) (*height) -= wxSTATUS_HEIGHT; #endif // wxUSE_STATUSBAR @@ -443,7 +443,7 @@ void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), ww = m_width - 2*m_miniEdge; hh = m_toolBarDetached ? wxPLACE_HOLDER : m_frameToolBar->m_height; - + client_area_y_offset += hh; } @@ -581,7 +581,7 @@ void wxFrame::AttachMenuBar( wxMenuBar *menuBar ) } // resize window in OnInternalIdle - m_sizeSet = FALSE; + GtkUpdateSize(); } #endif // wxUSE_MENUS_NATIVE @@ -598,7 +598,7 @@ wxToolBar* wxFrame::CreateToolBar( long style, wxWindowID id, const wxString& na m_insertInClientArea = TRUE; - m_sizeSet = FALSE; + GtkUpdateSize(); return m_frameToolBar; } @@ -643,7 +643,7 @@ wxStatusBar* wxFrame::CreateStatusBar(int number, wxASSERT_MSG( (m_widget != NULL), wxT("invalid frame") ); // because it will change when toolbar is added - m_sizeSet = FALSE; + GtkUpdateSize(); return wxFrameBase::CreateStatusBar( number, style, id, name ); } @@ -653,7 +653,7 @@ void wxFrame::PositionStatusBar() if ( !m_frameStatusBar ) return; - m_sizeSet = FALSE; + GtkUpdateSize(); } #endif // wxUSE_STATUSBAR