Fixed OS/2 compilation problems.

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

diff --git a/include/wx/msw/slider95.h b/include/wx/msw/slider95.h
index a94978d8b19593a7171611e11fd4c9984efe93a4..498221213d5696b04cc26bc89050883027e163a1 100644 (file)
--- a/include/wx/msw/slider95.h
+++ b/include/wx/msw/slider95.h
@@ -1,12 +1,12 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        slider95.h
+// Name:        wx/msw/slider95.h

 // Purpose:     wxSlider95 class
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Purpose:     wxSlider95 class
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _SLIDER95_H_
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _SLIDER95_H_


@@ -16,15 +16,9 @@
 #pragma interface "slider95.h"
 #endif
 
 #pragma interface "slider95.h"
 #endif
 

-#include "wx/control.h"
-
-WXDLLEXPORT_DATA(extern const char*) wxSliderNameStr;
-

 // Slider
 // Slider

-class WXDLLEXPORT wxSlider95 : public wxControl
+class WXDLLEXPORT wxSlider95 : public wxSliderBase

 {
 {

-    DECLARE_DYNAMIC_CLASS(wxSlider95)
-

 public:
     wxSlider95();
 
 public:
     wxSlider95();
 


@@ -87,8 +81,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;


@@ -103,6 +97,8 @@ protected:
     virtual void DoSetSize(int x, int y,
                            int width, int height,
                            int sizeFlags = wxSIZE_AUTO);
     virtual void DoSetSize(int x, int y,
                            int width, int height,
                            int sizeFlags = wxSIZE_AUTO);

+
+    DECLARE_DYNAMIC_CLASS(wxSlider95)

 };
 
 #endif
 };
 
 #endif