prevent the parent window from losing activation when a popup is shown

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

diff --git a/include/wx/mac/stattext.h b/include/wx/mac/stattext.h
index 670d12cbf3ebf4adcad3a6d1a5dddee098dc51d3..bb2b02e84c7cfaec1a4d5b3bba3bef02d9f8b2db 100644 (file)
--- a/include/wx/mac/stattext.h
+++ b/include/wx/mac/stattext.h
@@ -16,15 +16,11 @@
 #pragma interface "stattext.h"
 #endif
 
-#include "wx/control.h"
-
-WXDLLEXPORT_DATA(extern const char*) wxStaticTextNameStr;
-
 class WXDLLEXPORT wxStaticText: public wxStaticTextBase
 {
   DECLARE_DYNAMIC_CLASS(wxStaticText)
  public:
-  inline wxStaticText() { }
+  inline wxStaticText() : m_label() { }
 
   inline wxStaticText(wxWindow *parent, wxWindowID id,
            const wxString& label,
@@ -49,10 +45,10 @@ class WXDLLEXPORT wxStaticText: public wxStaticTextBase
   virtual void Command(wxCommandEvent& WXUNUSED(event)) {};
   virtual void ProcessCommand(wxCommandEvent& WXUNUSED(event)) {};
   // events
-  void DrawParagraph(wxDC &dc, wxString paragraph);
+  void DrawParagraph(wxDC &dc, wxString paragraph, int &y);
   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 ;