Fixup Blit so it can be used with a source that is a wxBufferedDC,

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

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 statusX, statusY;
-    GetStatusBar()->GetClientSize(&statusX, &statusY);
             
+    int statusX = 0 ;
+    int statusY = 0 ;
+
+#if wxUSE_STATUSBAR
     if (GetStatusBar() && GetStatusBar()->IsShown())
     {
+        GetStatusBar()->GetClientSize(&statusX, &statusY);
         ch -= statusY;
     }
+#endif
 
+#if wxUSE_TOOLBAR
     if (GetToolBar())
     {
         int tx, ty, tw, th;
@@ -383,6 +387,7 @@ void wxFrame::PositionToolBar()
 #endif
         }
     }
+#endif
 }
 
 void wxFrame::PositionBars()