More settings restored.

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

diff --git a/include/wx/msw/stattext.h b/include/wx/msw/stattext.h
index 8c67921fe8c6872f5d80ce5114c1f5a66333954a..619418760682e8b90890561e0f7a5ae87886a10e 100644 (file)
--- a/include/wx/msw/stattext.h
+++ b/include/wx/msw/stattext.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        stattext.h
+// Name:        wx/msw/stattext.h
 // Purpose:     wxStaticText class
 // Author:      Julian Smart
 // Modified by:
@@ -12,18 +12,12 @@
 #ifndef _WX_STATTEXT_H_
 #define _WX_STATTEXT_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
     #pragma interface "stattext.h"
 #endif
 
-#include "wx/control.h"
-
-WXDLLEXPORT_DATA(extern const wxChar*) wxStaticTextNameStr;
-
-class WXDLLEXPORT wxStaticText : public wxControl
+class WXDLLEXPORT wxStaticText : public wxStaticTextBase
 {
-DECLARE_DYNAMIC_CLASS(wxStaticText)
-
 public:
     wxStaticText() { }
 
@@ -46,18 +40,20 @@ public:
                 long style = 0,
                 const wxString& name = wxStaticTextNameStr);
 
-    // accessors
-    void SetLabel(const wxString& label);
-    bool SetFont( const wxFont &font );
-
-    // overriden base class virtuals
-    virtual bool AcceptsFocus() const { return FALSE; }
-
-    // callbacks
-    virtual long MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
+    // override some methods to resize the window properly
+    virtual void SetLabel(const wxString& label);
+    virtual bool SetFont( const wxFont &font );
 
 protected:
+    // implement/override some base class virtuals
+    virtual wxBorder GetDefaultBorder() const;
+    virtual void DoSetSize(int x, int y, int w, int h,
+                           int sizeFlags = wxSIZE_AUTO);
     virtual wxSize DoGetBestSize() const;
+    virtual WXDWORD MSWGetStyle(long flags, WXDWORD *exstyle = NULL) const;
+
+
+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxStaticText)
 };
 
 #endif