fixed fl makefiles that Julian didn't fix correctly

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

diff --git a/src/mac/frame.cpp b/src/mac/frame.cpp
index 6bde00fc744d3dd3c670d7a9e6dd2d10c60de2e0..fb3d2fee9f79b875a906301a1dff3005d2dabec2 100644 (file)
--- a/src/mac/frame.cpp
+++ b/src/mac/frame.cpp
@@ -315,7 +315,7 @@ void wxFrameMac::DoGetClientSize(int *x, int *y) const
        wxWindow::DoGetClientSize( x , y ) ;
 
 #if wxUSE_STATUSBAR
        wxWindow::DoGetClientSize( x , y ) ;
 
 #if wxUSE_STATUSBAR

-  if ( GetStatusBar() )
+  if ( GetStatusBar() && y )

   {
     int statusX, statusY;
     GetStatusBar()->GetClientSize(&statusX, &statusY);
   {
     int statusX, statusY;
     GetStatusBar()->GetClientSize(&statusX, &statusY);


@@ -324,8 +324,10 @@ void wxFrameMac::DoGetClientSize(int *x, int *y) const
 #endif // wxUSE_STATUSBAR
 
   wxPoint pt(GetClientAreaOrigin());
 #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)
 }
 
 void wxFrameMac::DoSetClientSize(int clientwidth, int clientheight)