fixed (rare but fatal) bug in wxWindowDisabler

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

diff --git a/src/mac/stattext.cpp b/src/mac/stattext.cpp
index ec4de7cc317e0181c8c54dcc303c3a4de8b246a9..b249fc0e11b8be216d0363d123a1e9c8a4701907 100644 (file)
--- a/src/mac/stattext.cpp
+++ b/src/mac/stattext.cpp
@@ -22,6 +22,65 @@ IMPLEMENT_DYNAMIC_CLASS(wxStaticText, wxControl)
 
 #include <wx/mac/uma.h>
 
 
 #include <wx/mac/uma.h>
 

+BEGIN_EVENT_TABLE(wxStaticText, wxControl)
+    EVT_PAINT(wxStaticText::OnPaint)
+END_EVENT_TABLE()
+
+bool wxStaticText::Create(wxWindow *parent, wxWindowID id,
+           const wxString& label,
+           const wxPoint& pos,
+           const wxSize& size,
+           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 );
+       SetSizeOrDefault( size ) ;
+    
+    return ret;
+}
+
+void wxStaticText::OnPaint( wxPaintEvent &event ) 
+{
+    wxPaintDC dc(this);
+    PrepareDC(dc);
+    dc.Clear() ;
+    dc.DrawText( m_label , 0 , 0 ) ;
+}
+
+wxSize wxStaticText::DoGetBestSize() const
+{
+       int x , y  ;
+       GetTextExtent( m_label , &x , &y ) ;
+       return wxSize( x , y ) ;
+}
+
+void wxStaticText::SetLabel(const wxString& st , bool resize )
+{
+       SetTitle( st ) ;
+       m_label = st ;
+       if ( resize )
+               SetSizeOrDefault() ;
+       else
+               Refresh() ;
+}
+/*
+void wxStaticText::SetSize(int x, int y, int width, int height, int sizeFlags)
+{
+    wxControl::SetSize( x , y , width , height , sizeFlags ) ;
+}
+

 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,


@@ -56,4 +115,5 @@ void wxStaticText::SetLabel(const wxString& st , bool resize )
        ::UMASetControlData( m_macControl, kControlLabelPart, kControlStaticTextTextTag , (long) label.Length() , (char*)(const char*) label ) ;
        Refresh() ;
 }
        ::UMASetControlData( m_macControl, kControlLabelPart, kControlStaticTextTextTag , (long) label.Length() , (char*)(const char*) label ) ;
        Refresh() ;
 }

+*/