wxHTML fixes

[wxWidgets.git] / include / wx / os2 / radiobut.h

diff --git a/include/wx/os2/radiobut.h b/include/wx/os2/radiobut.h
index 4d4e48a5798da0383912906d82d12e85f197bb92..ee96b5008b6ca0fe1ef0c432fdcacc3220befc32 100644 (file)
--- a/include/wx/os2/radiobut.h
+++ b/include/wx/os2/radiobut.h
@@ -26,7 +26,9 @@ class WXDLLEXPORT wxRadioButton: public wxControl
            const wxString& label,
            const wxPoint& pos = wxDefaultPosition,
            const wxSize& size = wxDefaultSize, long style = 0,
+#if wxUSE_VALIDATORS
            const wxValidator& validator = wxDefaultValidator,
+#endif
            const wxString& name = wxRadioButtonNameStr)
   {
       Create(parent, id, label, pos, size, style, validator, name);
@@ -36,7 +38,9 @@ class WXDLLEXPORT wxRadioButton: public wxControl
            const wxString& label,
            const wxPoint& pos = wxDefaultPosition,
            const wxSize& size = wxDefaultSize, long style = 0,
+#if wxUSE_VALIDATORS
            const wxValidator& validator = wxDefaultValidator,
+#endif
            const wxString& name = wxRadioButtonNameStr);
 
   virtual void SetLabel(const wxString& label);
@@ -47,43 +51,5 @@ class WXDLLEXPORT wxRadioButton: public wxControl
   void Command(wxCommandEvent& event);
 };
 
-// Not implemented
-class WXDLLEXPORT wxBitmap ;
-
-WXDLLEXPORT_DATA(extern const char*) wxBitmapRadioButtonNameStr;
-
-class WXDLLEXPORT wxBitmapRadioButton: public wxRadioButton
-{
-  DECLARE_DYNAMIC_CLASS(wxBitmapRadioButton)
- protected:
-  wxBitmap *theButtonBitmap;
- public:
-  inline wxBitmapRadioButton() { theButtonBitmap = NULL; }
-  inline wxBitmapRadioButton(wxWindow *parent, wxWindowID id,
-           const wxBitmap *label,
-           const wxPoint& pos = wxDefaultPosition,
-           const wxSize& size = wxDefaultSize, long style = 0,
-           const wxValidator& validator = wxDefaultValidator,
-           const wxString& name = wxBitmapRadioButtonNameStr)
-  {
-      Create(parent, id, label, pos, size, style, validator, name);
-  }
-
-  bool Create(wxWindow *parent, wxWindowID id,
-           const wxBitmap *label,
-           const wxPoint& pos = wxDefaultPosition,
-           const wxSize& size = wxDefaultSize, long style = 0,
-           const wxValidator& validator = wxDefaultValidator,
-           const wxString& name = wxBitmapRadioButtonNameStr);
-
-  virtual void SetLabel(const wxBitmap *label);
-  virtual void SetValue(bool val) ;
-  virtual bool GetValue() const ;
-private:
-  // virtual function hiding suppression, do not use
-  virtual void SetLabel(const wxString& label)
-  { wxRadioButton::SetLabel(label); };
-};
-
 #endif
     // _WX_RADIOBUT_H_