X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9d522606d0a1dfd22bcdc1a386b3dca01fa985e3..2903e6998a46a0b3504da30e21a9c28b344680ae:/include/wx/gtk1/stattext.h?ds=inline

diff --git a/include/wx/gtk1/stattext.h b/include/wx/gtk1/stattext.h
index eb9ee2a86e..6fdfaea16d 100644
--- a/include/wx/gtk1/stattext.h
+++ b/include/wx/gtk1/stattext.h
@@ -1,40 +1,20 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        stattext.h
+// Name:        wx/gtk1/stattext.h
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:   	wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-
 #ifndef __GTKSTATICTEXTH__
 #define __GTKSTATICTEXTH__
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface
-#endif
-
-#include "wx/defs.h"
-#include "wx/object.h"
-#include "wx/list.h"
-#include "wx/control.h"
-
-//-----------------------------------------------------------------------------
-// classes
-//-----------------------------------------------------------------------------
-
-class wxStaticText;
-
-//-----------------------------------------------------------------------------
-// global data
-//-----------------------------------------------------------------------------
-
 //-----------------------------------------------------------------------------
 // wxStaticText
 //-----------------------------------------------------------------------------
 
-class wxStaticText : public wxControl
+class WXDLLIMPEXP_CORE wxStaticText : public wxStaticTextBase
 {
 public:
     wxStaticText();
@@ -42,7 +22,7 @@ public:
                  wxWindowID id,
                  const wxString &label,
                  const wxPoint &pos = wxDefaultPosition,
-                 const wxSize &size = wxDefaultSize, 
+                 const wxSize &size = wxDefaultSize,
                  long style = 0,
                  const wxString &name = wxStaticTextNameStr );
 
@@ -50,25 +30,24 @@ public:
                 wxWindowID id,
                 const wxString &label,
                 const wxPoint &pos = wxDefaultPosition,
-                const wxSize &size = wxDefaultSize, 
+                const wxSize &size = wxDefaultSize,
                 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);
-    
-    // implementation
-    // --------------
-    
-    void ApplyWidgetStyle();
 
 protected:
+    virtual void DoSetSize(int x, int y,
+                           int width, int height,
+                           int sizeFlags = wxSIZE_AUTO);
+
     virtual wxSize DoGetBestSize() const;
 
     DECLARE_DYNAMIC_CLASS(wxStaticText)