X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/61fef19b852d426f5b00b60de083539b9ba0f76c..07edda049fbe3b6ae08daff5ce864543f155bab0:/src/univ/radiobut.cpp diff --git a/src/univ/radiobut.cpp b/src/univ/radiobut.cpp index eb1d8a6dc8..d047af7f97 100644 --- a/src/univ/radiobut.cpp +++ b/src/univ/radiobut.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: univ/radiobut.cpp +// Name: src/univ/radiobut.cpp // Purpose: wxRadioButton implementation // Author: Vadim Zeitlin // Modified by: @@ -17,10 +17,6 @@ // headers // ---------------------------------------------------------------------------- -#ifdef __GNUG__ - #pragma implementation "univradiobut.h" -#endif - #include "wx/wxprec.h" #ifdef __BORLANDC__ @@ -29,9 +25,10 @@ #if wxUSE_RADIOBTN +#include "wx/radiobut.h" + #ifndef WX_PRECOMP #include "wx/dcclient.h" - #include "wx/radiobut.h" #include "wx/validate.h" #endif @@ -44,8 +41,6 @@ // implementation // ============================================================================ -IMPLEMENT_DYNAMIC_CLASS(wxRadioButton, wxControl) - // ---------------------------------------------------------------------------- // wxRadioButton // ---------------------------------------------------------------------------- @@ -62,10 +57,10 @@ bool wxRadioButton::Create(wxWindow *parent, if ( !wxCheckBox::Create(parent, id, label, pos, size, style, validator, name) ) { - return FALSE; + return false; } - return TRUE; + return true; } // ---------------------------------------------------------------------------- @@ -134,7 +129,7 @@ void wxRadioButton::ClearValue() { if ( IsChecked() ) { - SetValue(FALSE); + SetValue(false); } } @@ -153,7 +148,7 @@ void wxRadioButton::SendEvent() wxSize wxRadioButton::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()->GetRadioBitmapSize(); } @@ -180,4 +175,3 @@ void wxRadioButton::DoDraw(wxControlRenderer *renderer) } #endif // wxUSE_RADIOBTN -