X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/566fb29935da8c9728dc8aa9a9441ddf15df65b1..f41bc3e3f3fda37fba548440b230288c5eed0953:/include/wx/msw/tbar95.h

diff --git a/include/wx/msw/tbar95.h b/include/wx/msw/tbar95.h
index 01949b91cb..dd998f47d9 100644
--- a/include/wx/msw/tbar95.h
+++ b/include/wx/msw/tbar95.h
@@ -60,12 +60,16 @@ public:
     // implementation only from now on
     // -------------------------------
 
+    virtual void SetWindowStyleFlag(long style);
+
     virtual bool MSWCommand(WXUINT param, WXWORD id);
     virtual bool MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result);
 
     void OnMouseEvent(wxMouseEvent& event);
     void OnSysColourChanged(wxSysColourChangedEvent& event);
 
+    void SetFocus() {}
+
     static WXHBITMAP MapBitmap(WXHBITMAP bitmap, int width, int height);
 
 protected:
@@ -81,20 +85,26 @@ protected:
     virtual void DoSetToggle(wxToolBarToolBase *tool, bool toggle);
 
     virtual wxToolBarToolBase *CreateTool(int id,
-                                          const wxBitmap& bitmap1,
-                                          const wxBitmap& bitmap2,
-                                          bool toggle,
+                                          const wxString& label,
+                                          const wxBitmap& bmpNormal,
+                                          const wxBitmap& bmpDisabled,
+                                          wxItemKind kind,
                                           wxObject *clientData,
-                                          const wxString& shortHelpString,
-                                          const wxString& longHelpString);
+                                          const wxString& shortHelp,
+                                          const wxString& longHelp);
     virtual wxToolBarToolBase *CreateTool(wxControl *control);
 
     // should be called whenever the toolbar size changes
     void UpdateSize();
 
-    // override WndProc to process WM_SIZE
+    // override WndProc mainly to process WM_SIZE
     virtual long MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
 
+    // handlers for various events
+    bool HandleSize(WXWPARAM wParam, WXLPARAM lParam);
+    bool HandlePaint(WXWPARAM wParam, WXLPARAM lParam);
+    void HandleMouseMove(WXWPARAM wParam, WXLPARAM lParam);
+
     // the big bitmap containing all bitmaps of the toolbar buttons
     WXHBITMAP m_hBitmap;