splitted wxApp docs in wxApp+wxAppConsole docs; fix the signature of the documented...

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

diff --git a/src/mac/carbon/statbrma.cpp b/src/mac/carbon/statbrma.cpp
index 1ac06835016e2a9b73a6af387431f2f2d37951aa..926198c3b01fec141afb82dd644817443714ef23 100644 (file)
--- a/src/mac/carbon/statbrma.cpp
+++ b/src/mac/carbon/statbrma.cpp
@@ -11,15 +11,17 @@
 
 #include "wx/wxprec.h"
 
 
 #include "wx/wxprec.h"
 

+#if wxUSE_STATUSBAR
+

 #include "wx/statusbr.h"
 
 #ifndef WX_PRECOMP
     #include "wx/dc.h"
     #include "wx/dcclient.h"
 #include "wx/statusbr.h"
 
 #ifndef WX_PRECOMP
     #include "wx/dc.h"
     #include "wx/dcclient.h"

+    #include "wx/toplevel.h"

 #endif
 
 #include "wx/mac/private.h"
 #endif
 
 #include "wx/mac/private.h"

-#include "wx/toplevel.h"

 
 
 BEGIN_EVENT_TABLE(wxStatusBarMac, wxStatusBarGeneric)
 
 
 BEGIN_EVENT_TABLE(wxStatusBarMac, wxStatusBarGeneric)


@@ -57,7 +59,7 @@ bool wxStatusBarMac::Create(wxWindow *parent, wxWindowID id,
         return false;
 
     if ( parent->MacGetTopLevelWindow()->MacGetMetalAppearance() )
         return false;
 
     if ( parent->MacGetTopLevelWindow()->MacGetMetalAppearance() )

-        MacSetBackgroundBrush( wxNullBrush );
+        SetBackgroundStyle( wxBG_STYLE_TRANSPARENT );

 
     // normal system font is too tall for fitting into the standard height
     SetWindowVariant( wxWINDOW_VARIANT_SMALL );
 
     // normal system font is too tall for fitting into the standard height
     SetWindowVariant( wxWINDOW_VARIANT_SMALL );


@@ -77,8 +79,7 @@ void wxStatusBarMac::DrawFieldText(wxDC& dc, int i)
 
     wxString text(GetStatusText( i ));
 
 
     wxString text(GetStatusText( i ));
 

-    long x, y;
-
+    wxCoord x, y;

     dc.GetTextExtent(text, &x, &y);
 
     int leftMargin = 2;
     dc.GetTextExtent(text, &x, &y);
 
     int leftMargin = 2;


@@ -175,3 +176,6 @@ void wxStatusBarMac::MacHiliteChanged()
     Refresh();
     Update();
 }
     Refresh();
     Update();
 }

+
+#endif // wxUSE_STATUSBAR
+