VTK wrapper of vtkRenderWindow for wxPython. Tested on MSW so far.

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

diff --git a/src/os2/radiobut.cpp b/src/os2/radiobut.cpp
index eff8c241ac60901ede64d6fde9ade7f2e0cc0ee8..5453a8ec5287cf119e7c7f1286394a856d1d82fa 100644 (file)
--- a/src/os2/radiobut.cpp
+++ b/src/os2/radiobut.cpp
@@ -23,10 +23,11 @@
 #include "wx/brush.h"
 #endif
 
 #include "wx/brush.h"
 #endif
 

-#include "wx/msw/private.h"
+#include "wx/os2/private.h"

 
 #if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxRadioButton, wxControl)
 
 #if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxRadioButton, wxControl)

+IMPLEMENT_DYNAMIC_CLASS(wxBitmapRadioButton, wxRadioButton)

 #endif
 
 bool wxRadioButton::OS2Command(WXUINT param, WXWORD id)
 #endif
 
 bool wxRadioButton::OS2Command(WXUINT param, WXWORD id)


@@ -45,11 +46,19 @@ 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
+#  if defined(__VISAGECPP__)
+           const wxValidator* validator,
+#  else

            const wxValidator& validator,
            const wxValidator& validator,

+#  endif
+#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);
 


@@ -149,11 +158,19 @@ 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
+#  if defined(__VISAGECPP__)
+           const wxValidator* validator,
+#  else

            const wxValidator& validator,
            const wxValidator& validator,

+#  endif
+#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());