Fix sending wxEVT_COMMAND_DATAVIEW_COLUMN_HEADER_CLICK, fixes #10894: Missing OSX...

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

diff --git a/include/wx/gtk1/stattext.h b/include/wx/gtk1/stattext.h
index d114e7b09eb23932aa89a14b57b0edaeb03601b9..6fdfaea16df78530d78aabc84272fe7dd2476df9 100644 (file)
--- a/include/wx/gtk1/stattext.h
+++ b/include/wx/gtk1/stattext.h
@@ -10,26 +10,11 @@
 #ifndef __GTKSTATICTEXTH__
 #define __GTKSTATICTEXTH__
 
 #ifndef __GTKSTATICTEXTH__
 #define __GTKSTATICTEXTH__
 

-#include "wx/defs.h"
-#include "wx/object.h"
-#include "wx/list.h"
-#include "wx/control.h"
-
-//-----------------------------------------------------------------------------
-// classes
-//-----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxStaticText;
-
-//-----------------------------------------------------------------------------
-// global data
-//-----------------------------------------------------------------------------
-

 //-----------------------------------------------------------------------------
 // wxStaticText
 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 // wxStaticText
 //-----------------------------------------------------------------------------
 

-class WXDLLIMPEXP_CORE wxStaticText : public wxControl
+class WXDLLIMPEXP_CORE wxStaticText : public wxStaticTextBase

 {
 public:
     wxStaticText();
 {
 public:
     wxStaticText();


@@ -49,21 +34,15 @@ public:
                 long style = 0,
                 const wxString &name = wxStaticTextNameStr );
 
                 long style = 0,
                 const wxString &name = wxStaticTextNameStr );
 

-    wxString GetLabel() const;
-    void SetLabel( const wxString &label );
+    virtual wxString GetLabel() const;
+    virtual void SetLabel( const wxString &label );

 
 

-    bool SetFont( const wxFont &font );
-    bool SetForegroundColour( const wxColour& colour );
+    virtual bool SetFont( const wxFont &font );
+    virtual bool SetForegroundColour( const wxColour& colour );

 
     static wxVisualAttributes
     GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
 
 
     static wxVisualAttributes
     GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
 

-    // see wx/stattext.h
-    void Wrap(int width);
-
-    // implementation
-    // --------------
-

 protected:
     virtual void DoSetSize(int x, int y,
                            int width, int height,
 protected:
     virtual void DoSetSize(int x, int y,
                            int width, int height,


@@ -74,5 +53,4 @@ protected:
     DECLARE_DYNAMIC_CLASS(wxStaticText)
 };
 
     DECLARE_DYNAMIC_CLASS(wxStaticText)
 };
 

-#endif
-    // __GTKSTATICTEXTH__
+#endif // __GTKSTATICTEXTH__