Lots of updates for color dialog and sliders

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

diff --git a/include/wx/univ/slider.h b/include/wx/univ/slider.h
index 8a679bc61e2e534c3c373d823545dd2822c48fba..a5e51055f0166484f3e2ce90c55d68bbf1313a6f 100644 (file)
--- a/include/wx/univ/slider.h
+++ b/include/wx/univ/slider.h
@@ -10,7 +10,7 @@
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__

-    #pragma interface "slider.h"
+    #pragma interface "univslider.h"

 #endif
 
 #ifndef _WX_UNIV_SLIDER_H_
 #endif
 
 #ifndef _WX_UNIV_SLIDER_H_


@@ -231,15 +231,15 @@ public:
     }
 
     // base class methods
     }
 
     // base class methods

-    virtual bool HandleKey(wxControl *control,
+    virtual bool HandleKey(wxInputConsumer *consumer,

                            const wxKeyEvent& event,
                            bool pressed);
                            const wxKeyEvent& event,
                            bool pressed);

-    virtual bool HandleMouse(wxControl *control,
+    virtual bool HandleMouse(wxInputConsumer *consumer,

                              const wxMouseEvent& event);
                              const wxMouseEvent& event);

-    virtual bool HandleMouseMove(wxControl *control,
+    virtual bool HandleMouseMove(wxInputConsumer *consumer,

                                  const wxMouseEvent& event);
 
                                  const wxMouseEvent& event);
 

-    virtual bool HandleFocus(wxControl *control, const wxFocusEvent& event);
+    virtual bool HandleFocus(wxInputConsumer *consumer, const wxFocusEvent& event);

 };
 
 #endif // _WX_UNIV_SLIDER_H_
 };
 
 #endif // _WX_UNIV_SLIDER_H_