applied SF patch # 826838 to fix removal of -psn_* command line argument

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

diff --git a/src/mac/carbon/stattext.cpp b/src/mac/carbon/stattext.cpp
index fc0a5726f933914d9b86e7d4dc090cb9c1f221dc..2d81d33b16655270647a48e9d3640f7784e72291 100644 (file)
--- a/src/mac/carbon/stattext.cpp
+++ b/src/mac/carbon/stattext.cpp
@@ -41,25 +41,20 @@ bool wxStaticText::Create(wxWindow *parent, wxWindowID id,
            long style,
            const wxString& name)
 {
-    SetName(name);
-    m_backgroundColour = parent->GetBackgroundColour() ;
-    m_foregroundColour = parent->GetForegroundColour() ;
-
-    if ( id == -1 )
-        m_windowId = (int)NewControlId();
-    else
-        m_windowId = id;
-
-    m_windowStyle = style;
     m_label = wxStripMenuCodes(label) ;
 
-    bool ret = wxControl::Create( parent, id, pos, size, style , wxDefaultValidator , name );
+    if ( !wxControl::Create( parent, id, pos, size, style,
+                             wxDefaultValidator , name ) )
+    {
+        return false;
+    }
+
     SetBestSize( size ) ;
 
-    return ret;
+    return true;
 }
 
-const wxString punct = " ,.-;:!?";
+const wxString punct = wxT(" ,.-;:!?");
 
 void wxStaticText::DrawParagraph(wxDC &dc, wxString paragraph, int &y)
 {
@@ -68,7 +63,7 @@ void wxStaticText::DrawParagraph(wxDC &dc, wxString paragraph, int &y)
     if (paragraph.Length() == 0)
     {
         // empty line
-        dc.GetTextExtent( "H", &width, &height );
+        dc.GetTextExtent( wxT("H"), &width, &height );
         y += height;
         
         return;
@@ -127,7 +122,7 @@ void wxStaticText::DrawParagraph(wxDC &dc, wxString paragraph, int &y)
             }
             
             dc.DrawText( paragraph, pos , y) ;
-            paragraph="";
+            paragraph=wxEmptyString;
             y += height ;
         }
     }
@@ -165,7 +160,7 @@ void wxStaticText::OnDraw( wxDC &dc )
         if (text[i] == 13 || text[i] == 10)
         {
             DrawParagraph(dc, paragraph,y);
-            paragraph = "" ;
+            paragraph = wxEmptyString ;
         }
         else
         {