Update wxWebFileHandler to handle paths with fragments correctly, some backends pass...

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

diff --git a/src/univ/radiobut.cpp b/src/univ/radiobut.cpp
index d125cb30f573da89975fec9a281c2495ba10b31c..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:


@@ -25,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
 


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

-IMPLEMENT_DYNAMIC_CLASS(wxRadioButton, wxControl)
-

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


@@ -149,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();
 }
 


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

-