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 6415ae32f1d7891868b25a0eb9f5e502a7586637..8c65e6d8b46827a47c17b8b24952e09974e96cf5 100644 (file)
--- a/src/univ/radiobut.cpp
+++ b/src/univ/radiobut.cpp
@@ -1,10 +1,9 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        univ/radiobut.cpp
+// Name:        src/univ/radiobut.cpp

 // Purpose:     wxRadioButton implementation
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     10.09.00
 // Purpose:     wxRadioButton implementation
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     10.09.00

-// RCS-ID:      $Id$

 // Copyright:   (c) 2000 SciTech Software, Inc. (www.scitechsoft.com)
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) 2000 SciTech Software, Inc. (www.scitechsoft.com)
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -17,10 +16,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma implementation "univradiobut.h"
-#endif
-

 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__


@@ -29,9 +24,10 @@
 
 #if wxUSE_RADIOBTN
 
 
 #if wxUSE_RADIOBTN
 

+#include "wx/radiobut.h"
+

 #ifndef WX_PRECOMP
     #include "wx/dcclient.h"
 #ifndef WX_PRECOMP
     #include "wx/dcclient.h"

-    #include "wx/radiobut.h"

     #include "wx/validate.h"
 #endif
 
     #include "wx/validate.h"
 #endif
 


@@ -44,8 +40,6 @@
 // implementation
 // ============================================================================
 
 // implementation
 // ============================================================================
 

-IMPLEMENT_DYNAMIC_CLASS(wxRadioButton, wxControl)
-

 // ----------------------------------------------------------------------------
 // wxRadioButton
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxRadioButton
 // ----------------------------------------------------------------------------


@@ -140,7 +134,7 @@ void wxRadioButton::ClearValue()
 
 void wxRadioButton::SendEvent()
 {
 
 void wxRadioButton::SendEvent()
 {

-    wxCommandEvent event(wxEVT_COMMAND_RADIOBUTTON_SELECTED, GetId());
+    wxCommandEvent event(wxEVT_RADIOBUTTON, GetId());

     InitCommandEvent(event);
     event.SetInt(IsChecked());
     Command(event);
     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);
 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();
 }
 
                     : GetRenderer()->GetRadioBitmapSize();
 }
 


@@ -180,4 +174,3 @@ void wxRadioButton::DoDraw(wxControlRenderer *renderer)
 }
 
 #endif // wxUSE_RADIOBTN
 }
 
 #endif // wxUSE_RADIOBTN

-