declare wxEntry() as taking char **Argv, not char *argv[]

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

diff --git a/include/wx/msw/stattext.h b/include/wx/msw/stattext.h
index 781b5878ab406c7250d863a379a409242eb87be4..29561640a939b20c8ecd93cd910f850b640f4c2b 100644 (file)
--- a/include/wx/msw/stattext.h
+++ b/include/wx/msw/stattext.h
@@ -16,12 +16,8 @@
     #pragma interface "stattext.h"
 #endif
 
-#include "wx/control.h"
-
-class WXDLLEXPORT wxStaticText : public wxControl
+class WXDLLEXPORT wxStaticText : public wxStaticTextBase
 {
-DECLARE_DYNAMIC_CLASS(wxStaticText)
-
 public:
     wxStaticText() { }
 
@@ -44,18 +40,17 @@ 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:
+    virtual void DoSetSize(int x, int y, int w, int h,
+                           int sizeFlags = wxSIZE_AUTO);
     virtual wxSize DoGetBestSize() const;
+    virtual long MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
+
+    DECLARE_DYNAMIC_CLASS(wxStaticText)
 };
 
 #endif