avoid system pop-up menu commands being handled by wxApp, bug was shown in printing...

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

diff --git a/src/mac/carbon/stattext.cpp b/src/mac/carbon/stattext.cpp
index c31530e181e3256210fa313cd44f50917efceda1..3c67c64a9aae6ef8460ad235395b762ebe13c762 100644 (file)
--- a/src/mac/carbon/stattext.cpp
+++ b/src/mac/carbon/stattext.cpp
@@ -1,17 +1,17 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        stattext.cpp
 // Purpose:     wxStaticText
 /////////////////////////////////////////////////////////////////////////////
 // Name:        stattext.cpp
 // Purpose:     wxStaticText

-// Author:      AUTHOR
+// Author:      Stefan Csomor

 // Modified by:
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Modified by:
 // Created:     04/01/98
 // RCS-ID:      $Id$

-// Copyright:   (c) AUTHOR
+// Copyright:   (c) Stefan Csomor

 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-#pragma implementation "stattext.h"
-#endif
+#include "wx/wxprec.h"
+
+#if wxUSE_STATTEXT

 
 #include "wx/app.h"
 #include "wx/stattext.h"
 
 #include "wx/app.h"
 #include "wx/stattext.h"


@@ -24,16 +24,10 @@
 
 #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, 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,


@@ -41,208 +35,87 @@ bool wxStaticText::Create(wxWindow *parent, wxWindowID id,
            long style,
            const wxString& name)
 {
            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 = label ;
-
-    bool ret = wxControl::Create( parent, id, pos, size, style , wxDefaultValidator , name );
-    SetBestSize( size ) ;
-
-    return ret;
-}
-
-const wxString punct = " ,.-;:!?";
-
-void wxStaticText::DrawParagraph(wxDC &dc, wxString paragraph, int &y)
-{
-  int x = 0 ;
-
-  int i = 0 ;
-  long width, height ;
-  bool linedrawn = true;
-  while( paragraph.Length() > 0 )
-  {
-        dc.GetTextExtent( paragraph , &width , &height ) ;
+    m_macIsUserPane = FALSE ;
+    
+    m_label = wxStripMenuCodes(label) ;

 
 

-        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 ;
-        }
+    if ( !wxControl::Create( parent, id, pos, size, style,
+                             wxDefaultValidator , name ) )
+    {
+        return false;

     }
     }

-}

 
 

-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;
-  int 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 = "" ;
-       }
-       else
-       {
-        paragraph += text[i];
-    }
-    ++i;
-  }
-  if (paragraph.Length() > 0)
-         DrawParagraph(dc, paragraph,y);
-}
+    Rect bounds = wxMacGetBoundsForControl( this , pos , size ) ;
+    wxMacCFStringHolder str(m_label,m_font.GetEncoding() ) ;
+    m_peer = new wxMacControl(this) ;
+    verify_noerr(CreateStaticTextControl(MAC_WXHWND(parent->MacGetTopLevelWindowRef()),&bounds, str , 
+        NULL , m_peer->GetControlRefAddr() ) ) ;  

 
 

-void wxStaticText::OnPaint( wxPaintEvent &event )
-{
-    wxPaintDC dc(this);
-    OnDraw( dc ) ;
+    MacPostControlCreate(pos,size) ;
+
+    return true;

 }
 
 wxSize wxStaticText::DoGetBestSize() const
 {
 }
 
 wxSize wxStaticText::DoGetBestSize() const
 {

-    int widthTextMax = 0, widthLine,
-        heightTextTotal = 0, heightLineDefault = 0, heightLine = 0;
-
-    wxString curLine;
-    for ( const wxChar *pc = m_label; ; pc++ )
+    ControlFontStyleRec controlFont ;
+    verify_noerr( m_peer->GetData<ControlFontStyleRec>(kControlEntireControl , kControlFontStyleTag , &controlFont ) ) ;
+    
+    Point bounds ;
+    SInt16 baseline ;
+    wxMacCFStringHolder str(m_label ,  m_font.GetEncoding() ) ;
+    if ( m_font.MacGetThemeFontID() != kThemeCurrentPortFont )
+        verify_noerr( GetThemeTextDimensions( (m_label.Length() > 0 ? ((CFStringRef) str ) : CFSTR(" ") ) , m_font.MacGetThemeFontID() , kThemeStateActive , false , &bounds , &baseline ) ) ;
+    else

     {
     {

-        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;
-        }
+        wxMacWindowStateSaver sv( this ) ;
+        ::TextFont( m_font.MacGetFontNum() ) ;
+        ::TextSize( (short)( m_font.MacGetFontSize()) ) ;
+        ::TextFace( m_font.MacGetFontStyle() ) ;        
+        verify_noerr( GetThemeTextDimensions( (m_label.Length() > 0 ? ((CFStringRef) str ) : CFSTR(" ") ) , kThemeCurrentPortFont , kThemeStateActive , false , &bounds , &baseline ) ) ;

     }
     }

-
-    return wxSize(widthTextMax, heightTextTotal);
+    if ( m_label.Length() == 0 )
+        bounds.h = 0 ;
+        
+    bounds.h += MacGetLeftBorderSize() + MacGetRightBorderSize() ;
+    bounds.v += MacGetTopBorderSize() + MacGetBottomBorderSize() ;    
+    return wxSize(bounds.h, bounds.v);

 }
 
 void wxStaticText::SetLabel(const wxString& st )
 {
 }
 
 void wxStaticText::SetLabel(const wxString& st )
 {

-    SetTitle( st ) ;
-    m_label = st ;
+
+    m_label = wxStripMenuCodes(st) ;
+    
+    wxMacCFStringHolder str(m_label,m_font.GetEncoding() ) ;
+    CFStringRef ref = str ;
+    verify_noerr( m_peer->SetData<CFStringRef>(kControlEntireControl , kControlStaticTextCFStringTag, ref ) ) ;
+

     if ( !(GetWindowStyle() & wxST_NO_AUTORESIZE) )
     if ( !(GetWindowStyle() & wxST_NO_AUTORESIZE) )

+    {
+        InvalidateBestSize();

         SetSize( GetBestSize() ) ;
         SetSize( GetBestSize() ) ;

-
+    }

     Refresh() ;
     Refresh() ;

-    Update() ;
+    // we shouldn't need forced updates
+    // Update() ;

 }
 
 bool wxStaticText::SetFont(const wxFont& font)
 {
     bool ret = wxControl::SetFont(font);
 
 }
 
 bool wxStaticText::SetFont(const wxFont& font)
 {
     bool ret = wxControl::SetFont(font);
 

-    // adjust the size of the window to fit to the label unless autoresizing is
-    // disabled
-    if ( !(GetWindowStyle() & wxST_NO_AUTORESIZE) )
-        SetSize( GetBestSize() );
+       if ( ret )
+       {
+           if ( !(GetWindowStyle() & wxST_NO_AUTORESIZE) )
+        {
+            InvalidateBestSize();
+            SetSize( GetBestSize() );
+        }
+       }

 
     return ret;
 }
 
     return ret;
 }

+
+#endif //if wxUSE_STATTEXT
+