fixes to client area origin handling

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

diff --git a/src/os2/radiobut.cpp b/src/os2/radiobut.cpp
index eff8c241ac60901ede64d6fde9ade7f2e0cc0ee8..d0b290c9978482c9208c851495527b798325e4f8 100644 (file)
--- a/src/os2/radiobut.cpp
+++ b/src/os2/radiobut.cpp
@@ -23,11 +23,9 @@
 #include "wx/brush.h"
 #endif
 
-#include "wx/msw/private.h"
+#include "wx/os2/private.h"
 
-#if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxRadioButton, wxControl)
-#endif
 
 bool wxRadioButton::OS2Command(WXUINT param, WXWORD id)
 {
@@ -45,11 +43,15 @@ bool wxRadioButton::Create(wxWindow *parent, wxWindowID id,
            const wxString& label,
            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);
 
@@ -145,15 +147,22 @@ void wxRadioButton::Command (wxCommandEvent & event)
   ProcessCommand (event);
 }
 
+// Not implemented
+#if 0
+
 bool wxBitmapRadioButton::Create(wxWindow *parent, wxWindowID id,
        const wxBitmap *bitmap,
            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);
   SetBackgroundColour(parent->GetBackgroundColour());
@@ -211,3 +220,4 @@ bool wxBitmapRadioButton::GetValue(void) const
     return FALSE;
 }
 
+#endif
\ No newline at end of file