X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2bda0e173844e8e0f8acf4e8ad8b5c26e5c6fe5d..ca77701441e39245dcbfce903049e76f166979e5:/include/wx/msw/radiobut.h diff --git a/include/wx/msw/radiobut.h b/include/wx/msw/radiobut.h index d78fdf1d5d..47bde0578a 100644 --- a/include/wx/msw/radiobut.h +++ b/include/wx/msw/radiobut.h @@ -1,92 +1,71 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: radiobut.h +// Name: wx/msw/radiobut.h // Purpose: wxRadioButton class // Author: Julian Smart // Modified by: // Created: 01/02/97 // RCS-ID: $Id$ -// Copyright: (c) Julian Smart and Markus Holzem -// Licence: wxWindows license +// Copyright: (c) Julian Smart +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifndef __RADIOBUTH__ -#define __RADIOBUTH__ +#ifndef _WX_RADIOBUT_H_ +#define _WX_RADIOBUT_H_ -#ifdef __GNUG__ -#pragma interface "radiobut.h" -#endif +class WXDLLIMPEXP_CORE wxRadioButton: public wxControl +{ +public: + // ctors and creation functions + wxRadioButton() { Init(); } -#include "wx/control.h" + wxRadioButton(wxWindow *parent, + wxWindowID id, + const wxString& label, + const wxPoint& pos = wxDefaultPosition, + const wxSize& size = wxDefaultSize, + long style = 0, + const wxValidator& validator = wxDefaultValidator, + const wxString& name = wxRadioButtonNameStr) + { + Init(); -WXDLLEXPORT_DATA(extern const char*) wxRadioButtonNameStr; + Create(parent, id, label, pos, size, style, validator, name); + } -class WXDLLEXPORT wxRadioButton: public wxControl -{ - DECLARE_DYNAMIC_CLASS(wxRadioButton) - protected: - public: - inline wxRadioButton(void) {} - inline wxRadioButton(wxWindow *parent, const wxWindowID id, - const wxString& label, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, const long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxRadioButtonNameStr) - { - Create(parent, id, label, pos, size, style, validator, name); - } + bool Create(wxWindow *parent, + wxWindowID id, + const wxString& label, + const wxPoint& pos = wxDefaultPosition, + const wxSize& size = wxDefaultSize, + long style = 0, + const wxValidator& validator = wxDefaultValidator, + const wxString& name = wxRadioButtonNameStr); - bool Create(wxWindow *parent, const wxWindowID id, - const wxString& label, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, const long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxRadioButtonNameStr); + // implement the radio button interface + virtual void SetValue(bool value); + virtual bool GetValue() const; - virtual void SetLabel(const wxString& label); - virtual void SetValue(const bool val); - virtual bool GetValue(void) const ; + // implementation only from now on + virtual bool MSWCommand(WXUINT param, WXWORD id); + virtual void Command(wxCommandEvent& event); + virtual bool HasTransparentBackground() { return true; } - void Command(wxCommandEvent& event); - virtual WXHBRUSH OnCtlColor(const WXHDC pDC, const WXHWND pWnd, const WXUINT nCtlColor, - WXUINT message, WXWPARAM wParam, WXLPARAM lParam); -}; + virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const; -// Not implemented -#if 0 -class WXDLLEXPORT wxBitmap ; +protected: + virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; } + virtual wxSize DoGetBestSize() const; -WXDLLEXPORT_DATA(extern const char*) wxBitmapRadioButtonNameStr; +private: + // common part of all ctors + void Init(); -class WXDLLEXPORT wxBitmapRadioButton: public wxRadioButton -{ - DECLARE_DYNAMIC_CLASS(wxBitmapRadioButton) - protected: - wxBitmap *theButtonBitmap; - public: - inline wxBitmapRadioButton(void) { theButtonBitmap = NULL; } - inline wxBitmapRadioButton(wxWindow *parent, const wxWindowID id, - const wxBitmap *label, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, const long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxBitmapRadioButtonNameStr) - { - Create(parent, id, label, pos, size, style, validator, name); - } - - bool Create(wxWindow *parent, const wxWindowID id, - const wxBitmap *label, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, const long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxBitmapRadioButtonNameStr); + // we need to store the state internally as the result of GetValue() + // sometimes gets out of sync in WM_COMMAND handler + bool m_isChecked; - virtual void SetLabel(const wxBitmap *label); - virtual void SetValue(const bool val) ; - virtual bool GetValue(void) const ; + DECLARE_DYNAMIC_CLASS_NO_COPY(wxRadioButton) }; -#endif #endif - // __RADIOBUTH__ + // _WX_RADIOBUT_H_