X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f80ffb32eb597f7b051ed1705c72b2934eb2eb30..8d3b6b8aa1cc0d2f927cedd36d490d412ed3da29:/src/mac/carbon/frame.cpp

diff --git a/src/mac/carbon/frame.cpp b/src/mac/carbon/frame.cpp
index 10299ff3d2..d7cc70101e 100644
--- a/src/mac/carbon/frame.cpp
+++ b/src/mac/carbon/frame.cpp
@@ -9,10 +9,12 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "frame.h"
 #endif
 
+#include "wx/wxprec.h"
+
 #include "wx/frame.h"
 #include "wx/statusbr.h"
 #include "wx/toolbar.h"
@@ -40,7 +42,7 @@ END_EVENT_TABLE()
 IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxTopLevelWindow)
 #endif
 
-#define WX_MAC_STATUSBAR_HEIGHT 15 
+#define WX_MAC_STATUSBAR_HEIGHT 18 
 // ----------------------------------------------------------------------------
 // creation/destruction
 // ----------------------------------------------------------------------------
@@ -117,7 +119,7 @@ wxStatusBar *wxFrame::OnCreateStatusBar(int number, long style, wxWindowID id,
 
 void wxFrame::PositionStatusBar()
 {
-    if (m_frameStatusBar )
+    if (m_frameStatusBar && m_frameStatusBar->IsShown() )
     {
         int w, h;
         GetClientSize(&w, &h);
@@ -224,7 +226,7 @@ void wxFrame::DoGetClientSize(int *x, int *y) const
     wxTopLevelWindow::DoGetClientSize( x , y ) ;
     
 #if wxUSE_STATUSBAR
-    if ( GetStatusBar() && y )
+    if ( GetStatusBar() && GetStatusBar()->IsShown() && y )
     {
         if ( y) *y -= WX_MAC_STATUSBAR_HEIGHT;
     }
@@ -289,7 +291,7 @@ void wxFrame::PositionToolBar()
 
     GetSize( &cw , &ch ) ;
 
-    if ( GetStatusBar() )
+    if ( GetStatusBar() && GetStatusBar()->IsShown())
     {
       int statusX, statusY;
       GetStatusBar()->GetClientSize(&statusX, &statusY);