Workaround for special menu items not always being enabled. Use

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

diff --git a/src/univ/radiobut.cpp b/src/univ/radiobut.cpp
index f0ddaa727a042db9e1f90ae5f6d85cfe4d3684ea..6415ae32f1d7891868b25a0eb9f5e502a7586637 100644 (file)
--- a/src/univ/radiobut.cpp
+++ b/src/univ/radiobut.cpp
@@ -17,7 +17,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma implementation "univradiobut.h"
 #endif
 
     #pragma implementation "univradiobut.h"
 #endif
 


@@ -60,12 +60,12 @@ bool wxRadioButton::Create(wxWindow *parent,
                         const wxString &name)
 {
     if ( !wxCheckBox::Create(parent, id, label, pos, size, style,
                         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 +78,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();
     // 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
     while ( nodeStart )
     {
         // stop if we found a radio button with wxRB_GROUP style or it we


@@ -134,7 +134,7 @@ void wxRadioButton::ClearValue()
 {
     if ( IsChecked() )
     {
 {
     if ( IsChecked() )
     {

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

     }
 }
 
     }
 }