*** empty log message ***

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

diff --git a/include/wx/os2/radiobut.h b/include/wx/os2/radiobut.h
index 8e8bf1313d37f062d16a793722c5f996ad76204a..4d4e48a5798da0383912906d82d12e85f197bb92 100644 (file)
--- a/include/wx/os2/radiobut.h
+++ b/include/wx/os2/radiobut.h
@@ -1,21 +1,17 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        radiobut.h
 // Purpose:     wxRadioButton class
 /////////////////////////////////////////////////////////////////////////////
 // Name:        radiobut.h
 // Purpose:     wxRadioButton class

-// Author:      AUTHOR
+// Author:      David Webster

 // Modified by:
 // Modified by:

-// Created:     01/02/97
+// Created:     10/12/99

 // RCS-ID:      $Id$
 // RCS-ID:      $Id$

-// Copyright:   (c) AUTHOR
-// Licence:    wxWindows licence
+// Copyright:   (c) David Webster
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_RADIOBUT_H_
 #define _WX_RADIOBUT_H_
 
 /////////////////////////////////////////////////////////////////////////////
 
 #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;
 #include "wx/control.h"
 
 WXDLLEXPORT_DATA(extern const char*) wxRadioButtonNameStr;


@@ -47,11 +43,11 @@ class WXDLLEXPORT wxRadioButton: public wxControl
   virtual void SetValue(bool val);
   virtual bool GetValue() const ;
 
   virtual void SetValue(bool val);
   virtual bool GetValue() const ;
 

+  bool OS2Command(WXUINT param, WXWORD id);

   void Command(wxCommandEvent& event);
 };
 
 // Not implemented
   void Command(wxCommandEvent& event);
 };
 
 // Not implemented

-#if 0

 class WXDLLEXPORT wxBitmap ;
 
 WXDLLEXPORT_DATA(extern const char*) wxBitmapRadioButtonNameStr;
 class WXDLLEXPORT wxBitmap ;
 
 WXDLLEXPORT_DATA(extern const char*) wxBitmapRadioButtonNameStr;


@@ -83,8 +79,11 @@ class WXDLLEXPORT wxBitmapRadioButton: public wxRadioButton
   virtual void SetLabel(const wxBitmap *label);
   virtual void SetValue(bool val) ;
   virtual bool GetValue() const ;
   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_
 
 #endif
     // _WX_RADIOBUT_H_