appearance fonts

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

diff --git a/src/mac/stattext.cpp b/src/mac/stattext.cpp
index 62e095f5facee3cee3bdeaa3fedb4d5ad7b83c50..15e3076d71a45a8cc9a0511ffc0d5d5fa60055f6 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>
 


@@ -60,10 +61,10 @@ bool wxStaticText::Create(wxWindow *parent, wxWindowID id,
 
 const wxString punct = " ,.-;:!?";
 
 
 const wxString punct = " ,.-;:!?";
 

-void wxStaticText::DrawParagraph(wxDC &dc, wxString paragraph)
+void wxStaticText::DrawParagraph(wxDC &dc, wxString paragraph, int &y)

 {
   int x = 0 ;
 {
   int x = 0 ;

-  int y = 0 ;
+

   int i = 0 ;
   long width, height ;
   bool linedrawn = true;
   int i = 0 ;
   long width, height ;
   bool linedrawn = true;


@@ -127,66 +128,44 @@ void wxStaticText::OnDraw( wxDC &dc )
 {
     if (m_width <= 0 || m_height <= 0)
         return;
 {
     if (m_width <= 0 || m_height <= 0)
         return;

-
-     wxString paragraph;
-    int i = 0 ;
-    wxString text = m_label;
-    
-    int major,minor;
-    wxGetOsVersion( &major, &minor );
-
-    PrepareDC(dc);
+/*
+    dc.Clear() ;
+    wxRect rect(0,0,m_width,m_height) ;
+    dc.SetFont(*wxSMALL_FONT) ;

     
     

-    bool doClear = true ;
-    WindowRef window = GetMacRootWindow() ;
-    if ( window )
-    {
-        wxWindow* win = wxFindWinFromMacWindow( window ) ;
-        if ( win )
-        {
-            wxWindow* parent = GetParent() ;
-            while ( parent )
-            {
-                if( parent->MacGetWindowData() )
-                {
-                    break ;
-                }
-                
-                if (major < 10)
-                {
-                if( parent->IsKindOf( CLASSINFO( wxNotebook ) ) ||  parent->IsKindOf( CLASSINFO( wxTabCtrl ) ))
-                {
-                    if ( ((wxControl*)parent)->GetMacControl() ) {
-                        Rect rect = { -10000 , -10000 , 10000 , 10000 } ; // MacOS X was having a coord rollover
-                        if ( DrawThemeTabPane != (void*)kUnresolvedCFragSymbolAddress )
-                        {
-                          DrawThemeTabPane ( &rect, kThemeStateActive);
-                          doClear = false ;
-                        }
-                    }
-                    break ;
-                }
-                }
-                
-                parent = parent->GetParent() ;
-            } 
-        }
+    dc.DrawRectangle(rect) ;
+*/
+  if ( !IsWindowHilited( (WindowRef) MacGetRootWindow() ) && 
+    ( GetBackgroundColour() == wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE ) 
+      || GetBackgroundColour() == wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE) ) )
+  {
+    dc.SetTextForeground( wxColour( 0x80 , 0x80 , 0x80 ) ) ;
+  }
+  else
+  {
+    dc.SetTextForeground( GetForegroundColour() ) ;
+  }
+  
+  wxString paragraph;
+  int i = 0 ;
+  wxString text = m_label;
+  int y = 0 ;
+  while (i < text.Length())
+  {
+         
+       if (text[i] == 13 || text[i] == 10)
+       {
+           DrawParagraph(dc, paragraph,y);
+           paragraph = "" ;
+       }    
+       else
+       {
+        paragraph += text[i];

     }
     }

-    
-    if ( (major < 10) && doClear )
-        dc.Clear() ;
-        
-    while (i < text.Length())
-    {
-      paragraph += text[i];
-      
-    if (text[i] == 13 || text[i] == 10)
-        DrawParagraph(dc, paragraph);
-        

     ++i;
   }
   if (paragraph.Length() > 0)
     ++i;
   }
   if (paragraph.Length() > 0)

-      DrawParagraph(dc, paragraph);
+         DrawParagraph(dc, paragraph,y);

 }
 
 void wxStaticText::OnPaint( wxPaintEvent &event ) 
 }
 
 void wxStaticText::OnPaint( wxPaintEvent &event ) 


@@ -197,7 +176,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;
         


@@ -248,13 +226,11 @@ wxSize wxStaticText::DoGetBestSize() const
 
 void wxStaticText::SetLabel(const wxString& st )
 {
 
 void wxStaticText::SetLabel(const wxString& st )
 {

-    SetTitle( st ) ;
-    m_label = st ;
-    if ( !(GetWindowStyle() & wxST_NO_AUTORESIZE) )
-        SetSize( GetBestSize() ) ;
+       SetTitle( st ) ;
+       m_label = st ;
+       if ( !(GetWindowStyle() & wxST_NO_AUTORESIZE) )
+               SetSize( GetBestSize() ) ;

 
 

-    Refresh() ; 
-    MacUpdateImmediately() ;
-//    wxClientDC dc(this);
-//    OnDraw( dc ) ;
+       Refresh() ;     
+       Update() ;

 }
 }