fix for wxComboBox::GetSelection from inside event handler

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

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

-#if !USE_SHARED_LIBRARY

 IMPLEMENT_DYNAMIC_CLASS(wxRadioButton, wxControl)
 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 +43,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);
 


@@ -146,15 +147,22 @@ void wxRadioButton::Command (wxCommandEvent & event)
   ProcessCommand (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,
 bool wxBitmapRadioButton::Create(wxWindow *parent, wxWindowID id,
        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());


@@ -212,3 +220,4 @@ bool wxBitmapRadioButton::GetValue(void) const
     return FALSE;
 }
 
     return FALSE;
 }
 

+#endif
\ No newline at end of file