Fix another crash when conversion fails in Unix PostScript code.

[wxWidgets.git] / src / univ / radiobut.cpp

diff --git a/src/univ/radiobut.cpp b/src/univ/radiobut.cpp
index de57e5f3fcb07d66c59da43c6fda9d8aff1ca8c3..8c65e6d8b46827a47c17b8b24952e09974e96cf5 100644 (file)
--- a/src/univ/radiobut.cpp
+++ b/src/univ/radiobut.cpp
@@ -1,12 +1,11 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        univ/radiobut.cpp
+// Name:        src/univ/radiobut.cpp
 // Purpose:     wxRadioButton implementation
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     10.09.00
-// RCS-ID:      $Id$
-// Copyright:   (c) 2000 Vadim Zeitlin
-// Licence:     wxWindows license
+// Copyright:   (c) 2000 SciTech Software, Inc. (www.scitechsoft.com)
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
@@ -17,10 +16,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#ifdef __GNUG__
-    #pragma implementation "univradiobut.h"
-#endif
-
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
@@ -29,9 +24,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 +40,6 @@
 // implementation
 // ============================================================================
 
-IMPLEMENT_DYNAMIC_CLASS(wxRadioButton, wxControl)
-
 // ----------------------------------------------------------------------------
 // wxRadioButton
 // ----------------------------------------------------------------------------
@@ -60,12 +54,12 @@ bool wxRadioButton::Create(wxWindow *parent,
                         const wxString &name)
 {
     if ( !wxCheckBox::Create(parent, id, label, pos, size, style,
-                             wxDefaultValidator, name) )
+                             validator, name) )
     {
-        return FALSE;
+        return false;
     }
 
-    return TRUE;
+    return true;
 }
 
 // ----------------------------------------------------------------------------
@@ -78,7 +72,7 @@ void wxRadioButton::OnCheck()
     // find the radio button which is the first in the group, i.e. the one
     // with wxRB_GROUP style
     const wxWindowList& siblings = GetParent()->GetChildren();
-    wxWindowList::Node *nodeStart = siblings.Find(this);
+    wxWindowList::compatibility_iterator nodeStart = siblings.Find(this);
     while ( nodeStart )
     {
         // stop if we found a radio button with wxRB_GROUP style or it we
@@ -134,13 +128,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 +147,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 +174,3 @@ void wxRadioButton::DoDraw(wxControlRenderer *renderer)
 }
 
 #endif // wxUSE_RADIOBTN
-