Menu label consistency changes

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

diff --git a/src/mac/carbon/statbrma.cpp b/src/mac/carbon/statbrma.cpp
index e743653a1da2e79b03b98a6f596af546d3edc454..b302d82ab659502735eb410d0379eb44dde5cb27 100644 (file)
--- a/src/mac/carbon/statbrma.cpp
+++ b/src/mac/carbon/statbrma.cpp
@@ -11,12 +11,17 @@
 
 #include "wx/wxprec.h"
 
+#if wxUSE_STATUSBAR
+
 #include "wx/statusbr.h"
-#include "wx/dc.h"
-#include "wx/dcclient.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/dc.h"
+    #include "wx/dcclient.h"
+    #include "wx/toplevel.h"
+#endif
 
 #include "wx/mac/private.h"
-#include "wx/toplevel.h"
 
 
 BEGIN_EVENT_TABLE(wxStatusBarMac, wxStatusBarGeneric)
@@ -74,8 +79,7 @@ void wxStatusBarMac::DrawFieldText(wxDC& dc, int i)
 
     wxString text(GetStatusText( i ));
 
-    long x, y;
-
+    wxCoord x, y;
     dc.GetTextExtent(text, &x, &y);
 
     int leftMargin = 2;
@@ -172,3 +176,6 @@ void wxStatusBarMac::MacHiliteChanged()
     Refresh();
     Update();
 }
+
+#endif // wxUSE_STATUSBAR
+