Changed order of #ifdefs to get native version on OS/2, even if

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

diff --git a/src/os2/radiobut.cpp b/src/os2/radiobut.cpp
index 72cadb989a6e6981ca9789fb9cbf16c92b6e8f00..a2989ec2e09b4aa37ed376e04d7bff05c7923e50 100644 (file)
--- a/src/os2/radiobut.cpp
+++ b/src/os2/radiobut.cpp
@@ -25,10 +25,8 @@
 
 #include "wx/os2/private.h"
 
 
 #include "wx/os2/private.h"
 

-#if !USE_SHARED_LIBRARY

 IMPLEMENT_DYNAMIC_CLASS(wxRadioButton, wxControl)
 IMPLEMENT_DYNAMIC_CLASS(wxBitmapRadioButton, wxRadioButton)
 IMPLEMENT_DYNAMIC_CLASS(wxRadioButton, wxControl)
 IMPLEMENT_DYNAMIC_CLASS(wxBitmapRadioButton, wxRadioButton)

-#endif

 
 bool wxRadioButton::OS2Command(WXUINT param, WXWORD id)
 {
 
 bool wxRadioButton::OS2Command(WXUINT param, WXWORD id)
 {


@@ -46,11 +44,15 @@ bool wxRadioButton::Create(wxWindow *parent, wxWindowID id,
            const wxString& label,
            const wxPoint& pos,
            const wxSize& size, long style,
            const wxString& label,
            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);
 


@@ -150,11 +152,15 @@ bool wxBitmapRadioButton::Create(wxWindow *parent, wxWindowID id,
        const wxBitmap *bitmap,
            const wxPoint& pos,
            const wxSize& size, long style,
        const wxBitmap *bitmap,
            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);
   SetBackgroundColour(parent->GetBackgroundColour());
 
   if (parent) parent->AddChild(this);
   SetBackgroundColour(parent->GetBackgroundColour());