no changes, just remove #if'd out code

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

diff --git a/include/wx/palmos/toolbar.h b/include/wx/palmos/toolbar.h
index 217b79125f985ee44691711793c7aae17d803abe..a0db54f1c3c98235e56897ad172457a2166758a0 100644 (file)
--- a/include/wx/palmos/toolbar.h
+++ b/include/wx/palmos/toolbar.h
@@ -16,7 +16,7 @@
 
 #include "wx/dynarray.h"
 
 
 #include "wx/dynarray.h"
 

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

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


@@ -83,7 +83,8 @@ protected:
                                           wxObject *clientData,
                                           const wxString& shortHelp,
                                           const wxString& longHelp);
                                           wxObject *clientData,
                                           const wxString& shortHelp,
                                           const wxString& longHelp);

-    virtual wxToolBarToolBase *CreateTool(wxControl *control);
+    virtual wxToolBarToolBase *CreateTool(wxControl *control,
+                                          const wxString& label);

 
     // return the appropriate size and flags for the toolbar control
     virtual wxSize DoGetBestSize() const;
 
     // return the appropriate size and flags for the toolbar control
     virtual wxSize DoGetBestSize() const;


@@ -103,7 +104,7 @@ protected:
 private:
     DECLARE_EVENT_TABLE()
     DECLARE_DYNAMIC_CLASS(wxToolBar)
 private:
     DECLARE_EVENT_TABLE()
     DECLARE_DYNAMIC_CLASS(wxToolBar)

-    DECLARE_NO_COPY_CLASS(wxToolBar)
+    wxDECLARE_NO_COPY_CLASS(wxToolBar);

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