added test for m_macControlIsShown in MacRedrawControl apparently HideControl does...

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

diff --git a/src/mac/stattext.cpp b/src/mac/stattext.cpp
index 39a5e39b06dfc1935649279a0b340be7ad1454bb..bc89591282b5d28ef79cfb8737eefe15150d0884 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>
 


@@ -50,39 +51,49 @@ bool wxStaticText::Create(wxWindow *parent, wxWindowID id,
         m_windowId = id;
 
     m_windowStyle = style;
         m_windowId = id;
 
     m_windowStyle = style;

-    m_label = label ;
+    m_label = wxStripMenuCodes(label) ;

 
     bool ret = wxControl::Create( parent, id, pos, size, style , wxDefaultValidator , name );
     SetBestSize( size ) ;
 
     bool ret = wxControl::Create( parent, id, pos, size, style , wxDefaultValidator , name );
     SetBestSize( size ) ;

-    
+

     return ret;
 }
 
 const wxString punct = " ,.-;:!?";
 
     return ret;
 }
 
 const wxString punct = " ,.-;:!?";
 

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

 {
 {

+    long width, height ;
+  
+    if (paragraph.Length() == 0)
+    {
+        // empty line
+        dc.GetTextExtent( "H", &width, &height );
+        y += height;
+        
+        return;
+    }
+

   int x = 0 ;
   int x = 0 ;

-  int y = 0 ;
+

   int i = 0 ;
   int i = 0 ;

-  long width, height ;

   bool linedrawn = true;
   while( paragraph.Length() > 0 )
   {
         dc.GetTextExtent( paragraph , &width , &height ) ;
   bool linedrawn = true;
   while( paragraph.Length() > 0 )
   {
         dc.GetTextExtent( paragraph , &width , &height ) ;

-                    
+

         if ( width > m_width )
         {
             for ( int p = paragraph.Length() -1 ; p > 0 ; --p )
         if ( width > m_width )
         {
             for ( int p = paragraph.Length() -1 ; p > 0 ; --p )

-            {                     
+            {

               if ((punct.Find(paragraph[p]) != wxNOT_FOUND) || !linedrawn)
                 {
                   int blank = (paragraph[p] == ' ') ? 0 : 1;
               if ((punct.Find(paragraph[p]) != wxNOT_FOUND) || !linedrawn)
                 {
                   int blank = (paragraph[p] == ' ') ? 0 : 1;

-                  
+

                     dc.GetTextExtent( paragraph.Left(p + blank) , &width , &height ) ;
                     dc.GetTextExtent( paragraph.Left(p + blank) , &width , &height ) ;

-                    
+

                     if ( width <= m_width )
                     if ( width <= m_width )

-                    {   
+                    {

                         int pos = x ;
                         if ( HasFlag( wxALIGN_CENTER ) )
                         {
                         int pos = x ;
                         if ( HasFlag( wxALIGN_CENTER ) )
                         {


@@ -92,7 +103,7 @@ void wxStaticText::DrawParagraph(wxDC &dc, wxString paragraph)
                         {
                             pos += ( m_width - width ) ;
                       }
                         {
                             pos += ( m_width - width ) ;
                       }

-                            
+

                     dc.DrawText( paragraph.Left(p + blank), pos , y) ;
                     y += height ;
                         paragraph = paragraph.Mid(p+1) ;
                     dc.DrawText( paragraph.Left(p + blank), pos , y) ;
                     y += height ;
                         paragraph = paragraph.Mid(p+1) ;


@@ -101,7 +112,7 @@ void wxStaticText::DrawParagraph(wxDC &dc, wxString paragraph)
                     }
                 }
             }
                     }
                 }
             }

-            
+

             linedrawn = false;
         }
         else
             linedrawn = false;
         }
         else


@@ -115,7 +126,7 @@ void wxStaticText::DrawParagraph(wxDC &dc, wxString paragraph)
             {
                 pos += ( m_width - width ) ;
           }
             {
                 pos += ( m_width - width ) ;
           }

-                
+

         dc.DrawText( paragraph, pos , y) ;
         paragraph="";
         y += height ;
         dc.DrawText( paragraph, pos , y) ;
         paragraph="";
         y += height ;


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

+/*
+    dc.Clear() ;
+    wxRect rect(0,0,m_width,m_height) ;
+    dc.SetFont(*wxSMALL_FONT) ;
+
+    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())
+  {

 
 

-    wxString paragraph;
-    int i = 0 ;
-    wxString text = m_label;
-    
-    PrepareDC(dc);
-    
-    bool doClear = true ;
-    WindowRef window = GetMacRootWindow() ;
-    if ( window )
+    if (text[i] == 13 || text[i] == 10)

     {
     {

-        wxWindow* win = wxFindWinFromMacWindow( window ) ;
-        if ( win )
-        {
-            wxWindow* parent = GetParent() ;
-            while ( parent )
-            {
-                if( parent->MacGetWindowData() )
-                {
-                    break ;
-                }
-                
-                parent = parent->GetParent() ;
-            } 
-        }
+        DrawParagraph(dc, paragraph,y);
+        paragraph = "" ;

     }
     }

-    
-    while (i < text.Length())
+    else

     {
         paragraph += text[i];
     {
         paragraph += text[i];

-      
-        if (text[i] == 13 || text[i] == 10)
-            DrawParagraph(dc, paragraph);
-        
-        ++i;

     }
     }

-    
-    if (paragraph.Length() > 0)
-        DrawParagraph(dc, paragraph);
+    ++i;
+  }
+  if (paragraph.Length() > 0)
+      DrawParagraph(dc, paragraph,y);

 }
 
 }
 

-void wxStaticText::OnPaint( wxPaintEvent &event ) 
+void wxStaticText::OnPaint( wxPaintEvent &event )

 {
     wxPaintDC dc(this);
     OnDraw( dc ) ;
 {
     wxPaintDC dc(this);
     OnDraw( dc ) ;


@@ -176,10 +186,9 @@ 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;

-        
+

     wxString curLine;
     for ( const wxChar *pc = m_label; ; pc++ )
     {
     wxString curLine;
     for ( const wxChar *pc = m_label; ; pc++ )
     {


@@ -196,7 +205,7 @@ wxSize wxStaticText::DoGetBestSize() const
                     GetTextExtent(_T("W"), NULL, &heightLineDefault);
 
                 heightTextTotal += heightLineDefault;
                     GetTextExtent(_T("W"), NULL, &heightLineDefault);
 
                 heightTextTotal += heightLineDefault;

-                
+

                 heightTextTotal++;  // FIXME: why is this necessary?
             }
             else
                 heightTextTotal++;  // FIXME: why is this necessary?
             }
             else


@@ -205,7 +214,7 @@ wxSize wxStaticText::DoGetBestSize() const
                 if ( widthLine > widthTextMax )
                     widthTextMax = widthLine;
                 heightTextTotal += heightLine;
                 if ( widthLine > widthTextMax )
                     widthTextMax = widthLine;
                 heightTextTotal += heightLine;

-                
+

                 heightTextTotal++;  // FIXME: why is this necessary?
             }
 
                 heightTextTotal++;  // FIXME: why is this necessary?
             }
 


@@ -232,8 +241,18 @@ void wxStaticText::SetLabel(const wxString& st )
     if ( !(GetWindowStyle() & wxST_NO_AUTORESIZE) )
         SetSize( GetBestSize() ) ;
 
     if ( !(GetWindowStyle() & wxST_NO_AUTORESIZE) )
         SetSize( GetBestSize() ) ;
 

-    Refresh() ; 
-    MacUpdateImmediately() ;
-//    wxClientDC dc(this);
-//    OnDraw( dc ) ;
+    Refresh() ;
+    Update() ;
+}
+
+bool wxStaticText::SetFont(const wxFont& font)
+{
+    bool ret = wxControl::SetFont(font);
+
+    // adjust the size of the window to fit to the label unless autoresizing is
+    // disabled
+    if ( !(GetWindowStyle() & wxST_NO_AUTORESIZE) )
+        SetSize( GetBestSize() );
+
+    return ret;

 }
 }