fixing notifications

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

diff --git a/src/mac/carbon/frame.cpp b/src/mac/carbon/frame.cpp
index b327bfa9bfcfad096822d7a0f7881140d0b04cfa..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 = 0 ;
+    int statusY = 0 ;
 
+#if wxUSE_STATUSBAR
     if (GetStatusBar() && GetStatusBar()->IsShown())
     {
-        int statusX, statusY;
-
         GetStatusBar()->GetClientSize(&statusX, &statusY);
         ch -= statusY;
     }
+#endif
 
+#if wxUSE_TOOLBAR
     if (GetToolBar())
     {
         int tx, ty, tw, th;
@@ -366,11 +370,14 @@ void wxFrame::PositionToolBar()
             // have the original client size.
             GetToolBar()->SetSize(tx , ty , tw, ch , wxSIZE_NO_ADJUSTMENTS );
         }
-        else if (GetToolBar->GetWindowStyleFlag() & wxTB_BOTTOM)
+        else if (GetToolBar()->GetWindowStyleFlag() & wxTB_BOTTOM)
         {
+            //FIXME: this positions the tool bar almost correctly, but still it doesn't work right yet,
+            //as 1) the space for the 'old' top toolbar is still taken up, and 2) the toolbar
+            //doesn't extend it's width to the width of the frame.
             tx = 0;
-            ty = statusY - th;
-                        GetToolBar->SetSize(tx, ty, cw, th, wxSIZE_NO_ADJUSTMENTS );
+            ty = ch - (th + statusY);
+            GetToolBar()->SetSize(tx, ty, cw, th, wxSIZE_NO_ADJUSTMENTS );
         }
         else
         {
@@ -380,6 +387,7 @@ void wxFrame::PositionToolBar()
 #endif
         }
     }
+#endif
 }
 
 void wxFrame::PositionBars()