Made some treectrl sample icons transparent; added toolbar.h to wx.h

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

diff --git a/include/wx/msw/button.h b/include/wx/msw/button.h
index cd0e1df3859b49a4c080ffe5c2a96f3c03ee48bf..794d9f933733034dd9703c0d11995a81d5b23460 100644 (file)
--- a/include/wx/msw/button.h
+++ b/include/wx/msw/button.h
@@ -49,8 +49,11 @@ public:
 
     virtual void SetDefault();
 
 
     virtual void SetDefault();
 

+    static wxSize GetDefaultSize();
+

     // 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 WXHBRUSH OnCtlColor(WXHDC pDC,
                                 WXHWND pWnd,
     virtual bool MSWCommand(WXUINT param, WXWORD id);
     virtual WXHBRUSH OnCtlColor(WXHDC pDC,
                                 WXHWND pWnd,


@@ -63,9 +66,7 @@ protected:
     // send a notification event, return TRUE if processed
     bool SendClickEvent();
 
     // send a notification event, return TRUE if processed
     bool SendClickEvent();
 

-    virtual void DoSetSize(int x, int y,
-                           int width, int height,
-                           int sizeFlags = wxSIZE_AUTO);
+    virtual wxSize DoGetBestSize();

 };
 
 #endif
 };
 
 #endif