Fixing SetColumnWidth and selection handling, attempt at fixing ClearAll(), and initi...

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

diff --git a/src/mac/carbon/statbrma.cpp b/src/mac/carbon/statbrma.cpp
index ee4fddd4941cad2c16b214b53e7a282940bc1f9d..ccecc33a58d86c59fa74d47abbe25db4030a0fbf 100644 (file)
--- a/src/mac/carbon/statbrma.cpp
+++ b/src/mac/carbon/statbrma.cpp
@@ -12,11 +12,14 @@
 #include "wx/wxprec.h"
 
 #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)
@@ -24,7 +27,20 @@ BEGIN_EVENT_TABLE(wxStatusBarMac, wxStatusBarGeneric)
 END_EVENT_TABLE()
 
 
+wxStatusBarMac::wxStatusBarMac(wxWindow *parent,
+        wxWindowID id,
+        long style,
+        const wxString& name)
+        :
+        wxStatusBarGeneric()
+{
+    SetParent( NULL );
+    Create( parent, id, style, name );
+}
+
 wxStatusBarMac::wxStatusBarMac()
+        :
+        wxStatusBarGeneric()
 {
     SetParent( NULL );
 }
@@ -37,7 +53,7 @@ bool wxStatusBarMac::Create(wxWindow *parent, wxWindowID id,
                             long style ,
                             const wxString& name)
 {
-    if ( !wxStatusBarGeneric::Create( parent , id , style , name ) )
+    if ( !wxStatusBarGeneric::Create( parent, id, style, name ) )
         return false;
 
     if ( parent->MacGetTopLevelWindow()->MacGetMetalAppearance() )
@@ -46,31 +62,31 @@ bool wxStatusBarMac::Create(wxWindow *parent, wxWindowID id,
     // normal system font is too tall for fitting into the standard height
     SetWindowVariant( wxWINDOW_VARIANT_SMALL );
 
-    return true ;
+    return true;
 }
 
 void wxStatusBarMac::DrawFieldText(wxDC& dc, int i)
 {
-    int leftMargin = 2;
-    int w, h ;
-    GetSize( &w , &h ) ;
+    int w, h;
+    GetSize( &w , &h );
     wxRect rect;
-    GetFieldRect(i, rect);
+    GetFieldRect( i, rect );
 
     if ( !MacIsReallyHilited() )
-        dc.SetTextForeground( wxColour( 0x80 , 0x80 , 0x80 ) ) ;
+        dc.SetTextForeground( wxColour( 0x80, 0x80, 0x80 ) );
 
-    wxString text(GetStatusText(i));
+    wxString text(GetStatusText( i ));
 
     long x, y;
 
     dc.GetTextExtent(text, &x, &y);
 
-    int xpos = rect.x + leftMargin + 1 ;
-    int ypos = 1 ;
+    int leftMargin = 2;
+    int xpos = rect.x + leftMargin + 1;
+    int ypos = 1;
 
     if ( MacGetTopLevelWindow()->MacGetMetalAppearance() )
-        ypos++ ;
+        ypos++;
 
     dc.SetClippingRegion(rect.x, 0, rect.width, h);