display rect fixed

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

diff --git a/src/mac/stattext.cpp b/src/mac/stattext.cpp
index e977973b73ec30c1fc5062d29cb5a40df0207f18..c36ecf6845edc05eefc73b1e990fef44a720c74e 100644 (file)
--- a/src/mac/stattext.cpp
+++ b/src/mac/stattext.cpp
@@ -20,6 +20,7 @@
 #include "wx/dc.h"
 #include "wx/dcclient.h"
 #include "wx/utils.h"
 #include "wx/dc.h"
 #include "wx/dcclient.h"
 #include "wx/utils.h"

+#include "wx/settings.h"

 
 #include <stdio.h>
 
 
 #include <stdio.h>
 


@@ -128,9 +129,9 @@ void wxStaticText::OnDraw( wxDC &dc )
     if (m_width <= 0 || m_height <= 0)
         return;
 
     if (m_width <= 0 || m_height <= 0)
         return;
 

-  if ( !IsWindowHilited( MacGetRootWindow() ) && 
-    ( GetBackgroundColour() == wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE ) 
-      || GetBackgroundColour() == wxSystemSettings::GetSystemColour(wxSYS_COLOUR_APPWORKSPACE) ) )
+  if ( !IsWindowHilited( (WindowRef) MacGetRootWindow() ) && 
+    ( GetBackgroundColour() == wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE ) 
+      || GetBackgroundColour() == wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE) ) )

   {
     dc.SetTextForeground( wxColour( 0x80 , 0x80 , 0x80 ) ) ;
   }
   {
     dc.SetTextForeground( wxColour( 0x80 , 0x80 , 0x80 ) ) ;
   }


@@ -163,7 +164,6 @@ void wxStaticText::OnPaint( wxPaintEvent &event )
 
 wxSize wxStaticText::DoGetBestSize() const
 {
 
 wxSize wxStaticText::DoGetBestSize() const
 {

-    int x,y ;

     int widthTextMax = 0, widthLine,
         heightTextTotal = 0, heightLineDefault = 0, heightLine = 0;
         
     int widthTextMax = 0, widthLine,
         heightTextTotal = 0, heightLineDefault = 0, heightLine = 0;