added const for Mac OS X compilation

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

diff --git a/src/mac/carbon/stattext.cpp b/src/mac/carbon/stattext.cpp
index 22653f651e02c6b0370599febc420f63e240260c..a99f6c4e69f80a1bf7bae1e728add2c3d8252700 100644 (file)
--- a/src/mac/carbon/stattext.cpp
+++ b/src/mac/carbon/stattext.cpp
@@ -15,6 +15,8 @@
 
 #include "wx/app.h"
 #include "wx/stattext.h"
+#include "wx/dc.h"
+#include "wx/dcclient.h"
 
 #include <stdio.h>
 
@@ -55,8 +57,11 @@ bool wxStaticText::Create(wxWindow *parent, wxWindowID id,
 
 void wxStaticText::OnDraw( wxDC &dc )
 {
+    if (m_width <= 0 || m_height <= 0)
+        return;
+
     PrepareDC(dc);
-    dc.Clear() ;
+//    dc.Clear() ; this eventually draws in the wrong background colour (appearance panels)
     
     int x = 0 ;
     int y = 0 ;
@@ -254,7 +259,9 @@ void wxStaticText::SetLabel(const wxString& st )
        m_label = st ;
        if ( !(GetWindowStyle() & wxST_NO_AUTORESIZE) )
                SetSizeOrDefault() ;
-       
-    wxClientDC dc(this);
-    OnDraw( dc ) ;
+
+       Refresh() ;     
+       MacUpdateImmediately() ;
+//    wxClientDC dc(this);
+//    OnDraw( dc ) ;
 }