take old (wx 2.2? older?) wxGrid compatibility functions inside WXWIN_COMPATIBILITY_2...

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

diff --git a/include/wx/palmos/toolbar.h b/include/wx/palmos/toolbar.h
index d31ac940676982492f1ba79558f6ad3f5a4816fa..27b9291093e12547c249576e53abe7dc5ed7e118 100644 (file)
--- a/include/wx/palmos/toolbar.h
+++ b/include/wx/palmos/toolbar.h
@@ -12,15 +12,11 @@
 #ifndef _WX_TBAR95_H_
 #define _WX_TBAR95_H_
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma interface "toolbar.h"
-#endif
-
 #if wxUSE_TOOLBAR
 
 #include "wx/dynarray.h"
 
-class WXDLLEXPORT wxToolBar : public wxToolBarBase
+class WXDLLIMPEXP_CORE wxToolBar : public wxToolBarBase
 {
 public:
     // ctors and dtor
@@ -87,7 +83,8 @@ protected:
                                           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;