fix unused parameter warnings

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

diff --git a/include/wx/scrolbar.h b/include/wx/scrolbar.h
index c9272e99dd0e7cb3634405b8c7d9baadb10da37b..6cdf392a2697300440e5b1137bc2ac28b435831f 100644 (file)
--- a/include/wx/scrolbar.h
+++ b/include/wx/scrolbar.h
@@ -1,11 +1,24 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        scrolbar.h
+// Purpose:     wxScrollBar base header
+// Author:      Julian Smart
+// Modified by:
+// Created:
+// Copyright:   (c) Julian Smart
+// RCS-ID:      $Id$
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+

 #ifndef _WX_SCROLBAR_H_BASE_
 #define _WX_SCROLBAR_H_BASE_
 
 #ifndef _WX_SCROLBAR_H_BASE_
 #define _WX_SCROLBAR_H_BASE_
 

+#include "wx/defs.h"
+

 #if wxUSE_SCROLLBAR
 
 #include "wx/control.h"
 
 #if wxUSE_SCROLLBAR
 
 #include "wx/control.h"
 

-extern WXDLLEXPORT_DATA(const wxChar*) wxScrollBarNameStr;
+extern WXDLLEXPORT_DATA(const wxChar) wxScrollBarNameStr[];

 
 // ----------------------------------------------------------------------------
 // wxScrollBar: a scroll bar control
 
 // ----------------------------------------------------------------------------
 // wxScrollBar: a scroll bar control


@@ -49,8 +62,10 @@ private:
     #include "wx/msw/scrolbar.h"
 #elif defined(__WXMOTIF__)
     #include "wx/motif/scrolbar.h"
     #include "wx/msw/scrolbar.h"
 #elif defined(__WXMOTIF__)
     #include "wx/motif/scrolbar.h"

-#elif defined(__WXGTK__)
+#elif defined(__WXGTK20__)

     #include "wx/gtk/scrolbar.h"
     #include "wx/gtk/scrolbar.h"

+#elif defined(__WXGTK__)
+    #include "wx/gtk1/scrolbar.h"

 #elif defined(__WXMAC__)
     #include "wx/mac/scrolbar.h"
 #elif defined(__WXCOCOA__)
 #elif defined(__WXMAC__)
     #include "wx/mac/scrolbar.h"
 #elif defined(__WXCOCOA__)