Refactored & cleaned up wxChoice & wxComboBox code, fixed client data

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

diff --git a/include/wx/msw/tbar95.h b/include/wx/msw/tbar95.h
index faee5036421be4933d09586b25d8a3744fe85cca..980714d08e4858026a0be2d189722bd8b017509e 100644 (file)
--- a/include/wx/msw/tbar95.h
+++ b/include/wx/msw/tbar95.h
@@ -68,12 +68,20 @@ public:
     void OnMouseEvent(wxMouseEvent& event);
     void OnSysColourChanged(wxSysColourChangedEvent& event);
 
+    void SetFocus() {}
+
     static WXHBITMAP MapBitmap(WXHBITMAP bitmap, int width, int height);
 
 protected:
     // common part of all ctors
     void Init();
 
+    // create the toolbar control
+    bool MSWCreateToolbar(const wxPoint& pos, const wxSize& size, long style);
+
+    // recreate the control completely
+    void Recreate();
+
     // implement base class pure virtuals
     virtual bool DoInsertTool(size_t pos, wxToolBarToolBase *tool);
     virtual bool DoDeleteTool(size_t pos, wxToolBarToolBase *tool);
@@ -92,17 +100,21 @@ protected:
                                           const wxString& longHelp);
     virtual wxToolBarToolBase *CreateTool(wxControl *control);
 
-    // should be called whenever the toolbar size changes
-    void UpdateSize();
-
     // override WndProc mainly to process WM_SIZE
     virtual long MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
 
+    // return the appropriate size and flags for the toolbar control
+    virtual wxSize DoGetBestSize() const;
+    virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const;
+
     // handlers for various events
     bool HandleSize(WXWPARAM wParam, WXLPARAM lParam);
     bool HandlePaint(WXWPARAM wParam, WXLPARAM lParam);
     void HandleMouseMove(WXWPARAM wParam, WXLPARAM lParam);
 
+    // should be called whenever the toolbar size changes
+    void UpdateSize();
+
     // the big bitmap containing all bitmaps of the toolbar buttons
     WXHBITMAP m_hBitmap;