X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0e320a79f187558effb04d92020b470372bbe456..5f4cd605aa4bb463999693b04ee3cd42eb6ec8c3:/include/wx/os2/radiobut.h diff --git a/include/wx/os2/radiobut.h b/include/wx/os2/radiobut.h index 8e8bf1313d..ee96b5008b 100644 --- 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,51 +38,18 @@ 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; - -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 ; -}; -#endif - #endif // _WX_RADIOBUT_H_