merging in the toolbar changes

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

diff --git a/include/wx/msw/button.h b/include/wx/msw/button.h
index 6888ee443a158760f515c1a2ec1e2b30a1011b73..8af354a03ad60779215e3d9205cafbe6af315f46 100644 (file)
--- a/include/wx/msw/button.h
+++ b/include/wx/msw/button.h
@@ -53,19 +53,14 @@ public:
 
     // implementation from now on
     virtual void Command(wxCommandEvent& event);
 
     // implementation from now on
     virtual void Command(wxCommandEvent& event);

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

     virtual bool MSWCommand(WXUINT param, WXWORD id);
     virtual bool MSWCommand(WXUINT param, WXWORD id);

-    virtual WXHBRUSH OnCtlColor(WXHDC pDC,
-                                WXHWND pWnd,
-                                WXUINT nCtlColor,
-                                WXUINT message,
-                                WXWPARAM wParam,
-                                WXLPARAM lParam);

 
 protected:
     // send a notification event, return TRUE if processed
     bool SendClickEvent();
 
 
 protected:
     // send a notification event, return TRUE if processed
     bool SendClickEvent();
 

-    virtual wxSize DoGetBestSize();
+    virtual wxSize DoGetBestSize() const;

 };
 
 #endif
 };
 
 #endif