added generic color dialog to setup

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

diff --git a/src/mac/carbon/stattext.cpp b/src/mac/carbon/stattext.cpp
index 783d231f9b1134122053e0c6fc1aa6a14b148780..6439400bf380e239c93a531b6b3fac5f8506e5c3 100644 (file)
--- a/src/mac/carbon/stattext.cpp
+++ b/src/mac/carbon/stattext.cpp
@@ -28,7 +28,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxStaticText, wxControl)
 
 #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()
 


@@ -52,7 +52,7 @@ bool wxStaticText::Create(wxWindow *parent, wxWindowID id,
     m_label = label ;
 
        bool ret = wxControl::Create( parent, id, pos, size, style , wxDefaultValidator , name );
     m_label = label ;
 
        bool ret = wxControl::Create( parent, id, pos, size, style , wxDefaultValidator , name );

-       SetSizeOrDefault( size ) ;
+       SetBestSize( size ) ;

     
     return ret;
 }
     
     return ret;
 }


@@ -235,7 +235,7 @@ void wxStaticText::SetLabel(const wxString& st )
        SetTitle( st ) ;
        m_label = st ;
        if ( !(GetWindowStyle() & wxST_NO_AUTORESIZE) )
        SetTitle( st ) ;
        m_label = st ;
        if ( !(GetWindowStyle() & wxST_NO_AUTORESIZE) )

-               SetSizeOrDefault() ;
+               SetSize( GetBestSize() ) ;

 
        Refresh() ;     
        MacUpdateImmediately() ;
 
        Refresh() ;     
        MacUpdateImmediately() ;