X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8a328874b690081d8cf4539b2fd99f680ca6ff73..f07dc2e2a71f2c9dc9886a67e834a1b12a14df47:/include/wx/msw/tbar95.h

diff --git a/include/wx/msw/tbar95.h b/include/wx/msw/tbar95.h
index dd998f47d9..b06b0fa46f 100644
--- a/include/wx/msw/tbar95.h
+++ b/include/wx/msw/tbar95.h
@@ -76,6 +76,12 @@ protected:
     // common part of all ctors
     void Init();
 
+    // create the native toolbar control
+    bool MSWCreateToolbar(const wxPoint& pos, const wxSize& size);
+
+    // 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);
@@ -94,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;
 
@@ -117,6 +127,7 @@ protected:
 private:
     DECLARE_EVENT_TABLE()
     DECLARE_DYNAMIC_CLASS(wxToolBar)
+    DECLARE_NO_COPY_CLASS(wxToolBar)
 };
 
 #endif // wxUSE_TOOLBAR