no changes, just remove #if'd out code

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

diff --git a/include/wx/gtk/stattext.h b/include/wx/gtk/stattext.h
index 251033691818fe8262e8a421c9bf5af5eb13a6c4..f2f58204e1471a75a640d70223abd67663ba9a85 100644 (file)
--- a/include/wx/gtk/stattext.h
+++ b/include/wx/gtk/stattext.h
@@ -1,10 +1,10 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        stattext.h
+// Name:        wx/gtk/stattext.h

 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_GTK_STATTEXT_H_
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_GTK_STATTEXT_H_


@@ -14,7 +14,7 @@
 // wxStaticText
 //-----------------------------------------------------------------------------
 
 // wxStaticText
 //-----------------------------------------------------------------------------
 

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

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


@@ -22,7 +22,7 @@ public:
                  wxWindowID id,
                  const wxString &label,
                  const wxPoint &pos = wxDefaultPosition,
                  wxWindowID id,
                  const wxString &label,
                  const wxPoint &pos = wxDefaultPosition,

-                 const wxSize &size = wxDefaultSize, 
+                 const wxSize &size = wxDefaultSize,

                  long style = 0,
                  const wxString &name = wxStaticTextNameStr );
 
                  long style = 0,
                  const wxString &name = wxStaticTextNameStr );
 


@@ -30,21 +30,16 @@ public:
                 wxWindowID id,
                 const wxString &label,
                 const wxPoint &pos = wxDefaultPosition,
                 wxWindowID id,
                 const wxString &label,
                 const wxPoint &pos = wxDefaultPosition,

-                const wxSize &size = wxDefaultSize, 
+                const wxSize &size = wxDefaultSize,

                 long style = 0,
                 const wxString &name = wxStaticTextNameStr );
 
                 long style = 0,
                 const wxString &name = wxStaticTextNameStr );
 

-    wxString GetLabel() const;

     void SetLabel( const wxString &label );
 
     bool SetFont( const wxFont &font );
     void SetLabel( const wxString &label );
 
     bool SetFont( const wxFont &font );

-    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
     // --------------
 
     // implementation
     // --------------


@@ -56,10 +51,14 @@ protected:
     virtual void DoSetSize(int x, int y,
                            int width, int height,
                            int sizeFlags = wxSIZE_AUTO);
     virtual void DoSetSize(int x, int y,
                            int width, int height,
                            int sizeFlags = wxSIZE_AUTO);

-                           
+

     virtual wxSize DoGetBestSize() const;
 
     virtual wxSize DoGetBestSize() const;
 

+    virtual wxString DoGetLabel() const;
+    virtual void DoSetLabel(const wxString& str);
+

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

-#endif // _WX_GTK_STATTEXT_H_
+#endif
+    // _WX_GTK_STATTEXT_H_