Fixed apparent typo.

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

diff --git a/src/mac/carbon/frame.cpp b/src/mac/carbon/frame.cpp
index 6bde00fc744d3dd3c670d7a9e6dd2d10c60de2e0..8a589cbf548e3ba33c45d1e7ac3fd89a18cee906 100644 (file)
--- a/src/mac/carbon/frame.cpp
+++ b/src/mac/carbon/frame.cpp
@@ -225,19 +225,6 @@ void wxFrameMac::PositionStatusBar()
    }
 }
 
-void wxFrameMac::SetMenuBar(wxMenuBar *menuBar)
-{
-    if (!menuBar)
-    {
-        return;
-    }
-  
-    m_frameMenuBar = menuBar;
-//    m_frameMenuBar->MacInstallMenuBar() ;
-    m_frameMenuBar->Attach((wxFrame *)this);
-}
-
-
 // Responds to colour changes, and passes event on to children.
 void wxFrameMac::OnSysColourChanged(wxSysColourChangedEvent& event)
 {
@@ -315,7 +302,7 @@ void wxFrameMac::DoGetClientSize(int *x, int *y) const
        wxWindow::DoGetClientSize( x , y ) ;
 
 #if wxUSE_STATUSBAR
-  if ( GetStatusBar() )
+  if ( GetStatusBar() && y )
   {
     int statusX, statusY;
     GetStatusBar()->GetClientSize(&statusX, &statusY);
@@ -324,8 +311,10 @@ void wxFrameMac::DoGetClientSize(int *x, int *y) const
 #endif // wxUSE_STATUSBAR
 
   wxPoint pt(GetClientAreaOrigin());
-  *y -= pt.y;
-  *x -= pt.x;
+  if ( y )
+    *y -= pt.y;
+  if ( x ) 
+    *x -= pt.x;
 }
 
 void wxFrameMac::DoSetClientSize(int clientwidth, int clientheight)