/////////////////////////////////////////////////////////////////////////////
// Name: scrolbar.h
// Purpose: wxScrollBar base header
-// Author: wxWidgets Team
+// Author: Julian Smart
// Modified by:
// Created:
-// Copyright: (c) wxWidgets Team
+// Copyright: (c) Julian Smart
// RCS-ID: $Id$
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#include "wx/control.h"
-extern WXDLLEXPORT_DATA(const wxChar*) wxScrollBarNameStr;
+extern WXDLLEXPORT_DATA(const wxChar) wxScrollBarNameStr[];
// ----------------------------------------------------------------------------
// wxScrollBar: a scroll bar control
#include "wx/msw/scrolbar.h"
#elif defined(__WXMOTIF__)
#include "wx/motif/scrolbar.h"
-#elif defined(__WXGTK__)
+#elif defined(__WXGTK20__)
#include "wx/gtk/scrolbar.h"
+#elif defined(__WXGTK__)
+ #include "wx/gtk1/scrolbar.h"
#elif defined(__WXMAC__)
#include "wx/mac/scrolbar.h"
#elif defined(__WXCOCOA__)