carbon event handlers for app level

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

diff --git a/src/mac/carbon/stattext.cpp b/src/mac/carbon/stattext.cpp
index e977973b73ec30c1fc5062d29cb5a40df0207f18..15e3076d71a45a8cc9a0511ffc0d5d5fa60055f6 100644 (file)
--- a/src/mac/carbon/stattext.cpp
+++ b/src/mac/carbon/stattext.cpp
@@ -20,6 +20,7 @@
 #include "wx/dc.h"
 #include "wx/dcclient.h"
 #include "wx/utils.h"
+#include "wx/settings.h"
 
 #include <stdio.h>
 
@@ -60,10 +61,10 @@ bool wxStaticText::Create(wxWindow *parent, wxWindowID id,
 
 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;
@@ -127,10 +128,16 @@ void wxStaticText::OnDraw( wxDC &dc )
 {
     if (m_width <= 0 || m_height <= 0)
         return;
-
-  if ( !IsWindowHilited( MacGetRootWindow() ) && 
-    ( GetBackgroundColour() == wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE ) 
-      || GetBackgroundColour() == wxSystemSettings::GetSystemColour(wxSYS_COLOUR_APPWORKSPACE) ) )
+/*
+    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 ) ) ;
   }
@@ -142,17 +149,23 @@ void wxStaticText::OnDraw( wxDC &dc )
   wxString paragraph;
   int i = 0 ;
   wxString text = m_label;
-       while (i < text.Length())
-       {
-         paragraph += text[i];
+  int y = 0 ;
+  while (i < text.Length())
+  {
          
        if (text[i] == 13 || text[i] == 10)
-           DrawParagraph(dc, paragraph);
-           
+       {
+           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 ) 
@@ -163,7 +176,6 @@ void wxStaticText::OnPaint( wxPaintEvent &event )
 
 wxSize wxStaticText::DoGetBestSize() const
 {
-    int x,y ;
     int widthTextMax = 0, widthLine,
         heightTextTotal = 0, heightLineDefault = 0, heightLine = 0;