Added scrolling of widgets and sample

[wxWidgets.git] / include / wx / tbarbase.h

diff --git a/include/wx/tbarbase.h b/include/wx/tbarbase.h
index 7e8708e5777816232cd20a5248a1b6a57edd2fe4..f28173944d69b335a739ccc4a3e2bb8ba57dbf26 100644 (file)
--- a/include/wx/tbarbase.h
+++ b/include/wx/tbarbase.h
@@ -23,7 +23,7 @@
 #include "wx/list.h"
 #include "wx/control.h"
 
-WXDLLEXPORT_DATA(extern const char*) wxToolBarNameStr;
+WXDLLEXPORT_DATA(extern const wxChar*) wxToolBarNameStr;
 WXDLLEXPORT_DATA(extern const wxSize) wxDefaultSize;
 WXDLLEXPORT_DATA(extern const wxPoint) wxDefaultPosition;
 
@@ -46,7 +46,7 @@ class WXDLLEXPORT wxToolBarTool: public wxObject
                 const wxString& shortHelpString = "", const wxString& longHelpString = "",
                 GtkWidget *item = (GtkWidget *) NULL );
 #else
-  wxToolBarTool(int theIndex = 0, const wxBitmap& bitmap1 = wxNullBitmap, const wxBitmap& bitmap2 = wxNullBitmap,
+  wxToolBarTool(int theIndex, const wxBitmap& bitmap1 = wxNullBitmap, const wxBitmap& bitmap2 = wxNullBitmap,
                 bool toggle = FALSE, long xPos = -1, long yPos = -1,
                 const wxString& shortHelpString = wxEmptyString, const wxString& longHelpString = wxEmptyString);
 #endif