X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1169a91932273bc84c23ed9dbd0a2da064d59d66..c0b0635cf69537ca32377bad5650b39402cb21b6:/src/univ/checkbox.cpp?ds=sidebyside diff --git a/src/univ/checkbox.cpp b/src/univ/checkbox.cpp index 966e9f580d..450d303dc1 100644 --- a/src/univ/checkbox.cpp +++ b/src/univ/checkbox.cpp @@ -52,32 +52,9 @@ IMPLEMENT_DYNAMIC_CLASS(wxCheckBox, wxControl) // wxCheckBox // ---------------------------------------------------------------------------- -wxCheckBoxBase::wxCheckBoxBase() -{ -} - -wxCheckBox::wxCheckBox() -{ - Init(); -} - -wxCheckBox::wxCheckBox(wxWindow *parent, - wxWindowID id, - const wxString& label, - const wxPoint& pos, - const wxSize& size, - long style, - const wxValidator& validator, - const wxString& name) -{ - Init(); - - Create(parent, id, label, pos, size, style, validator, name); -} - void wxCheckBox::Init() { - m_isPressed = FALSE; + m_isPressed = false; m_status = Status_Unchecked; } @@ -91,14 +68,14 @@ bool wxCheckBox::Create(wxWindow *parent, const wxString &name) { if ( !wxControl::Create(parent, id, pos, size, style, validator, name) ) - return FALSE; + return false; SetLabel(label); SetBestSize(size); CreateInputHandler(wxINP_HANDLER_CHECKBOX); - return TRUE; + return true; } // ---------------------------------------------------------------------------- @@ -230,7 +207,7 @@ void wxCheckBox::Press() { if ( !m_isPressed ) { - m_isPressed = TRUE; + m_isPressed = true; Refresh(); } @@ -240,7 +217,7 @@ void wxCheckBox::Release() { if ( m_isPressed ) { - m_isPressed = FALSE; + m_isPressed = false; Refresh(); } @@ -248,7 +225,7 @@ void wxCheckBox::Release() void wxCheckBox::Toggle() { - m_isPressed = FALSE; + m_isPressed = false; ChangeValue(!GetValue()); } @@ -281,15 +258,15 @@ bool wxCheckBox::PerformAction(const wxControlAction& action, else if ( action == wxACTION_BUTTON_RELEASE ) Release(); if ( action == wxACTION_CHECKBOX_CHECK ) - ChangeValue(TRUE); + ChangeValue(true); else if ( action == wxACTION_CHECKBOX_CLEAR ) - ChangeValue(FALSE); + ChangeValue(false); else if ( action == wxACTION_CHECKBOX_TOGGLE ) Toggle(); else return wxControl::PerformAction(action, numArg, strArg); - return TRUE; + return true; } // ----------------------------------------------------------------------------