Fix history in wxWebViewIE when using a custom file scheme.

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

diff --git a/src/univ/radiobut.cpp b/src/univ/radiobut.cpp
index 6ba669f94017c5c8fcada5438db7585225b848df..d047af7f97dc8c714fd657d254ffcf006976a62b 100644 (file)
--- 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:
 // Purpose:     wxRadioButton implementation
 // Author:      Vadim Zeitlin
 // Modified by:


@@ -17,10 +17,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 +25,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 +41,6 @@
 // implementation
 // ============================================================================
 
 // implementation
 // ============================================================================
 

-IMPLEMENT_DYNAMIC_CLASS(wxRadioButton, wxControl)
-

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


@@ -62,10 +57,10 @@ bool wxRadioButton::Create(wxWindow *parent,
     if ( !wxCheckBox::Create(parent, id, label, pos, size, style,
                              validator, name) )
     {
     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() )
     {
 {
     if ( IsChecked() )
     {

-        SetValue(FALSE);
+        SetValue(false);

     }
 }
 
     }
 }
 


@@ -153,7 +148,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 +175,3 @@ void wxRadioButton::DoDraw(wxControlRenderer *renderer)
 }
 
 #endif // wxUSE_RADIOBTN
 }
 
 #endif // wxUSE_RADIOBTN

-