X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0e320a79f187558effb04d92020b470372bbe456..df455719ff6891112733200ff533109c34d184e0:/include/wx/os2/checkbox.h diff --git a/include/wx/os2/checkbox.h b/include/wx/os2/checkbox.h index b101211116..c2ea188dab 100644 --- a/include/wx/os2/checkbox.h +++ b/include/wx/os2/checkbox.h @@ -1,86 +1,117 @@ ///////////////////////////////////////////////////////////////////////////// // Name: checkbox.h // Purpose: wxCheckBox class -// Author: AUTHOR +// Author: David Webster // Modified by: -// Created: ??/??/98 +// Created: 10/13/99 // RCS-ID: $Id$ -// Copyright: (c) AUTHOR -// Licence: wxWindows licence +// Copyright: (c) David Webster +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef _WX_CHECKBOX_H_ #define _WX_CHECKBOX_H_ -#ifdef __GNUG__ -#pragma interface "checkbox.h" -#endif - #include "wx/control.h" -WXDLLEXPORT_DATA(extern const char*) wxCheckBoxNameStr; - // Checkbox item (single checkbox) class WXDLLEXPORT wxBitmap; -class WXDLLEXPORT wxCheckBox: public wxControl +class WXDLLEXPORT wxCheckBox : public wxCheckBoxBase { - DECLARE_DYNAMIC_CLASS(wxCheckBox) - public: - inline wxCheckBox() { } - inline wxCheckBox(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 = wxCheckBoxNameStr) - { - Create(parent, id, label, pos, size, style, validator, name); - } + inline wxCheckBox() { } + inline wxCheckBox( wxWindow* pParent + ,wxWindowID vId + ,const wxString& rsLabel + ,const wxPoint& rPos = wxDefaultPosition + ,const wxSize& rSize = wxDefaultSize + ,long lStyle = 0 + ,const wxValidator& rValidator = wxDefaultValidator + ,const wxString& rsName = wxCheckBoxNameStr + ) + { + Create( pParent + ,vId + ,rsLabel + ,rPos + ,rSize + ,lStyle + ,rValidator + ,rsName + ); + } + + bool Create( wxWindow* pParent + ,wxWindowID vId + ,const wxString& rsLabel + ,const wxPoint& rPos = wxDefaultPosition + ,const wxSize& rSize = wxDefaultSize + ,long lStyle = 0 + ,const wxValidator& rValidator = wxDefaultValidator + ,const wxString& rsName = wxCheckBoxNameStr + ); + + virtual void SetValue(bool bValue); + virtual bool GetValue(void) const ; - 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 = wxCheckBoxNameStr); - virtual void SetValue(bool); - virtual bool GetValue() const ; - virtual void SetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO); - virtual void SetLabel(const wxString& label); - virtual void Command(wxCommandEvent& event); + virtual bool OS2Command( WXUINT uParam + ,WXWORD wId + ); + virtual void SetLabel(const wxString& rsLabel); + virtual void Command(wxCommandEvent& rEvent); + +protected: + virtual wxSize DoGetBestSize(void) const; private: - void SetSize(int width, int height) {wxWindow::SetSize(width, height);} + DECLARE_DYNAMIC_CLASS(wxCheckBox) }; class WXDLLEXPORT wxBitmapCheckBox: public wxCheckBox { - DECLARE_DYNAMIC_CLASS(wxBitmapCheckBox) - public: - int checkWidth ; - int checkHeight ; - inline wxBitmapCheckBox() { checkWidth = -1; checkHeight = -1; } - inline wxBitmapCheckBox(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 = wxCheckBoxNameStr) - { - Create(parent, id, label, pos, size, style, validator, name); - } + inline wxBitmapCheckBox() { m_nCheckWidth = -1; m_nCheckHeight = -1; } + inline wxBitmapCheckBox( wxWindow* pParent + ,wxWindowID vId + ,const wxBitmap* pLabel + ,const wxPoint& rPos = wxDefaultPosition + ,const wxSize& rSize = wxDefaultSize + ,long lStyle = 0 + ,const wxValidator& rValidator = wxDefaultValidator + ,const wxString& rsName = wxCheckBoxNameStr + ) + { + Create( pParent + ,vId + ,pLabel + ,rPos + ,rSize + ,lStyle + ,rValidator + ,rsName + ); + } + + bool Create( wxWindow* pParent + ,wxWindowID vId + ,const wxBitmap* pLabel + ,const wxPoint& rPos = wxDefaultPosition + ,const wxSize& rSize = wxDefaultSize + ,long lStyle = 0 + ,const wxValidator& rValidator = wxDefaultValidator + ,const wxString& rsName = wxCheckBoxNameStr + ); + + virtual void SetLabel(const wxBitmap& rBitmap); + + int m_nCheckWidth; + int m_nCheckHeight; - bool Create(wxWindow *parent, wxWindowID id, const wxBitmap *bitmap, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxCheckBoxNameStr); - virtual void SetValue(bool); - virtual bool GetValue() const ; - virtual void SetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO); - virtual void SetLabel(const wxBitmap& bitmap); private: - void SetSize(int width, int height) {wxWindow::SetSize(width, height);} - void SetLabel(const wxString& label) {wxCheckBox::SetLabel(label);} + + virtual void SetLabel(const wxString& rsString) + { wxCheckBox::SetLabel(rsString); }; + DECLARE_DYNAMIC_CLASS(wxBitmapCheckBox) }; #endif // _WX_CHECKBOX_H_