merged MapBitmap() from 2.2 branch

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

diff --git a/src/os2/slider.cpp b/src/os2/slider.cpp
index 130472e6adab6fa092a9228677b8f63d8396d5a8..c0d6c909bbf2b845f65ad9b1d8c1665160873e59 100644 (file)
--- a/src/os2/slider.cpp
+++ b/src/os2/slider.cpp
@@ -25,9 +25,7 @@
 #include "wx/slider.h"
 #include "wx/os2/private.h"
 
-#if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxSlider, wxControl)
-#endif
 
 // Slider
 wxSlider::wxSlider()
@@ -46,11 +44,15 @@ bool wxSlider::Create(wxWindow *parent, wxWindowID id,
            int value, int minValue, int maxValue,
            const wxPoint& pos,
            const wxSize& size, long style,
+#if wxUSE_VALIDATORS
            const wxValidator& validator,
+#endif
            const wxString& name)
 {
     SetName(name);
+#if wxUSE_VALIDATORS
     SetValidator(validator);
+#endif
 
     if (parent) parent->AddChild(this);