added wx/defs.h include to correct compilation issues under Mac OS X

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

diff --git a/include/wx/mac/stattext.h b/include/wx/mac/stattext.h
index e41f06ba4ff3dbff734097fe28944852c2ee9047..934d7e81186971638f1ddf6c33eb6065ab028cbc 100644 (file)
--- a/include/wx/mac/stattext.h
+++ b/include/wx/mac/stattext.h
@@ -16,11 +16,7 @@
 #pragma interface "stattext.h"
 #endif
 
 #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:
 {
   DECLARE_DYNAMIC_CLASS(wxStaticText)
  public:


@@ -49,9 +45,10 @@ class WXDLLEXPORT wxStaticText: public wxControl
   virtual void Command(wxCommandEvent& WXUNUSED(event)) {};
   virtual void ProcessCommand(wxCommandEvent& WXUNUSED(event)) {};
   // events
   virtual void Command(wxCommandEvent& WXUNUSED(event)) {};
   virtual void ProcessCommand(wxCommandEvent& WXUNUSED(event)) {};
   // events

+  void DrawParagraph(wxDC &dc, wxString paragraph);

   void OnPaint( wxPaintEvent &event ) ;
   void OnDraw( wxDC &dc ) ;
   void OnPaint( wxPaintEvent &event ) ;
   void OnDraw( wxDC &dc ) ;

-  wxSize DoGetBestSize() const ;
+  virtual wxSize DoGetBestSize() const ;

   virtual bool AcceptsFocus() const { return FALSE; }
  private :
        wxString        m_label ;
   virtual bool AcceptsFocus() const { return FALSE; }
  private :
        wxString        m_label ;