X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/519cb848a8f4c91c73421bb75314754284e593a4..7b9da2077d0975db6c965a85c91d5aca671ab5e3:/src/mac/frame.cpp diff --git a/src/mac/frame.cpp b/src/mac/frame.cpp index 5a95ac9097..6e98062322 100644 --- a/src/mac/frame.cpp +++ b/src/mac/frame.cpp @@ -52,13 +52,12 @@ wxFrame::wxFrame() #if wxUSE_TOOLBAR m_frameToolBar = NULL ; #endif - m_macShown = false ; + // in order to be able to give size events on show m_frameMenuBar = NULL; m_frameStatusBar = NULL; - - m_windowParent = NULL; m_iconized = FALSE; + m_isShown = FALSE; } bool wxFrame::Create(wxWindow *parent, @@ -75,6 +74,7 @@ bool wxFrame::Create(wxWindow *parent, SetName(name); m_windowStyle = style; m_frameMenuBar = NULL; + m_isShown = FALSE; #if wxUSE_TOOLBAR m_frameToolBar = NULL ; @@ -147,7 +147,6 @@ bool wxFrame::Create(wxWindow *parent, UMACreateRootControl( m_macWindowData->m_macWindow , &m_macWindowData->m_macRootControl ) ; m_macWindowData->m_macWindowBackgroundTheme = kThemeBrushDocumentWindowBackground ; m_macWindowData->m_macFocus = NULL ; - m_macShown = false ; return TRUE; } @@ -491,9 +490,9 @@ wxPoint wxFrame::GetClientAreaOrigin() const return pt; } -void wxFrame::GetClientSize(int *x, int *y) const +void wxFrame::DoGetClientSize(int *x, int *y) const { - wxWindow::GetClientSize( x , y ) ; + wxWindow::DoGetClientSize( x , y ) ; if ( GetStatusBar() ) {