post wxUniv merge fixes

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

diff --git a/include/wx/mac/stattext.h b/include/wx/mac/stattext.h
index e41f06ba4ff3dbff734097fe28944852c2ee9047..670d12cbf3ebf4adcad3a6d1a5dddee098dc51d3 100644 (file)
--- a/include/wx/mac/stattext.h
+++ b/include/wx/mac/stattext.h
@@ -20,7 +20,7 @@
 
 WXDLLEXPORT_DATA(extern const char*) wxStaticTextNameStr;
 
-class WXDLLEXPORT wxStaticText: public wxControl
+class WXDLLEXPORT wxStaticText: public wxStaticTextBase
 {
   DECLARE_DYNAMIC_CLASS(wxStaticText)
  public:
@@ -49,6 +49,7 @@ class WXDLLEXPORT wxStaticText: public wxControl
   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 ) ;
   wxSize DoGetBestSize() const ;