use generic timer in wxMGL and wxX11

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

diff --git a/include/wx/gtk1/stattext.h b/include/wx/gtk1/stattext.h
index 809568191e500544135a654d35497a202eab0b2a..9ae390b841876ce96bb2fd3658f4a244d2f627a3 100644 (file)
--- a/include/wx/gtk1/stattext.h
+++ b/include/wx/gtk1/stattext.h
@@ -30,8 +30,6 @@ class wxStaticText;
 // global data
 //-----------------------------------------------------------------------------
 
 // global data
 //-----------------------------------------------------------------------------
 

-extern const wxChar *wxStaticTextNameStr;
-

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


@@ -39,7 +37,6 @@ extern const wxChar *wxStaticTextNameStr;
 class wxStaticText : public wxControl
 {
 public:
 class wxStaticText : public wxControl
 {
 public:

-

     wxStaticText();
     wxStaticText(wxWindow *parent,
                  wxWindowID id,
     wxStaticText();
     wxStaticText(wxWindow *parent,
                  wxWindowID id,


@@ -60,10 +57,16 @@ public:
     wxString GetLabel() const;
     void SetLabel( const wxString &label );
 
     wxString GetLabel() const;
     void SetLabel( const wxString &label );
 

+    bool SetFont( const wxFont &font );
+    

     // implementation
     // implementation

+    // --------------
+    

     void ApplyWidgetStyle();
 
 protected:
     void ApplyWidgetStyle();
 
 protected:

+    virtual wxSize DoGetBestSize() const;
+

     DECLARE_DYNAMIC_CLASS(wxStaticText)
 };
 
     DECLARE_DYNAMIC_CLASS(wxStaticText)
 };