Applied [ 1059554 ] patch for [1028659] fixes a couple of bugs with menus

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

diff --git a/src/univ/radiobut.cpp b/src/univ/radiobut.cpp
index de57e5f3fcb07d66c59da43c6fda9d8aff1ca8c3..6415ae32f1d7891868b25a0eb9f5e502a7586637 100644 (file)
--- a/src/univ/radiobut.cpp
+++ b/src/univ/radiobut.cpp
@@ -5,8 +5,8 @@
 // Modified by:
 // Created:     10.09.00
 // RCS-ID:      $Id$
 // 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,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);

     }
 }
 
     }
 }