Correct signature of HitTest()

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

diff --git a/src/mac/carbon/statbrma.cpp b/src/mac/carbon/statbrma.cpp
index ee4fddd4941cad2c16b214b53e7a282940bc1f9d..b302d82ab659502735eb410d0379eb44dde5cb27 100644 (file)
--- a/src/mac/carbon/statbrma.cpp
+++ b/src/mac/carbon/statbrma.cpp
@@ -11,12 +11,17 @@
 
 #include "wx/wxprec.h"
 
 
 #include "wx/wxprec.h"
 

+#if wxUSE_STATUSBAR
+

 #include "wx/statusbr.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/mac/private.h"

-#include "wx/toplevel.h"

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


@@ -24,7 +29,20 @@ BEGIN_EVENT_TABLE(wxStatusBarMac, wxStatusBarGeneric)
 END_EVENT_TABLE()
 
 
 END_EVENT_TABLE()
 
 

+wxStatusBarMac::wxStatusBarMac(wxWindow *parent,
+        wxWindowID id,
+        long style,
+        const wxString& name)
+        :
+        wxStatusBarGeneric()
+{
+    SetParent( NULL );
+    Create( parent, id, style, name );
+}
+

 wxStatusBarMac::wxStatusBarMac()
 wxStatusBarMac::wxStatusBarMac()

+        :
+        wxStatusBarGeneric()

 {
     SetParent( NULL );
 }
 {
     SetParent( NULL );
 }


@@ -37,7 +55,7 @@ bool wxStatusBarMac::Create(wxWindow *parent, wxWindowID id,
                             long style ,
                             const wxString& name)
 {
                             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() )
         return false;
 
     if ( parent->MacGetTopLevelWindow()->MacGetMetalAppearance() )


@@ -46,31 +64,30 @@ bool wxStatusBarMac::Create(wxWindow *parent, wxWindowID id,
     // 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 );
 

-    return true ;
+    return true;

 }
 
 void wxStatusBarMac::DrawFieldText(wxDC& dc, int i)
 {
 }
 
 void wxStatusBarMac::DrawFieldText(wxDC& dc, int i)
 {

-    int leftMargin = 2;
-    int w, h ;
-    GetSize( &w , &h ) ;
+    int w, h;
+    GetSize( &w , &h );

     wxRect rect;
     wxRect rect;

-    GetFieldRect(i, rect);
+    GetFieldRect( i, rect );

 
     if ( !MacIsReallyHilited() )
 
     if ( !MacIsReallyHilited() )

-        dc.SetTextForeground( wxColour( 0x80 , 0x80 , 0x80 ) ) ;
-
-    wxString text(GetStatusText(i));
+        dc.SetTextForeground( wxColour( 0x80, 0x80, 0x80 ) );

 
 

-    long x, y;
+    wxString text(GetStatusText( i ));

 
 

+    wxCoord x, y;

     dc.GetTextExtent(text, &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() )
 
     if ( MacGetTopLevelWindow()->MacGetMetalAppearance() )

-        ypos++ ;
+        ypos++;

 
     dc.SetClippingRegion(rect.x, 0, rect.width, h);
 
 
     dc.SetClippingRegion(rect.x, 0, rect.width, h);
 


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

+
+#endif // wxUSE_STATUSBAR
+