fixed keypresses handling to correctly translate Unicode characters to current locale...

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

diff --git a/src/mac/carbon/stattext.cpp b/src/mac/carbon/stattext.cpp
index 3536eb11e9359d6c78e8d2f51bac138c0d37fd61..f4757d19d7c223c2b853c4ac0779efdf3f3f55f1 100644 (file)
--- a/src/mac/carbon/stattext.cpp
+++ b/src/mac/carbon/stattext.cpp
@@ -49,8 +49,9 @@ bool wxStaticText::Create(wxWindow *parent, wxWindowID id,
 
     Rect bounds = wxMacGetBoundsForControl( this , pos , size ) ;
     wxMacCFStringHolder str(m_label,m_font.GetEncoding() ) ;
 
     Rect bounds = wxMacGetBoundsForControl( this , pos , size ) ;
     wxMacCFStringHolder str(m_label,m_font.GetEncoding() ) ;

+    m_peer = new wxMacControl() ;

     verify_noerr(CreateStaticTextControl(MAC_WXHWND(parent->MacGetTopLevelWindowRef()),&bounds, str , 
     verify_noerr(CreateStaticTextControl(MAC_WXHWND(parent->MacGetTopLevelWindowRef()),&bounds, str , 

-        NULL , (ControlRef*)&m_macControl ) ) ;  
+        NULL , *m_peer ) ) ;  

 
     MacPostControlCreate(pos,size) ;
 
 
     MacPostControlCreate(pos,size) ;
 


@@ -61,7 +62,7 @@ wxSize wxStaticText::DoGetBestSize() const
 {
     ControlFontStyleRec controlFont ;
     Size outSize ;
 {
     ControlFontStyleRec controlFont ;
     Size outSize ;

-    verify_noerr( GetControlData( (ControlRef) m_macControl , kControlEntireControl , kControlFontStyleTag , sizeof(controlFont) , &controlFont , &outSize ) ) ;
+    verify_noerr( GetControlData( *m_peer , kControlEntireControl , kControlFontStyleTag , sizeof(controlFont) , &controlFont , &outSize ) ) ;

     
     Point bounds ;
     SInt16 baseline ;
     
     Point bounds ;
     SInt16 baseline ;


@@ -88,11 +89,14 @@ void wxStaticText::SetLabel(const wxString& st )
     
     wxMacCFStringHolder str(m_label,m_font.GetEncoding() ) ;
     CFStringRef ref = str ;
     
     wxMacCFStringHolder str(m_label,m_font.GetEncoding() ) ;
     CFStringRef ref = str ;

-    SetControlData( (ControlRef) m_macControl, kControlEntireControl , kControlStaticTextCFStringTag, sizeof( CFStringRef ),
+    SetControlData( *m_peer, kControlEntireControl , kControlStaticTextCFStringTag, sizeof( CFStringRef ),

                &ref );
 
     if ( !(GetWindowStyle() & wxST_NO_AUTORESIZE) )
                &ref );
 
     if ( !(GetWindowStyle() & wxST_NO_AUTORESIZE) )

+    {

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

+        SetSizeHints(GetSize());
+    }

 
     Update() ;
 }
 
     Update() ;
 }


@@ -104,7 +108,10 @@ bool wxStaticText::SetFont(const wxFont& font)
        if ( ret )
        {
            if ( !(GetWindowStyle() & wxST_NO_AUTORESIZE) )
        if ( ret )
        {
            if ( !(GetWindowStyle() & wxST_NO_AUTORESIZE) )

+            {

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

+                SetSizeHints(GetSize());
+            }

        }
 
     return ret;
        }
 
     return ret;