fixed fl compilation after the recent tbar changes (patch 536539)

[wxWidgets.git] / contrib / include / wx / fl / dyntbar.h

diff --git a/contrib/include/wx/fl/dyntbar.h b/contrib/include/wx/fl/dyntbar.h
index a87b951c655154ad233887d2f084149d2c1c5136..109d7413dd4e4aacc5956e849c80363f91d7cf17 100644 (file)
--- a/contrib/include/wx/fl/dyntbar.h
+++ b/contrib/include/wx/fl/dyntbar.h
@@ -100,8 +100,6 @@ wxDynamicToolBar manages containment and layout of tool windows.
 
 class wxDynamicToolBar : public wxToolBarBase
 {
 
 class wxDynamicToolBar : public wxToolBarBase
 {

-    DECLARE_DYNAMIC_CLASS(wxDynamicToolBar)
-

 protected:
     friend class wxDynamicToolBarSerializer;
 
 protected:
     friend class wxDynamicToolBarSerializer;
 


@@ -247,18 +245,21 @@ public:
         // Creates a toolbar tool.
 
     virtual wxToolBarToolBase *CreateTool(int id,
         // 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,
                                           wxObject *clientData,

-                                          const wxString& shortHelpString,
-                                          const wxString& longHelpString);
+                                          const wxString& shortHelp,
+                                          const wxString& longHelp);

 
         // Creates a toolbar tool.
 
     virtual wxToolBarToolBase *CreateTool(wxControl *control);
 
 
         // Creates a toolbar tool.
 
     virtual wxToolBarToolBase *CreateTool(wxControl *control);
 

+private:

     DECLARE_EVENT_TABLE()
     DECLARE_EVENT_TABLE()

+    DECLARE_DYNAMIC_CLASS(wxDynamicToolBar)

 };
 
 #endif /* __DYNTBAR_G__ */
 };
 
 #endif /* __DYNTBAR_G__ */