compilation warning (and possible bug) fix

[wxWidgets.git] / include / wx / mac / stattext.h

diff --git a/include/wx/mac/stattext.h b/include/wx/mac/stattext.h
index 5cf88232a2bfa19ebe3dca1741798060f2138da3..934d7e81186971638f1ddf6c33eb6065ab028cbc 100644 (file)
--- a/include/wx/mac/stattext.h
+++ b/include/wx/mac/stattext.h
@@ -16,11 +16,7 @@
 #pragma interface "stattext.h"
 #endif
 
-#include "wx/control.h"
-
-WXDLLEXPORT_DATA(extern const char*) wxStaticTextNameStr;
-
-class WXDLLEXPORT wxStaticText: public wxControl
+class WXDLLEXPORT wxStaticText: public wxStaticTextBase
 {
   DECLARE_DYNAMIC_CLASS(wxStaticText)
  public:
@@ -44,14 +40,16 @@ class WXDLLEXPORT wxStaticText: public wxControl
            const wxString& name = wxStaticTextNameStr);
 
   // accessors
-  void SetLabel(const wxString& , bool resize );
-  void SetLabel( const wxString &str ) { SetLabel( str , true ) ; }
+  void SetLabel( const wxString &str ) ;
   // operations
   virtual void Command(wxCommandEvent& WXUNUSED(event)) {};
   virtual void ProcessCommand(wxCommandEvent& WXUNUSED(event)) {};
   // events
+  void DrawParagraph(wxDC &dc, wxString paragraph);
   void OnPaint( wxPaintEvent &event ) ;
-  wxSize DoGetBestSize() const ;
+  void OnDraw( wxDC &dc ) ;
+  virtual wxSize DoGetBestSize() const ;
+  virtual bool AcceptsFocus() const { return FALSE; }
  private :
        wxString        m_label ;