Attempt to fix Borland compilo

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

diff --git a/src/mac/stattext.cpp b/src/mac/stattext.cpp
index 9a56b744e2b4b5e415702ae33fd56d5bc5641a56..2d81d33b16655270647a48e9d3640f7784e72291 100644 (file)
--- a/src/mac/stattext.cpp
+++ b/src/mac/stattext.cpp
@@ -1,11 +1,11 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        stattext.cpp
 // Purpose:     wxStaticText
-// Author:      AUTHOR
+// Author:      Stefan Csomor
 // Modified by:
 // Created:     04/01/98
 // RCS-ID:      $Id$
-// Copyright:   (c) AUTHOR
+// Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
@@ -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 ;
         }
     }
@@ -137,44 +132,44 @@ 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) ;
-
-    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;
-  size_t i = 0 ;
-  wxString text = m_label;
-  int y = 0 ;
-  while (i < text.Length())
-  {
-
-    if (text[i] == 13 || text[i] == 10)
+    /*
+        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) ) )
     {
-        DrawParagraph(dc, paragraph,y);
-        paragraph = "" ;
+        dc.SetTextForeground( wxColour( 0x80 , 0x80 , 0x80 ) ) ;
     }
     else
     {
-        paragraph += text[i];
+        dc.SetTextForeground( GetForegroundColour() ) ;
+    }
+    
+    wxString paragraph;
+    size_t 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 = wxEmptyString ;
+        }
+        else
+        {
+            paragraph += text[i];
+        }
+        ++i;
     }
-    ++i;
-  }
-  if (paragraph.Length() > 0)
-      DrawParagraph(dc, paragraph,y);
+    if (paragraph.Length() > 0)
+        DrawParagraph(dc, paragraph,y);
 }
 
 void wxStaticText::OnPaint( wxPaintEvent & WXUNUSED(event) )