X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6463b9f5399b8670a0c74f2f8666bc2c9f37a406..fb8d7eb7a880f1f2e32d8830f9c5e12b2536e05f:/src/univ/radiobut.cpp?ds=sidebyside

diff --git a/src/univ/radiobut.cpp b/src/univ/radiobut.cpp
index 6ba669f940..80d51339dd 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
 // ----------------------------------------------------------------------------
@@ -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,13 +129,13 @@ void wxRadioButton::ClearValue()
 {
     if ( IsChecked() )
     {
-        SetValue(FALSE);
+        SetValue(false);
     }
 }
 
 void wxRadioButton::SendEvent()
 {
-    wxCommandEvent event(wxEVT_COMMAND_RADIOBUTTON_SELECTED, GetId());
+    wxCommandEvent event(wxEVT_RADIOBUTTON, GetId());
     InitCommandEvent(event);
     event.SetInt(IsChecked());
     Command(event);
@@ -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
-