]> git.saurik.com Git - wxWidgets.git/blobdiff - src/mac/stattext.cpp
Need to use the same instance handles
[wxWidgets.git] / src / mac / stattext.cpp
index 06d6fe9c3c1ec67031bb0c4a0af1fa889f3b17b4..4c8b9414a478fe4b8818e681550fb5aa101ec922 100644 (file)
@@ -1,12 +1,12 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        stattext.cpp
 // Purpose:     wxStaticText
-// Author:      AUTHOR
+// Author:      Stefan Csomor
 // Modified by:
 // Created:     04/01/98
 // RCS-ID:      $Id$
-// Copyright:   (c) AUTHOR
-// Licence:    wxWindows licence
+// Copyright:   (c) Stefan Csomor
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 
 #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 "wx/utils.h"
+#include "wx/settings.h"
 
 #include <stdio.h>
 
@@ -22,9 +28,9 @@
 IMPLEMENT_DYNAMIC_CLASS(wxStaticText, wxControl)
 #endif
 
-#include <wx/mac/uma.h>
+#include "wx/mac/uma.h"
 
-BEGIN_EVENT_TABLE(wxStaticText, wxControl)
+BEGIN_EVENT_TABLE(wxStaticText, wxStaticTextBase)
     EVT_PAINT(wxStaticText::OnPaint)
 END_EVENT_TABLE()
 
@@ -35,174 +41,138 @@ bool wxStaticText::Create(wxWindow *parent, wxWindowID id,
            long style,
            const wxString& name)
 {
-    SetName(name);
-    m_backgroundColour = parent->GetBackgroundColour() ;
-    m_foregroundColour = parent->GetForegroundColour() ;
+    m_label = wxStripMenuCodes(label) ;
 
-    if ( id == -1 )
-           m_windowId = (int)NewControlId();
-    else
-           m_windowId = id;
+    if ( !wxControl::Create( parent, id, pos, size, style,
+                             wxDefaultValidator , name ) )
+    {
+        return false;
+    }
 
-    m_windowStyle = style;
-    m_label = label ;
+    SetBestSize( size ) ;
 
-       bool ret = wxControl::Create( parent, id, pos, size, style , wxDefaultValidator , name );
-       SetSizeOrDefault( size ) ;
-    
-    return ret;
+    return true;
+}
+
+const wxString punct = wxT(" ,.-;:!?");
+
+void wxStaticText::DrawParagraph(wxDC &dc, wxString paragraph, int &y)
+{
+    long width, height ;
+  
+    if (paragraph.Length() == 0)
+    {
+        // empty line
+        dc.GetTextExtent( wxT("H"), &width, &height );
+        y += height;
+        
+        return;
+    }
+
+    int x = 0 ;
+
+    bool linedrawn = true;
+    while( paragraph.Length() > 0 )
+    {
+        dc.GetTextExtent( paragraph , &width , &height ) ;
+        
+        if ( width > m_width )
+        {
+            for ( size_t 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=wxEmptyString;
+            y += height ;
+        }
+    }
 }
 
 void wxStaticText::OnDraw( wxDC &dc )
 {
     if (m_width <= 0 || m_height <= 0)
         return;
-
-    PrepareDC(dc);
-    dc.Clear() ;
+    /*
+        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() ) ;
+    }
     
-    int x = 0 ;
+    wxString paragraph;
+    size_t i = 0 ;
+    wxString text = m_label;
     int y = 0 ;
-    wxString text = m_label ;
-    wxString paragraph ;
-       int i = 0 ;
-       int laststop = 0 ;
-       long width, height ;
-
-       while( i < text.Length() )
-       {
-               if( text[i] == 13 || text[i] == 10)
-               {
-                       paragraph = text.Mid( laststop , i - laststop ) ;
-                       while( paragraph.Length() > 0 )
-                       {
-                               dc.GetTextExtent( paragraph , &width , &height ) ;
-                               if ( width > m_width )
-                               {
-                                       for ( int p = paragraph.Length() -1 ; p > 0 ; --p )
-                                       {
-                                               if ( paragraph[p]=='.' )
-                                               {
-                                                       dc.GetTextExtent( paragraph.Left(p+1) , &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+1), pos , y) ;
-                                                       y += height ;
-                                                               paragraph = paragraph.Mid(p+1) ;
-                                                               break ;
-                                                       }
-                                               }
-                                               if ( paragraph[p]==' ' )
-                                               {
-                                                       dc.GetTextExtent( paragraph.Left(p) , &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), pos , y) ;
-                                                       y += height ;
-                                                               paragraph = paragraph.Mid(p+1) ;
-                                                               break ;
-                                                       }
-                                               }
-                                       }
-                               }
-                               else
-                               {
-                               dc.DrawText( paragraph, x , y) ;
-                               paragraph="";
-                               y += height ;
-                               }
-                       }
-                       laststop = i+1 ;
-               }
-               ++i ;
-       }
-       paragraph = text.Mid( laststop , text.Length() - laststop ) ;
-       while( paragraph.Length() > 0 )
-       {
-               dc.GetTextExtent( paragraph , &width , &height ) ;
-               if ( width > m_width )
-               {
-                       for ( int p = paragraph.Length() -1 ; p > 0 ; --p )
-                       {
-                               if ( paragraph[p]=='.' )
-                               {
-                                       dc.GetTextExtent( paragraph.Left(p+1) , &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+1), pos , y) ;
-                                               y += height ;
-                                               paragraph = paragraph.Mid(p+1) ;
-                                               break ;
-                                       }
-                               }
-                               if ( paragraph[p]==' ' )
-                               {
-                                       dc.GetTextExtent( paragraph.Left(p) , &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), pos , y) ;
-                                               y += height ;
-                                               paragraph = paragraph.Mid(p+1) ;
-                                               break ;
-                                       }
-                               }
-                       }
-               }
-               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 ;
-               }
-       }
+    while (i < text.Length())
+    {
+        
+        if (text[i] == 13 || text[i] == 10)
+        {
+            DrawParagraph(dc, paragraph,y);
+            paragraph = wxEmptyString ;
+        }
+        else
+        {
+            paragraph += text[i];
+        }
+        ++i;
+    }
+    if (paragraph.Length() > 0)
+        DrawParagraph(dc, paragraph,y);
 }
 
-void wxStaticText::OnPaint( wxPaintEvent &event ) 
+void wxStaticText::OnPaint( wxPaintEvent & WXUNUSED(event) )
 {
     wxPaintDC dc(this);
     OnDraw( dc ) ;
@@ -210,14 +180,16 @@ void wxStaticText::OnPaint( wxPaintEvent &event )
 
 wxSize wxStaticText::DoGetBestSize() const
 {
-       int x , y  ;
-   int widthTextMax = 0, widthLine,
+    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 ) {
+    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
@@ -227,12 +199,17 @@ wxSize wxStaticText::DoGetBestSize() const
                     GetTextExtent(_T("W"), NULL, &heightLineDefault);
 
                 heightTextTotal += heightLineDefault;
+
+                heightTextTotal++;  // FIXME: why is this necessary?
             }
-            else {
+            else
+            {
                 GetTextExtent(curLine, &widthLine, &heightLine);
                 if ( widthLine > widthTextMax )
                     widthTextMax = widthLine;
                 heightTextTotal += heightLine;
+
+                heightTextTotal++;  // FIXME: why is this necessary?
             }
 
             if ( *pc == wxT('\n') ) {
@@ -253,11 +230,33 @@ wxSize wxStaticText::DoGetBestSize() const
 
 void wxStaticText::SetLabel(const wxString& st )
 {
-       SetTitle( st ) ;
-       m_label = st ;
-       if ( !(GetWindowStyle() & wxST_NO_AUTORESIZE) )
-               SetSizeOrDefault() ;
-       
-    wxClientDC dc(this);
-    OnDraw( dc ) ;
+    SetTitle( st ) ;
+    m_label = st ;
+    if ( !(GetWindowStyle() & wxST_NO_AUTORESIZE) )
+    {
+        // temporary fix until layout measurement and drawing are in synch again
+        Refresh() ;
+        SetSize( GetBestSize() ) ;
+    }
+    Refresh() ;
+    Update() ;
+}
+
+bool wxStaticText::SetFont(const wxFont& font)
+{
+    bool ret = wxControl::SetFont(font);
+
+       if ( ret )
+       {
+           // adjust the size of the window to fit to the label unless autoresizing is
+           // disabled
+           if ( !(GetWindowStyle() & wxST_NO_AUTORESIZE) )
+           {
+               // temporary fix until layout measurement and drawing are in synch again
+            Refresh() ;
+               SetSize( GetBestSize() );
+           }
+       }
+
+    return ret;
 }