More OS/2 Updates

[wxWidgets.git] / src / os2 / slider.cpp

diff --git a/src/os2/slider.cpp b/src/os2/slider.cpp
index 9dee621c51bccbcd0e8b1849a5851047eb93eedb..c0d6c909bbf2b845f65ad9b1d8c1665160873e59 100644 (file)
--- a/src/os2/slider.cpp
+++ b/src/os2/slider.cpp
@@ -25,7 +25,6 @@
 #include "wx/slider.h"
 #include "wx/os2/private.h"
 
 #include "wx/slider.h"
 #include "wx/os2/private.h"
 

-#if !USE_SHARED_LIBRARY

 IMPLEMENT_DYNAMIC_CLASS(wxSlider, wxControl)
 
 // Slider
 IMPLEMENT_DYNAMIC_CLASS(wxSlider, wxControl)
 
 // Slider


@@ -45,11 +44,15 @@ bool wxSlider::Create(wxWindow *parent, wxWindowID id,
            int value, int minValue, int maxValue,
            const wxPoint& pos,
            const wxSize& size, long style,
            int value, int minValue, int maxValue,
            const wxPoint& pos,
            const wxSize& size, long style,

+#if wxUSE_VALIDATORS

            const wxValidator& validator,
            const wxValidator& validator,

+#endif

            const wxString& name)
 {
     SetName(name);
            const wxString& name)
 {
     SetName(name);

+#if wxUSE_VALIDATORS

     SetValidator(validator);
     SetValidator(validator);

+#endif

 
     if (parent) parent->AddChild(this);
 
 
     if (parent) parent->AddChild(this);
 


@@ -140,6 +143,7 @@ bool wxSlider::OS2OnScroll(int WXUNUSED(orientation), WXWORD wParam,
         return TRUE;
     }
 */
         return TRUE;
     }
 */

+    int       newPos = 0; //temporary

     SetValue(newPos);
 
     wxScrollEvent event(scrollEvent, m_windowId);
     SetValue(newPos);
 
     wxScrollEvent event(scrollEvent, m_windowId);