use correct scale when drawing

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

diff --git a/src/osx/carbon/statbrma.cpp b/src/osx/carbon/statbrma.cpp
index a1f4cb28f6818e99ef2714e592ef36a3273e943d..3a89df132d0162c77f51e5b06f65163eb4eaaee5 100644 (file)
--- a/src/osx/carbon/statbrma.cpp
+++ b/src/osx/carbon/statbrma.cpp
@@ -70,7 +70,7 @@ bool wxStatusBarMac::Create(wxWindow *parent, wxWindowID id,
     return true;
 }
 
     return true;
 }
 

-void wxStatusBarMac::DrawFieldText(wxDC& dc, const wxRect& rect, int i, int textHeight)
+void wxStatusBarMac::DrawFieldText(wxDC& dc, const wxRect& rect, int i, int WXUNUSED(textHeight))

 {
     int w, h;
     GetSize( &w , &h );
 {
     int w, h;
     GetSize( &w , &h );


@@ -102,19 +102,8 @@ void wxStatusBarMac::DrawField(wxDC& dc, int i, int textHeight)
     DrawFieldText(dc, rect, i, textHeight);
 }
 
     DrawFieldText(dc, rect, i, textHeight);
 }
 

-void wxStatusBarMac::SetStatusText(const wxString& text, int number)
+void wxStatusBarMac::DoUpdateStatusText(int number)

 {
 {

-    // NOTE: seems this function is identic to wxStatusBarGeneric::SetStatusText;
-    //       probably can be removed without problems (FM)
-
-    wxCHECK_RET( (number >= 0) && ((size_t)number < m_panes.GetCount()),
-        wxT("invalid status bar field index") );
-
-    if ( GetStatusText(number) == text )
-        return;
-
-    wxStatusBarGeneric::SetStatusText(text, number);
-

     wxRect rect;
     GetFieldRect(number, rect);
 
     wxRect rect;
     GetFieldRect(number, rect);
 


@@ -125,7 +114,11 @@ void wxStatusBarMac::SetStatusText(const wxString& text, int number)
     rect.height = h ;
 
     Refresh( true, &rect );
     rect.height = h ;
 
     Refresh( true, &rect );

+    // we should have to force the update here
+    // TODO Remove if no regressions occur
+#if 0

     Update();
     Update();

+#endif

 }
 
 void wxStatusBarMac::OnPaint(wxPaintEvent& WXUNUSED(event))
 }
 
 void wxStatusBarMac::OnPaint(wxPaintEvent& WXUNUSED(event))