VTK wrapper of vtkRenderWindow for wxPython. Tested on MSW so far.

[wxWidgets.git] / src / mac / frame.cpp

diff --git a/src/mac/frame.cpp b/src/mac/frame.cpp
index 5a95ac9097692e320a1deb4e203e48418191feea..6e980623227a8a9dff1ef80b47f26d6a7e8805c6 100644 (file)
--- a/src/mac/frame.cpp
+++ b/src/mac/frame.cpp
@@ -52,13 +52,12 @@ wxFrame::wxFrame()
 #if wxUSE_TOOLBAR
   m_frameToolBar = NULL ;
 #endif
 #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;
        // in order to be able to give size events on show
   m_frameMenuBar = NULL;
   m_frameStatusBar = NULL;

-
-  m_windowParent = NULL;

   m_iconized = FALSE;
   m_iconized = FALSE;

+  m_isShown = FALSE;

 }
 
 bool wxFrame::Create(wxWindow *parent,
 }
 
 bool wxFrame::Create(wxWindow *parent,


@@ -75,6 +74,7 @@ bool wxFrame::Create(wxWindow *parent,
   SetName(name);
   m_windowStyle = style;
   m_frameMenuBar = NULL;
   SetName(name);
   m_windowStyle = style;
   m_frameMenuBar = NULL;

+  m_isShown = FALSE;

 
 #if wxUSE_TOOLBAR
   m_frameToolBar = NULL ;
 
 #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 ;
        UMACreateRootControl( m_macWindowData->m_macWindow , &m_macWindowData->m_macRootControl ) ;
        m_macWindowData->m_macWindowBackgroundTheme = kThemeBrushDocumentWindowBackground ;
        m_macWindowData->m_macFocus = NULL ;

-       m_macShown = false ;

   return TRUE;
 }
 
   return TRUE;
 }
 


@@ -491,9 +490,9 @@ wxPoint wxFrame::GetClientAreaOrigin() const
     return pt;
 }
 
     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() )
   {
 
   if ( GetStatusBar() )
   {