X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d84afea9d1ec41ee4e2ebb3bf6b87926cf5f04d1..dc0e23b8fb35c8b0e527594f96fa91c57a067b3a:/src/mac/carbon/stattext.cpp

diff --git a/src/mac/carbon/stattext.cpp b/src/mac/carbon/stattext.cpp
index c36ecf6845..bc89591282 100644
--- a/src/mac/carbon/stattext.cpp
+++ b/src/mac/carbon/stattext.cpp
@@ -51,39 +51,49 @@ 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)
 {
+    long width, height ;
+  
+    if (paragraph.Length() == 0)
+    {
+        // empty line
+        dc.GetTextExtent( "H", &width, &height );
+        y += height;
+        
+        return;
+    }
+
   int x = 0 ;
-  int y = 0 ;
+
   int i = 0 ;
-  long 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 ((punct.Find(paragraph[p]) != wxNOT_FOUND) || !linedrawn)
                 {
                   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 ) )
                         {
@@ -93,7 +103,7 @@ void wxStaticText::DrawParagraph(wxDC &dc, wxString paragraph)
                         {
                             pos += ( m_width - width ) ;
                       }
-                            
+
                     dc.DrawText( paragraph.Left(p + blank), pos , y) ;
                     y += height ;
                         paragraph = paragraph.Mid(p+1) ;
@@ -102,7 +112,7 @@ void wxStaticText::DrawParagraph(wxDC &dc, wxString paragraph)
                     }
                 }
             }
-            
+
             linedrawn = false;
         }
         else
@@ -116,7 +126,7 @@ void wxStaticText::DrawParagraph(wxDC &dc, wxString paragraph)
             {
                 pos += ( m_width - width ) ;
           }
-                
+
         dc.DrawText( paragraph, pos , y) ;
         paragraph="";
         y += height ;
@@ -128,9 +138,15 @@ 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( (WindowRef) MacGetRootWindow() ) && 
-    ( GetBackgroundColour() == wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE ) 
+    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 +155,30 @@ void wxStaticText::OnDraw( wxDC &dc )
   {
     dc.SetTextForeground( GetForegroundColour() ) ;
   }
-  
+
   wxString paragraph;
   int 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 &event )
 {
     wxPaintDC dc(this);
     OnDraw( dc ) ;
@@ -166,7 +188,7 @@ wxSize wxStaticText::DoGetBestSize() const
 {
     int widthTextMax = 0, widthLine,
         heightTextTotal = 0, heightLineDefault = 0, heightLine = 0;
-        
+
     wxString curLine;
     for ( const wxChar *pc = m_label; ; pc++ )
     {
@@ -183,7 +205,7 @@ wxSize wxStaticText::DoGetBestSize() const
                     GetTextExtent(_T("W"), NULL, &heightLineDefault);
 
                 heightTextTotal += heightLineDefault;
-                
+
                 heightTextTotal++;  // FIXME: why is this necessary?
             }
             else
@@ -192,7 +214,7 @@ wxSize wxStaticText::DoGetBestSize() const
                 if ( widthLine > widthTextMax )
                     widthTextMax = widthLine;
                 heightTextTotal += heightLine;
-                
+
                 heightTextTotal++;  // FIXME: why is this necessary?
             }
 
@@ -214,11 +236,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;
 }