compilation fix for recent commit

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

diff --git a/include/wx/univ/scrolbar.h b/include/wx/univ/scrolbar.h
index 3dd5249ca34595b0eb1da7cba7a06da18567b3ac..1a1eb9de0069f752cb3a86dd75a3d18d3a9ef0bb 100644 (file)
--- a/include/wx/univ/scrolbar.h
+++ b/include/wx/univ/scrolbar.h
@@ -13,7 +13,7 @@
 #define _WX_UNIV_SCROLBAR_H_
 
 #ifdef __GNUG__
-    #pragma interface "scrolbar.h"
+    #pragma interface "univscrolbar.h"
 #endif
 
 class WXDLLEXPORT wxScrollTimer;
@@ -92,8 +92,8 @@ public:
     // wxScrollBar actions
     void ScrollToStart();
     void ScrollToEnd();
-    void ScrollLines(int nLines);
-    void ScrollPages(int nPages);
+    bool ScrollLines(int nLines);
+    bool ScrollPages(int nPages);
 
     virtual bool PerformAction(const wxControlAction& action,
                                long numArg = 0,
@@ -170,12 +170,12 @@ public:
     wxStdScrollBarInputHandler(wxRenderer *renderer,
                                wxInputHandler *inphand);
 
-    virtual bool HandleKey(wxControl *control,
+    virtual bool HandleKey(wxInputConsumer *consumer,
                            const wxKeyEvent& event,
                            bool pressed);
-    virtual bool HandleMouse(wxControl *control,
+    virtual bool HandleMouse(wxInputConsumer *consumer,
                              const wxMouseEvent& event);
-    virtual bool HandleMouseMove(wxControl *control, const wxMouseEvent& event);
+    virtual bool HandleMouseMove(wxInputConsumer *consumer, const wxMouseEvent& event);
 
     virtual ~wxStdScrollBarInputHandler();