xti additions / changes, trying to reduce dependencies

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

diff --git a/src/msw/radiobut.cpp b/src/msw/radiobut.cpp
index d3729c2951d862590b291ddf3dcaaf36818a14db..f733548853d4cf92577dc809dcf5ba783f426991 100644 (file)
--- a/src/msw/radiobut.cpp
+++ b/src/msw/radiobut.cpp
@@ -5,8 +5,8 @@
 // Modified by:
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Modified by:
 // Created:     04/01/98
 // RCS-ID:      $Id$

-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:     wxWindows license
+// Copyright:   (c) Julian Smart
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================


@@ -17,7 +17,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

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

 #pragma implementation "radiobut.h"
 #endif
 
 #pragma implementation "radiobut.h"
 #endif
 


@@ -47,7 +47,26 @@
 // wxRadioButton creation
 // ----------------------------------------------------------------------------
 
 // wxRadioButton creation
 // ----------------------------------------------------------------------------
 

+
+#if wxUSE_EXTENDED_RTTI
+IMPLEMENT_DYNAMIC_CLASS_XTI(wxRadioButton, wxControl,"wx/radiobut.h")
+
+WX_BEGIN_PROPERTIES_TABLE(wxRadioButton)
+       WX_DELEGATE( OnClick , wxEVT_COMMAND_RADIOBUTTON_SELECTED , wxCommandEvent )
+       WX_PROPERTY( Font , wxFont , SetFont , GetFont  , )
+       WX_PROPERTY( Label,wxString, SetLabel, GetLabel, wxEmptyString )
+       WX_PROPERTY( Value ,bool, SetValue, GetValue, )
+WX_END_PROPERTIES_TABLE()
+
+WX_BEGIN_HANDLERS_TABLE(wxRadioButton)
+WX_END_HANDLERS_TABLE()
+
+WX_CONSTRUCTOR_6( wxRadioButton , wxWindow* , Parent , wxWindowID , Id , wxString , Label , wxPoint , Position , wxSize , Size , long , WindowStyle ) 
+
+#else

 IMPLEMENT_DYNAMIC_CLASS(wxRadioButton, wxControl)
 IMPLEMENT_DYNAMIC_CLASS(wxRadioButton, wxControl)

+#endif
+

 
 void wxRadioButton::Init()
 {
 
 void wxRadioButton::Init()
 {


@@ -114,35 +133,39 @@ void wxRadioButton::SetValue(bool value)
     if ( value )
     {
         const wxWindowList& siblings = GetParent()->GetChildren();
     if ( value )
     {
         const wxWindowList& siblings = GetParent()->GetChildren();

-        wxWindowList::Node *nodeThis = siblings.Find(this);
+        wxWindowList::compatibility_iterator nodeThis = siblings.Find(this);

         wxCHECK_RET( nodeThis, _T("radio button not a child of its parent?") );
 
         wxCHECK_RET( nodeThis, _T("radio button not a child of its parent?") );
 

-        // turn off all radio buttons before this one
-        for ( wxWindowList::Node *nodeBefore = nodeThis->GetPrevious();
-              nodeBefore;
-              nodeBefore = nodeBefore->GetPrevious() )
+        // if it's not the first item of the group ...
+        if ( !HasFlag(wxRB_GROUP) )

         {
         {

-            wxRadioButton *btn = wxDynamicCast(nodeBefore->GetData(),
-                                               wxRadioButton);
-            if ( !btn )
+            // ... turn off all radio buttons before it
+            for ( wxWindowList::compatibility_iterator nodeBefore = nodeThis->GetPrevious();
+                  nodeBefore;
+                  nodeBefore = nodeBefore->GetPrevious() )

             {
             {

-                // the radio buttons in a group must be consecutive, so there
-                // are no more of them
-                break;
-            }
-
-            btn->SetValue(FALSE);
-
-            if ( btn->HasFlag(wxRB_GROUP) )
-            {
-                // even if there are other radio buttons before this one,
-                // they're not in the same group with us
-                break;
+                wxRadioButton *btn = wxDynamicCast(nodeBefore->GetData(),
+                                                   wxRadioButton);
+                if ( !btn )
+                {
+                    // the radio buttons in a group must be consecutive, so
+                    // there are no more of them
+                    break;
+                }
+
+                btn->SetValue(FALSE);
+
+                if ( btn->HasFlag(wxRB_GROUP) )
+                {
+                    // even if there are other radio buttons before this one,
+                    // they're not in the same group with us
+                    break;
+                }

             }
         }
 
             }
         }
 

-        // ... and all after this one
-        for ( wxWindowList::Node *nodeAfter = nodeThis->GetNext();
+        // ... and also turn off all buttons after this one
+        for ( wxWindowList::compatibility_iterator nodeAfter = nodeThis->GetNext();

               nodeAfter;
               nodeAfter = nodeAfter->GetNext() )
         {
               nodeAfter;
               nodeAfter = nodeAfter->GetNext() )
         {