added network-to-host noops

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

diff --git a/src/mac/carbon/stattext.cpp b/src/mac/carbon/stattext.cpp
index 4c8b9414a478fe4b8818e681550fb5aa101ec922..3536eb11e9359d6c78e8d2f51bac138c0d37fd61 100644 (file)
--- a/src/mac/carbon/stattext.cpp
+++ b/src/mac/carbon/stattext.cpp
@@ -30,10 +30,6 @@ 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,


@@ -41,6 +37,8 @@ bool wxStaticText::Create(wxWindow *parent, wxWindowID id,
            long style,
            const wxString& name)
 {
            long style,
            const wxString& name)
 {

+    m_macIsUserPane = FALSE ;
+    

     m_label = wxStripMenuCodes(label) ;
 
     if ( !wxControl::Create( parent, id, pos, size, style,
     m_label = wxStripMenuCodes(label) ;
 
     if ( !wxControl::Create( parent, id, pos, size, style,


@@ -49,196 +47,53 @@ bool wxStaticText::Create(wxWindow *parent, wxWindowID id,
         return false;
     }
 
         return false;
     }
 

-    SetBestSize( size ) ;
-
-    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;
-    }
+    Rect bounds = wxMacGetBoundsForControl( this , pos , size ) ;
+    wxMacCFStringHolder str(m_label,m_font.GetEncoding() ) ;
+    verify_noerr(CreateStaticTextControl(MAC_WXHWND(parent->MacGetTopLevelWindowRef()),&bounds, str , 
+        NULL , (ControlRef*)&m_macControl ) ) ;  

 
 

-    int x = 0 ;
+    MacPostControlCreate(pos,size) ;

 
 

-    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 ;
-        }
-    }
+    return true;

 }
 
 }
 

-void wxStaticText::OnDraw( wxDC &dc )
+wxSize wxStaticText::DoGetBestSize() const

 {
 {

-    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() ) ;
-    }
+    ControlFontStyleRec controlFont ;
+    Size outSize ;
+    verify_noerr( GetControlData( (ControlRef) m_macControl , kControlEntireControl , kControlFontStyleTag , sizeof(controlFont) , &controlFont , &outSize ) ) ;

     
     

-    wxString paragraph;
-    size_t i = 0 ;
-    wxString text = m_label;
-    int y = 0 ;
-    while (i < text.Length())
+    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 (text[i] == 13 || text[i] == 10)
-        {
-            DrawParagraph(dc, paragraph,y);
-            paragraph = wxEmptyString ;
-        }
-        else
-        {
-            paragraph += text[i];
-        }
-        ++i;
+        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 ) ) ;

     }
     }

-    if (paragraph.Length() > 0)
-        DrawParagraph(dc, paragraph,y);
+    if ( m_label.Length() == 0 )
+        bounds.h = 0 ;
+    return wxSize(bounds.h, bounds.v);

 }
 
 }
 

-void wxStaticText::OnPaint( wxPaintEvent & WXUNUSED(event) )
-{
-    wxPaintDC dc(this);
-    OnDraw( dc ) ;
-}
-
-wxSize wxStaticText::DoGetBestSize() const
+void wxStaticText::SetLabel(const wxString& st )

 {
 {

-    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);
-}
+    m_label = wxStripMenuCodes(st) ;
+    
+    wxMacCFStringHolder str(m_label,m_font.GetEncoding() ) ;
+    CFStringRef ref = str ;
+    SetControlData( (ControlRef) m_macControl, kControlEntireControl , kControlStaticTextCFStringTag, sizeof( CFStringRef ),
+               &ref );

 
 

-void wxStaticText::SetLabel(const wxString& st )
-{
-    SetTitle( st ) ;
-    m_label = st ;

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

-    {
-        // temporary fix until layout measurement and drawing are in synch again
-        Refresh() ;

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

-    }
-    Refresh() ;
+

     Update() ;
 }
 
     Update() ;
 }
 


@@ -248,14 +103,8 @@ bool wxStaticText::SetFont(const wxFont& font)
 
        if ( ret )
        {
 
        if ( ret )
        {

-           // adjust the size of the window to fit to the label unless autoresizing is
-           // disabled

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

-           {
-               // temporary fix until layout measurement and drawing are in synch again
-            Refresh() ;

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

-           }

        }
 
     return ret;
        }
 
     return ret;