Fixed typo in my last commit (it did break socket detection code :-( ).

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

diff --git a/include/wx/msw/stattext.h b/include/wx/msw/stattext.h
index 8c67921fe8c6872f5d80ce5114c1f5a66333954a..20c49b73a4f1e1e6db79adcb1d1db9bb78e6fa1b 100644 (file)
--- a/include/wx/msw/stattext.h
+++ b/include/wx/msw/stattext.h
@@ -16,14 +16,8 @@
     #pragma interface "stattext.h"
 #endif
 
     #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() { }
 
 public:
     wxStaticText() { }
 


@@ -46,18 +40,16 @@ public:
                 long style = 0,
                 const wxString& name = wxStaticTextNameStr);
 
                 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:
 
 protected:

+    virtual void DoSetSize(int x, int y, int w, int h,
+                           int sizeFlags = wxSIZE_AUTO);

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

+
+    DECLARE_DYNAMIC_CLASS(wxStaticText)

 };
 
 #endif
 };
 
 #endif