changed Refresh to take Rect as client coordinates not window coordinates

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

diff --git a/src/mac/carbon/stattext.cpp b/src/mac/carbon/stattext.cpp
index 54f6eb4e58206d3ffe3b6bf1698884d7c813560d..6439400bf380e239c93a531b6b3fac5f8506e5c3 100644 (file)
--- a/src/mac/carbon/stattext.cpp
+++ b/src/mac/carbon/stattext.cpp
@@ -15,6 +15,10 @@
 
 #include "wx/app.h"
 #include "wx/stattext.h"
 
 #include "wx/app.h"
 #include "wx/stattext.h"

+#include "wx/notebook.h"
+#include "wx/tabctrl.h"
+#include "wx/dc.h"
+#include "wx/dcclient.h"

 
 #include <stdio.h>
 
 
 #include <stdio.h>
 


@@ -24,6 +28,10 @@ IMPLEMENT_DYNAMIC_CLASS(wxStaticText, wxControl)
 
 #include <wx/mac/uma.h>
 
 
 #include <wx/mac/uma.h>
 

+BEGIN_EVENT_TABLE(wxStaticText, wxStaticTextBase)
+    EVT_PAINT(wxStaticText::OnPaint)
+END_EVENT_TABLE()
+

 bool wxStaticText::Create(wxWindow *parent, wxWindowID id,
            const wxString& label,
            const wxPoint& pos,
 bool wxStaticText::Create(wxWindow *parent, wxWindowID id,
            const wxString& label,
            const wxPoint& pos,


@@ -31,31 +39,206 @@ bool wxStaticText::Create(wxWindow *parent, wxWindowID id,
            long style,
            const wxString& name)
 {
            long style,
            const wxString& name)
 {

-       Rect bounds ;
-       Str255 title ;
-       
-       MacPreControlCreate( parent , id ,  label , pos , size ,style, *((wxValidator*)NULL) , name , &bounds , title ) ;
-
-       m_macControl = UMANewControl( parent->GetMacRootWindow() , &bounds , "\p" , true , 0 , 0 , 1, 
-               kControlStaticTextProc , (long) this ) ;
-       ::UMASetControlData( m_macControl, kControlLabelPart, kControlStaticTextTextTag , (long) title[0] , (char*) &title[1] ) ;
-       
-       MacPostControlCreate() ;
-
-  return TRUE;
+    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 = label ;
+
+       bool ret = wxControl::Create( parent, id, pos, size, style , wxDefaultValidator , name );
+       SetBestSize( size ) ;
+    
+    return ret;

 }
 
 }
 

-void wxStaticText::SetLabel(const wxString& st , bool resize )
+const wxString punct = " ,.-;:!?";
+
+void wxStaticText::DrawParagraph(wxDC &dc, wxString paragraph)

 {
 {

-       SetTitle( st ) ;
-       wxString label ;
-       
-       if( wxApp::s_macDefaultEncodingIsPC )
-               label = wxMacMakeMacStringFromPC( st ) ;
-       else
-               label = st ;
+  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 ) )
+                                               {
+                                                       pos += ( m_width - width ) / 2 ;
+                                         }
+                                               else if ( HasFlag( wxALIGN_RIGHT ) )
+                                               {
+                                                       pos += ( m_width - width ) ;
+                                         }
+                                                       
+                                       dc.DrawText( paragraph.Left(p + blank), pos , y) ;
+                                       y += height ;
+                                               paragraph = paragraph.Mid(p+1) ;
+                                               linedrawn = true;
+                                               break ;
+                                       }
+                               }
+                       }
+                       
+                       linedrawn = false;
+               }
+               else
+               {
+                       int pos = x ;
+                       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 ;
+               }
+       }
+}
+
+void wxStaticText::OnDraw( wxDC &dc )
+{
+    if (m_width <= 0 || m_height <= 0)
+        return;
+
+  wxString paragraph;
+  int i = 0 ;
+  wxString text = m_label;
+
+    PrepareDC(dc);
+    
+    bool doClear = true ;
+       WindowRef window = GetMacRootWindow() ;
+       if ( window )
+       {
+               wxWindow* win = wxFindWinFromMacWindow( window ) ;
+               if ( win )
+               {
+                       wxWindow* parent = GetParent() ;
+                       while ( parent )
+                       {
+                               if( parent->MacGetWindowData() )
+                               {
+                                       break ;
+                               }
+                               
+                               if( parent->IsKindOf( CLASSINFO( wxNotebook ) ) ||  parent->IsKindOf( CLASSINFO( wxTabCtrl ) ))
+                               {
+                                       if ( ((wxControl*)parent)->GetMacControl() ) {
+                                               Rect rect = { -32767 , -32767 , 32767 , 32767 } ;
+                                               if ( DrawThemeTabPane != (void*)kUnresolvedCFragSymbolAddress )
+                                               {
+                                                 DrawThemeTabPane ( &rect, kThemeStateActive);
+                                                 doClear = false ;
+                                               }
+                                       }
+                                       break ;
+                               }
+                               
+                               parent = parent->GetParent() ;
+                       } 
+               }
+       }
+       if ( doClear )
+               dc.Clear() ;

                
                

-       ::UMASetControlData( m_macControl, kControlLabelPart, kControlStaticTextTextTag , (long) label.Length() , (char*)(const char*) label ) ;
-       Refresh() ;
+       while (i < text.Length())
+       {
+         paragraph += text[i];
+         
+       if (text[i] == 13 || text[i] == 10)
+           DrawParagraph(dc, paragraph);
+           
+    ++i;
+  }
+  if (paragraph.Length() > 0)
+         DrawParagraph(dc, paragraph);

 }
 
 }
 

+void wxStaticText::OnPaint( wxPaintEvent &event ) 
+{
+    wxPaintDC dc(this);
+    OnDraw( dc ) ;
+}
+
+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++ ) {
+        if ( *pc == wxT('\n') || *pc == wxT('\0') ) {
+            if ( !curLine ) {
+                // we can't use GetTextExtent - it will return 0 for both width
+                // and height and an empty line should count in height
+                // calculation
+                if ( !heightLineDefault )
+                    heightLineDefault = heightLine;
+                if ( !heightLineDefault )
+                    GetTextExtent(_T("W"), NULL, &heightLineDefault);
+
+                heightTextTotal += heightLineDefault;
+            }
+            else {
+                GetTextExtent(curLine, &widthLine, &heightLine);
+                if ( widthLine > widthTextMax )
+                    widthTextMax = widthLine;
+                heightTextTotal += heightLine;
+            }
+
+            if ( *pc == wxT('\n') ) {
+               curLine.Empty();
+            }
+            else {
+               // the end of string
+               break;
+            }
+        }
+        else {
+            curLine += *pc;
+        }
+    }
+
+    return wxSize(widthTextMax, heightTextTotal);
+}
+
+void wxStaticText::SetLabel(const wxString& st )
+{
+       SetTitle( st ) ;
+       m_label = st ;
+       if ( !(GetWindowStyle() & wxST_NO_AUTORESIZE) )
+               SetSize( GetBestSize() ) ;
+
+       Refresh() ;     
+       MacUpdateImmediately() ;
+//    wxClientDC dc(this);
+//    OnDraw( dc ) ;
+}