X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0e320a79f187558effb04d92020b470372bbe456..efba2b89f15ba8757a722fc56c67f434cf960482:/include/wx/os2/checkbox.h diff --git a/include/wx/os2/checkbox.h b/include/wx/os2/checkbox.h index b101211116..8033fd4dd0 100644 --- a/include/wx/os2/checkbox.h +++ b/include/wx/os2/checkbox.h @@ -1,21 +1,17 @@ ///////////////////////////////////////////////////////////////////////////// // 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; @@ -42,13 +38,18 @@ class WXDLLEXPORT wxCheckBox: public wxControl 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 bool OS2Command(WXUINT param, WXWORD id); virtual void SetLabel(const wxString& label); virtual void Command(wxCommandEvent& event); -private: - void SetSize(int width, int height) {wxWindow::SetSize(width, height);} + virtual WXHBRUSH OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor, + WXUINT message, WXWPARAM wParam, WXLPARAM lParam); + +protected: + virtual wxSize DoGetBestSize(); }; class WXDLLEXPORT wxBitmapCheckBox: public wxCheckBox @@ -74,13 +75,11 @@ class WXDLLEXPORT wxBitmapCheckBox: public wxCheckBox 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& string) + { wxCheckBox::SetLabel(string); }; }; #endif // _WX_CHECKBOX_H_