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 e0a6852d4aa74d6ecba6dc633099d4e97bdee5d5..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"
 
 #include "wx/slider.h"
 #include "wx/os2/private.h"
 

-#if !USE_SHARED_LIBRARY

 IMPLEMENT_DYNAMIC_CLASS(wxSlider, wxControl)
 IMPLEMENT_DYNAMIC_CLASS(wxSlider, wxControl)

-#endif

 
 // Slider
 wxSlider::wxSlider()
 
 // Slider
 wxSlider::wxSlider()


@@ -47,11 +45,7 @@ bool wxSlider::Create(wxWindow *parent, wxWindowID id,
            const wxPoint& pos,
            const wxSize& size, long style,
 #if wxUSE_VALIDATORS
            const wxPoint& pos,
            const wxSize& size, long style,
 #if wxUSE_VALIDATORS

-#  if defined(__VISAGECPP__)
-           const wxValidator* validator,
-#  else

            const wxValidator& validator,
            const wxValidator& validator,

-#  endif

 #endif
            const wxString& name)
 {
 #endif
            const wxString& name)
 {