X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a290fa5a7deebe9d96c0c0089d18e27d4bd9b624..eea4d01c65f9b29baa1193db762b4c6b8144af24:/src/univ/radiobut.cpp diff --git a/src/univ/radiobut.cpp b/src/univ/radiobut.cpp index 6415ae32f1..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 // ---------------------------------------------------------------------------- -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #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 // ---------------------------------------------------------------------------- @@ -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 -