Added wxDataViewListCtrl, use it in the sample

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

diff --git a/include/wx/univ/toolbar.h b/include/wx/univ/toolbar.h
index 1743a174fbaa7fa1c855e9e633e3e563cd84789e..2c736c1c8c20905b35eb1c6044c24d6bb8873a55 100644 (file)
--- a/include/wx/univ/toolbar.h
+++ b/include/wx/univ/toolbar.h
@@ -14,7 +14,7 @@
 
 #include "wx/button.h"      // for wxStdButtonInputHandler
 
 
 #include "wx/button.h"      // for wxStdButtonInputHandler
 

-class WXDLLEXPORT wxToolBarTool;
+class WXDLLIMPEXP_FWD_CORE wxToolBarTool;

 
 // ----------------------------------------------------------------------------
 // the actions supported by this control
 
 // ----------------------------------------------------------------------------
 // the actions supported by this control


@@ -31,7 +31,7 @@ class WXDLLEXPORT wxToolBarTool;
 // wxToolBar
 // ----------------------------------------------------------------------------
 
 // wxToolBar
 // ----------------------------------------------------------------------------
 

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

 {
 public:
     // construction/destruction
 {
 public:
     // construction/destruction


@@ -98,7 +98,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);

 
     virtual wxSize DoGetBestClientSize() const;
     virtual void DoSetSize(int x, int y,
 
     virtual wxSize DoGetBestClientSize() const;
     virtual void DoSetSize(int x, int y,