X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f254e2424a5220e559e48205ace1114ea3e87f3f..fea77d88b8dc69f7885d8ff47cad29bc8f6089ab:/src/univ/checkbox.cpp diff --git a/src/univ/checkbox.cpp b/src/univ/checkbox.cpp index d92d93808e..3ebe735450 100644 --- a/src/univ/checkbox.cpp +++ b/src/univ/checkbox.cpp @@ -4,7 +4,6 @@ // Author: Vadim Zeitlin // Modified by: // Created: 25.08.00 -// RCS-ID: $Id$ // Copyright: (c) 2000 SciTech Software, Inc. (www.scitechsoft.com) // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -59,8 +58,6 @@ public: // implementation // ============================================================================ -IMPLEMENT_DYNAMIC_CLASS(wxCheckBox, wxControl) - // ---------------------------------------------------------------------------- // wxCheckBox // ---------------------------------------------------------------------------- @@ -118,7 +115,7 @@ void wxCheckBox::OnCheck() wxBitmap wxCheckBox::GetBitmap(State state, Status status) const { wxBitmap bmp = m_bitmaps[state][status]; - if ( !bmp.Ok() ) + if ( !bmp.IsOk() ) bmp = m_bitmaps[State_Normal][status]; return bmp; @@ -180,7 +177,7 @@ void wxCheckBox::DoDraw(wxControlRenderer *renderer) wxSize wxCheckBox::GetBitmapSize() const { wxBitmap bmp = GetBitmap(State_Normal, Status_Checked); - return bmp.Ok() ? wxSize(bmp.GetWidth(), bmp.GetHeight()) + return bmp.IsOk() ? wxSize(bmp.GetWidth(), bmp.GetHeight()) : GetRenderer()->GetCheckBitmapSize(); } @@ -300,7 +297,7 @@ void wxCheckBox::ChangeValue(bool value) void wxCheckBox::SendEvent() { - wxCommandEvent event(wxEVT_COMMAND_CHECKBOX_CLICKED, GetId()); + wxCommandEvent event(wxEVT_CHECKBOX, GetId()); InitCommandEvent(event); wxCheckBoxState state = Get3StateValue();