corrected conditional include

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

diff --git a/include/wx/os2/radiobut.h b/include/wx/os2/radiobut.h
index 8e8bf1313d37f062d16a793722c5f996ad76204a..f1e03be04a577d8a9c30dae5942695146f753331 100644 (file)
--- a/include/wx/os2/radiobut.h
+++ b/include/wx/os2/radiobut.h
@@ -1,21 +1,17 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        radiobut.h
 // Purpose:     wxRadioButton class
-// Author:      AUTHOR
+// Author:      David Webster
 // Modified by:
-// Created:     01/02/97
+// Created:     10/12/99
 // RCS-ID:      $Id$
-// Copyright:   (c) AUTHOR
-// Licence:    wxWindows licence
+// Copyright:   (c) David Webster
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_RADIOBUT_H_
 #define _WX_RADIOBUT_H_
 
-#ifdef __GNUG__
-#pragma interface "radiobut.h"
-#endif
-
 #include "wx/control.h"
 
 WXDLLEXPORT_DATA(extern const char*) wxRadioButtonNameStr;
@@ -30,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);
@@ -40,18 +38,20 @@ 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);
   virtual void SetValue(bool val);
   virtual bool GetValue() const ;
 
+  bool OS2Command(WXUINT param, WXWORD id);
   void Command(wxCommandEvent& event);
 };
 
 // Not implemented
-#if 0
 class WXDLLEXPORT wxBitmap ;
 
 WXDLLEXPORT_DATA(extern const char*) wxBitmapRadioButtonNameStr;
@@ -67,7 +67,9 @@ class WXDLLEXPORT wxBitmapRadioButton: public wxRadioButton
            const wxBitmap *label,
            const wxPoint& pos = wxDefaultPosition,
            const wxSize& size = wxDefaultSize, long style = 0,
+#if wxUSE_VALIDATORS
            const wxValidator& validator = wxDefaultValidator,
+#endif
            const wxString& name = wxBitmapRadioButtonNameStr)
   {
       Create(parent, id, label, pos, size, style, validator, name);
@@ -77,14 +79,19 @@ class WXDLLEXPORT wxBitmapRadioButton: public wxRadioButton
            const wxBitmap *label,
            const wxPoint& pos = wxDefaultPosition,
            const wxSize& size = wxDefaultSize, long style = 0,
+#if wxUSE_VALIDATORS
            const wxValidator& validator = wxDefaultValidator,
+#endif
            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
 
 #endif
     // _WX_RADIOBUT_H_