X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4cbc57f086cee690f397ac5622d3f1d7153b300e..a2d541ca9c552d1a30ba75970968a7a220f4955a:/contrib/include/wx/fl/dyntbar.h

diff --git a/contrib/include/wx/fl/dyntbar.h b/contrib/include/wx/fl/dyntbar.h
index ea075be582..109d7413dd 100644
--- a/contrib/include/wx/fl/dyntbar.h
+++ b/contrib/include/wx/fl/dyntbar.h
@@ -25,6 +25,8 @@ Tool layout item.
 
 class wxToolLayoutItem : public wxObject
 {
+    DECLARE_DYNAMIC_CLASS(wxToolLayoutItem)
+
 public:
     wxRect    mRect;
     bool      mIsSeparator;
@@ -98,9 +100,7 @@ wxDynamicToolBar manages containment and layout of tool windows.
 
 class wxDynamicToolBar : public wxToolBarBase
 {
-    DECLARE_DYNAMIC_CLASS(wxDynamicToolBar)
 protected:
-
     friend class wxDynamicToolBarSerializer;
 
     wxDynToolInfoArrayT mTools;
@@ -245,18 +245,21 @@ public:
         // Creates a toolbar tool.
 
     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);
 
         // Creates a toolbar tool.
 
     virtual wxToolBarToolBase *CreateTool(wxControl *control);
 
+private:
     DECLARE_EVENT_TABLE()
+    DECLARE_DYNAMIC_CLASS(wxDynamicToolBar)
 };
 
 #endif /* __DYNTBAR_G__ */