moved MGL initialization to earlier stage (crashes otherwise...) and implemented...

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

diff --git a/include/wx/mac/stattext.h b/include/wx/mac/stattext.h
index aa8eaf229eb9731065a8474cffd145c543ad046e..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:


@@ -44,12 +40,20 @@ class WXDLLEXPORT wxStaticText: public wxControl
            const wxString& name = wxStaticTextNameStr);
 
   // accessors
            const wxString& name = wxStaticTextNameStr);
 
   // accessors

-  void SetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO);
-  void SetLabel(const wxString&);
-
+  void SetLabel( const wxString &str ) ;

   // operations
   virtual void Command(wxCommandEvent& WXUNUSED(event)) {};
   virtual void ProcessCommand(wxCommandEvent& WXUNUSED(event)) {};
   // operations
   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 ) ;
+  virtual wxSize DoGetBestSize() const ;
+  virtual bool AcceptsFocus() const { return FALSE; }
+ private :
+       wxString        m_label ;
+
+   DECLARE_EVENT_TABLE()

 };
 
 #endif
 };
 
 #endif