Applied patch [ 681893 ] Combobox in toolbar

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

diff --git a/src/mac/stattext.cpp b/src/mac/stattext.cpp
index f4e52d8d041c495900bbd5c14a7a1afe7237b11c..9a56b744e2b4b5e415702ae33fd56d5bc5641a56 100644 (file)
--- a/src/mac/stattext.cpp
+++ b/src/mac/stattext.cpp
@@ -51,51 +51,60 @@ bool wxStaticText::Create(wxWindow *parent, wxWindowID id,
         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 ) ;
-    
+
     return ret;
 }
 
 const wxString punct = " ,.-;:!?";
 
-void wxStaticText::DrawParagraph(wxDC &dc, wxString paragraph)
+void wxStaticText::DrawParagraph(wxDC &dc, wxString paragraph, int &y)
 {
-  int x = 0 ;
-  int y = 0 ;
-  int i = 0 ;
-  long width, height ;
-  bool linedrawn = true;
-  while( paragraph.Length() > 0 )
-  {
+    long width, height ;
+  
+    if (paragraph.Length() == 0)
+    {
+        // empty line
+        dc.GetTextExtent( "H", &width, &height );
+        y += height;
+        
+        return;
+    }
+
+    int x = 0 ;
+
+    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 ((punct.Find(paragraph[p]) != wxNOT_FOUND) || !linedrawn)
+            for ( size_t p = paragraph.Length() - 1 ; p > 0 ; --p )
+            {
+                if ((punct.Find(paragraph[p]) != wxNOT_FOUND) || !linedrawn)
                 {
-                  int blank = (paragraph[p] == ' ') ? 0 : 1;
-                  
+                    int blank = (paragraph[p] == ' ') ? 0 : 1;
+                    
                     dc.GetTextExtent( paragraph.Left(p + blank) , &width , &height ) ;
                     
                     if ( width <= m_width )
-                    {   
+                    {
                         int pos = x ;
                         if ( HasFlag( wxALIGN_CENTER ) )
                         {
                             pos += ( m_width - width ) / 2 ;
-                      }
+                        }
                         else if ( HasFlag( wxALIGN_RIGHT ) )
                         {
                             pos += ( m_width - width ) ;
-                      }
-                            
-                    dc.DrawText( paragraph.Left(p + blank), pos , y) ;
-                    y += height ;
+                        }
+                        
+                        dc.DrawText( paragraph.Left(p + blank), pos , y) ;
+                        y += height ;
                         paragraph = paragraph.Mid(p+1) ;
                         linedrawn = true;
                         break ;
@@ -111,15 +120,15 @@ void wxStaticText::DrawParagraph(wxDC &dc, wxString paragraph)
             if ( HasFlag( wxALIGN_CENTER ) )
             {
                 pos += ( m_width - width ) / 2 ;
-          }
+            }
             else if ( HasFlag( wxALIGN_RIGHT ) )
             {
                 pos += ( m_width - width ) ;
-          }
-                
-        dc.DrawText( paragraph, pos , y) ;
-        paragraph="";
-        y += height ;
+            }
+            
+            dc.DrawText( paragraph, pos , y) ;
+            paragraph="";
+            y += height ;
         }
     }
 }
@@ -128,10 +137,16 @@ void wxStaticText::OnDraw( wxDC &dc )
 {
     if (m_width <= 0 || m_height <= 0)
         return;
+/*
+    dc.Clear() ;
+    wxRect rect(0,0,m_width,m_height) ;
+    dc.SetFont(*wxSMALL_FONT) ;
 
-  if ( !IsWindowHilited( MacGetRootWindow() ) && 
-    ( GetBackgroundColour() == wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE ) 
-      || GetBackgroundColour() == wxSystemSettings::GetSystemColour(wxSYS_COLOUR_APPWORKSPACE) ) )
+    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 ) ) ;
   }
@@ -139,24 +154,30 @@ void wxStaticText::OnDraw( wxDC &dc )
   {
     dc.SetTextForeground( GetForegroundColour() ) ;
   }
-  
+
   wxString paragraph;
-  int i = 0 ;
+  size_t i = 0 ;
   wxString text = m_label;
-       while (i < text.Length())
-       {
-         paragraph += text[i];
-         
-       if (text[i] == 13 || text[i] == 10)
-           DrawParagraph(dc, paragraph);
-           
+  int y = 0 ;
+  while (i < text.Length())
+  {
+
+    if (text[i] == 13 || text[i] == 10)
+    {
+        DrawParagraph(dc, paragraph,y);
+        paragraph = "" ;
+    }
+    else
+    {
+        paragraph += text[i];
+    }
     ++i;
   }
   if (paragraph.Length() > 0)
-         DrawParagraph(dc, paragraph);
+      DrawParagraph(dc, paragraph,y);
 }
 
-void wxStaticText::OnPaint( wxPaintEvent &event ) 
+void wxStaticText::OnPaint( wxPaintEvent & WXUNUSED(event) )
 {
     wxPaintDC dc(this);
     OnDraw( dc ) ;
@@ -164,10 +185,9 @@ void wxStaticText::OnPaint( wxPaintEvent &event )
 
 wxSize wxStaticText::DoGetBestSize() const
 {
-    int x,y ;
     int widthTextMax = 0, widthLine,
         heightTextTotal = 0, heightLineDefault = 0, heightLine = 0;
-        
+
     wxString curLine;
     for ( const wxChar *pc = m_label; ; pc++ )
     {
@@ -184,7 +204,7 @@ wxSize wxStaticText::DoGetBestSize() const
                     GetTextExtent(_T("W"), NULL, &heightLineDefault);
 
                 heightTextTotal += heightLineDefault;
-                
+
                 heightTextTotal++;  // FIXME: why is this necessary?
             }
             else
@@ -193,7 +213,7 @@ wxSize wxStaticText::DoGetBestSize() const
                 if ( widthLine > widthTextMax )
                     widthTextMax = widthLine;
                 heightTextTotal += heightLine;
-                
+
                 heightTextTotal++;  // FIXME: why is this necessary?
             }
 
@@ -215,11 +235,23 @@ wxSize wxStaticText::DoGetBestSize() const
 
 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() ;
+    Update() ;
+}
 
-       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;
 }