added carbon events for navigation keys, size corrections

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

diff --git a/src/mac/stattext.cpp b/src/mac/stattext.cpp
index b249fc0e11b8be216d0363d123a1e9c8a4701907..c36ecf6845edc05eefc73b1e990fef44a720c74e 100644 (file)
--- a/src/mac/stattext.cpp
+++ b/src/mac/stattext.cpp
@@ -6,7 +6,7 @@
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) AUTHOR
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) AUTHOR

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__


@@ -15,14 +15,22 @@
 
 #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 "wx/utils.h"
+#include "wx/settings.h"

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

+#if !USE_SHARED_LIBRARY

 IMPLEMENT_DYNAMIC_CLASS(wxStaticText, wxControl)
 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()
 
     EVT_PAINT(wxStaticText::OnPaint)
 END_EVENT_TABLE()
 


@@ -38,82 +46,179 @@ bool wxStaticText::Create(wxWindow *parent, wxWindowID id,
     m_foregroundColour = parent->GetForegroundColour() ;
 
     if ( id == -1 )
     m_foregroundColour = parent->GetForegroundColour() ;
 
     if ( id == -1 )

-           m_windowId = (int)NewControlId();
+        m_windowId = (int)NewControlId();

     else
     else

-           m_windowId = id;
+        m_windowId = id;

 
     m_windowStyle = style;
     m_label = label ;
 
 
     m_windowStyle = style;
     m_label = label ;
 

-       bool ret = wxControl::Create( parent, id, pos, size, style , wxDefaultValidator , name );
-       SetSizeOrDefault( size ) ;
+    bool ret = wxControl::Create( parent, id, pos, size, style , wxDefaultValidator , name );
+    SetBestSize( size ) ;

     
     return ret;
 }
 
     
     return ret;
 }
 

-void wxStaticText::OnPaint( wxPaintEvent &event ) 
-{
-    wxPaintDC dc(this);
-    PrepareDC(dc);
-    dc.Clear() ;
-    dc.DrawText( m_label , 0 , 0 ) ;
-}
+const wxString punct = " ,.-;:!?";

 
 

-wxSize wxStaticText::DoGetBestSize() const
+void wxStaticText::DrawParagraph(wxDC &dc, wxString paragraph)

 {
 {

-       int x , y  ;
-       GetTextExtent( m_label , &x , &y ) ;
-       return wxSize( x , y ) ;
+  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::SetLabel(const wxString& st , bool resize )
+void wxStaticText::OnDraw( wxDC &dc )

 {
 {

-       SetTitle( st ) ;
-       m_label = st ;
-       if ( resize )
-               SetSizeOrDefault() ;
-       else
-               Refresh() ;
+    if (m_width <= 0 || m_height <= 0)
+        return;
+
+  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;
+  int i = 0 ;
+  wxString text = m_label;
+       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::SetSize(int x, int y, int width, int height, int sizeFlags)
+
+void wxStaticText::OnPaint( wxPaintEvent &event ) 

 {
 {

-    wxControl::SetSize( x , y , width , height , sizeFlags ) ;
+    wxPaintDC dc(this);
+    OnDraw( dc ) ;

 }
 
 }
 

-bool wxStaticText::Create(wxWindow *parent, wxWindowID id,
-           const wxString& label,
-           const wxPoint& pos,
-           const wxSize& size,
-           long style,
-           const wxString& name)
+wxSize wxStaticText::DoGetBestSize() const

 {
 {

-       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;
+    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;
+                
+                heightTextTotal++;  // FIXME: why is this necessary?
+            }
+            else
+            {
+                GetTextExtent(curLine, &widthLine, &heightLine);
+                if ( widthLine > widthTextMax )
+                    widthTextMax = widthLine;
+                heightTextTotal += heightLine;
+                
+                heightTextTotal++;  // FIXME: why is this necessary?
+            }
+
+            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 , bool resize )
+void wxStaticText::SetLabel(const wxString& st )

 {
        SetTitle( st ) ;
 {
        SetTitle( st ) ;

-       wxString label ;
-       
-       if( wxApp::s_macDefaultEncodingIsPC )
-               label = wxMacMakeMacStringFromPC( st ) ;
-       else
-               label = st ;
-               
-       ::UMASetControlData( m_macControl, kControlLabelPart, kControlStaticTextTextTag , (long) label.Length() , (char*)(const char*) label ) ;
-       Refresh() ;
-}
-*/
+       m_label = st ;
+       if ( !(GetWindowStyle() & wxST_NO_AUTORESIZE) )
+               SetSize( GetBestSize() ) ;

 
 

+       Refresh() ;     
+       Update() ;
+}