file which undefs symbols ocnflicting with windows.h

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

diff --git a/include/wx/msw/stattext.h b/include/wx/msw/stattext.h
index 81595e993974436784baa3ee6a12d79a7e97045a..090e96eec1fdebece4fe5d5993564f395336baa2 100644 (file)
--- a/include/wx/msw/stattext.h
+++ b/include/wx/msw/stattext.h
@@ -45,24 +45,20 @@ public:
         const wxString& name = wxStaticTextNameStr);
     
     // accessors
         const wxString& name = wxStaticTextNameStr);
     
     // accessors

-    void SetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO);
-    void SetSize(const wxRect& rect, int sizeFlags = wxSIZE_AUTO)
-    { wxWindow::SetSize(rect, sizeFlags); }
-    void SetSize(const wxSize& size)
-    { wxWindow::SetSize(size); }

     void SetLabel(const wxString& label);
     
     void SetLabel(const wxString& label);
     

-    // operations
-    virtual void Command(wxCommandEvent& WXUNUSED(event)) { }
-    virtual void ProcessCommand(wxCommandEvent& WXUNUSED(event)) { }
-    

     // overriden base class virtuals
     virtual bool AcceptsFocus() const { return FALSE; }
     
     // callbacks
     virtual WXHBRUSH OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,
     // overriden base class virtuals
     virtual bool AcceptsFocus() const { return FALSE; }
     
     // callbacks
     virtual WXHBRUSH OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,

-        WXUINT message, WXWPARAM wParam, WXLPARAM lParam);
+                                WXUINT message, WXWPARAM wParam, WXLPARAM lParam);

     virtual long MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
     virtual long MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);

+
+protected:
+    virtual void DoSetSize(int x, int y,
+                           int width, int height,
+                           int sizeFlags = wxSIZE_AUTO);

 };
 
 #endif
 };
 
 #endif