wxDataObejct and related changes (won't compile right now)

[wxWidgets.git] / include / wx / msw / slidrmsw.h

diff --git a/include/wx/msw/slidrmsw.h b/include/wx/msw/slidrmsw.h
index a53b8857ed2096b8f4f9d026ff6482193237feda..cac82c6c960d059b316ad1b14346dcfa588528e3 100644 (file)
--- a/include/wx/msw/slidrmsw.h
+++ b/include/wx/msw/slidrmsw.h
@@ -18,7 +18,7 @@
 
 #include "wx/control.h"
 
 
 #include "wx/control.h"
 

-WXDLLEXPORT_DATA(extern const char*) wxSliderNameStr;
+WXDLLEXPORT_DATA(extern const wxChar*) wxSliderNameStr;

 
 // Slider
 class WXDLLEXPORT wxSliderMSW : public wxControl
 
 // Slider
 class WXDLLEXPORT wxSliderMSW : public wxControl


@@ -87,8 +87,8 @@ public:
     void Command(wxCommandEvent& event);
     virtual WXHBRUSH OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,
             WXUINT message, WXWPARAM wParam, WXLPARAM lParam);
     void Command(wxCommandEvent& event);
     virtual WXHBRUSH OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,
             WXUINT message, WXWPARAM wParam, WXLPARAM lParam);

-    void MSWOnVScroll(WXWORD wParam, WXWORD pos, WXHWND control);
-    void MSWOnHScroll(WXWORD wParam, WXWORD pos, WXHWND control);
+    virtual bool MSWOnScroll(int orientation, WXWORD wParam,
+                             WXWORD pos, WXHWND control);

 
 protected:
     WXHWND        m_staticMin;
 
 protected:
     WXHWND        m_staticMin;