Rebake after last change.

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

diff --git a/include/wx/msw/toolbar.h b/include/wx/msw/toolbar.h
index 92fcfd7bcd76d82b5dee6e113aefcce0fe2515e8..b835541e802713268708da73f754b3cfc27d05bc 100644 (file)
--- a/include/wx/msw/toolbar.h
+++ b/include/wx/msw/toolbar.h
@@ -17,7 +17,7 @@
 #include "wx/dynarray.h"
 #include "wx/imaglist.h"
 
 #include "wx/dynarray.h"
 #include "wx/imaglist.h"
 

-class WXDLLEXPORT wxToolBar : public wxToolBarBase
+class WXDLLIMPEXP_CORE wxToolBar : public wxToolBarBase

 {
 public:
     // ctors and dtor
 {
 public:
     // ctors and dtor


@@ -116,7 +116,9 @@ protected:
 
     // handlers for various events
     bool HandleSize(WXWPARAM wParam, WXLPARAM lParam);
 
     // handlers for various events
     bool HandleSize(WXWPARAM wParam, WXLPARAM lParam);

+#ifndef __WXWINCE__

     bool HandlePaint(WXWPARAM wParam, WXLPARAM lParam);
     bool HandlePaint(WXWPARAM wParam, WXLPARAM lParam);

+#endif // __WXWINCE__

     void HandleMouseMove(WXWPARAM wParam, WXLPARAM lParam);
 
     // should be called whenever the toolbar size changes
     void HandleMouseMove(WXWPARAM wParam, WXLPARAM lParam);
 
     // should be called whenever the toolbar size changes


@@ -144,9 +146,12 @@ protected:
     wxToolBarToolBase *m_pInTool;
 
 private:
     wxToolBarToolBase *m_pInTool;
 
 private:

+    // makes sure tool bitmap size is sufficient for all tools
+    void AdjustToolBitmapSize();
+

     DECLARE_EVENT_TABLE()
     DECLARE_DYNAMIC_CLASS(wxToolBar)
     DECLARE_EVENT_TABLE()
     DECLARE_DYNAMIC_CLASS(wxToolBar)

-    DECLARE_NO_COPY_CLASS(wxToolBar)
+    wxDECLARE_NO_COPY_CLASS(wxToolBar);

 };
 
 #endif // wxUSE_TOOLBAR
 };
 
 #endif // wxUSE_TOOLBAR