fixed crash when no status bar is present, conditionals around optional parts

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41272 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/mac/carbon/frame.cpp b/src/mac/carbon/frame.cpp
index 47d8fd32cb8c3b3695dc0c345e1ed4e8c0554f12..d414c78a6b70e6d94f0f201e1706a211318f6b86 100644 (file)
--- a/src/mac/carbon/frame.cpp
+++ b/src/mac/carbon/frame.cpp
@@ -344,15 +344,19 @@ void wxFrame::PositionToolBar()
     int cw, ch;
 
     GetSize( &cw , &ch ) ;
     int cw, ch;
 
     GetSize( &cw , &ch ) ;

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

             
             

+    int statusX = 0 ;
+    int statusY = 0 ;
+
+#if wxUSE_STATUSBAR

     if (GetStatusBar() && GetStatusBar()->IsShown())
     {
     if (GetStatusBar() && GetStatusBar()->IsShown())
     {

+        GetStatusBar()->GetClientSize(&statusX, &statusY);

         ch -= statusY;
     }
         ch -= statusY;
     }

+#endif

 
 

+#if wxUSE_TOOLBAR

     if (GetToolBar())
     {
         int tx, ty, tw, th;
     if (GetToolBar())
     {
         int tx, ty, tw, th;


@@ -383,6 +387,7 @@ void wxFrame::PositionToolBar()
 #endif
         }
     }
 #endif
         }
     }

+#endif

 }
 
 void wxFrame::PositionBars()
 }
 
 void wxFrame::PositionBars()