Fix broken and missing DataView interface items for Phoenix

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

diff --git a/src/gtk/radiobut.cpp b/src/gtk/radiobut.cpp
index 9cb0c7fe1694788b43f0d220eeb09e1e2cbbd8c1..421d84257599467aa457afca26dfd88ee147d95c 100644 (file)
--- a/src/gtk/radiobut.cpp
+++ b/src/gtk/radiobut.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        radiobut.cpp
+// Name:        src/gtk/radiobut.cpp

 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$


@@ -14,7 +14,9 @@
 
 #include "wx/radiobut.h"
 
 
 #include "wx/radiobut.h"
 

+#include <gtk/gtk.h>

 #include "wx/gtk/private.h"
 #include "wx/gtk/private.h"

+#include "wx/gtk/private/gtk2-compat.h"

 
 //-----------------------------------------------------------------------------
 // data
 
 //-----------------------------------------------------------------------------
 // data


@@ -30,11 +32,9 @@ extern "C" {
 static
 void gtk_radiobutton_clicked_callback( GtkToggleButton *button, wxRadioButton *rb )
 {
 static
 void gtk_radiobutton_clicked_callback( GtkToggleButton *button, wxRadioButton *rb )
 {

-    if (!rb->m_hasVMT) return;
-

     if (g_blockEventsOnDrag) return;
 
     if (g_blockEventsOnDrag) return;
 

-    if (!button->active) return;
+    if (!gtk_toggle_button_get_active(button)) return;

 
     wxCommandEvent event( wxEVT_COMMAND_RADIOBUTTON_SELECTED, rb->GetId());
     event.SetInt( rb->GetValue() );
 
     wxCommandEvent event( wxEVT_COMMAND_RADIOBUTTON_SELECTED, rb->GetId());
     event.SetInt( rb->GetValue() );


@@ -63,6 +63,9 @@ bool wxRadioButton::Create( wxWindow *parent,
         return false;
     }
 
         return false;
     }
 

+    // Check if this radio button should be put into an existing group. This
+    // shouldn't be done if it's given a style to explicitly start a new group
+    // or if it's not meant to be a part of a group at all.

     GSList* radioButtonGroup = NULL;
     if (!HasFlag(wxRB_GROUP) && !HasFlag(wxRB_SINGLE))
     {
     GSList* radioButtonGroup = NULL;
     if (!HasFlag(wxRB_GROUP) && !HasFlag(wxRB_SINGLE))
     {


@@ -71,10 +74,22 @@ bool wxRadioButton::Create( wxWindow *parent,
         for (; node; node = node->GetPrevious())
         {
             wxWindow *child = node->GetData();
         for (; node; node = node->GetPrevious())
         {
             wxWindow *child = node->GetData();

-            if (child->HasFlag(wxRB_GROUP) && wxIsKindOf(child, wxRadioButton))
+
+            // We stop at the first previous radio button in any case as it
+            // wouldn't make sense to put this button in a group with another
+            // one if there is a radio button that is not part of the same
+            // group between them.
+            if (wxIsKindOf(child, wxRadioButton))

             {
             {

-                radioButtonGroup = gtk_radio_button_get_group(
-                    GTK_RADIO_BUTTON(child->m_widget));
+                // Any preceding radio button can be used to get its group, not
+                // necessarily one with wxRB_GROUP style, but exclude
+                // wxRB_SINGLE ones as their group should never be shared.
+                if (!child->HasFlag(wxRB_SINGLE))
+                {
+                    radioButtonGroup = gtk_radio_button_get_group(
+                        GTK_RADIO_BUTTON(child->m_widget));
+                }
+

                 break;
             }
         }
                 break;
             }
         }


@@ -102,7 +117,7 @@ void wxRadioButton::SetLabel( const wxString& label )
     // save the original label
     wxControlBase::SetLabel(label);
 
     // save the original label
     wxControlBase::SetLabel(label);
 

-    GTKSetLabelForLabel(GTK_LABEL(GTK_BIN(m_widget)->child), label);
+    GTKSetLabelForLabel(GTK_LABEL(gtk_bin_get_child(GTK_BIN(m_widget))), label);

 }
 
 void wxRadioButton::SetValue( bool val )
 }
 
 void wxRadioButton::SetValue( bool val )


@@ -134,7 +149,7 @@ bool wxRadioButton::GetValue() const
 {
     wxCHECK_MSG( m_widget != NULL, false, wxT("invalid radiobutton") );
 
 {
     wxCHECK_MSG( m_widget != NULL, false, wxT("invalid radiobutton") );
 

-    return GTK_TOGGLE_BUTTON(m_widget)->active;
+    return gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(m_widget)) != 0;

 }
 
 bool wxRadioButton::Enable( bool enable )
 }
 
 bool wxRadioButton::Enable( bool enable )


@@ -142,7 +157,7 @@ bool wxRadioButton::Enable( bool enable )
     if (!base_type::Enable(enable))
         return false;
 
     if (!base_type::Enable(enable))
         return false;
 

-    gtk_widget_set_sensitive(GTK_BIN(m_widget)->child, enable);
+    gtk_widget_set_sensitive(gtk_bin_get_child(GTK_BIN(m_widget)), enable);

 
     if (enable)
         GTKFixSensitivity();
 
     if (enable)
         GTKFixSensitivity();


@@ -152,14 +167,14 @@ bool wxRadioButton::Enable( bool enable )
 
 void wxRadioButton::DoApplyWidgetStyle(GtkRcStyle *style)
 {
 
 void wxRadioButton::DoApplyWidgetStyle(GtkRcStyle *style)
 {

-    gtk_widget_modify_style(m_widget, style);
-    gtk_widget_modify_style(GTK_BIN(m_widget)->child, style);
+    GTKApplyStyle(m_widget, style);
+    GTKApplyStyle(gtk_bin_get_child(GTK_BIN(m_widget)), style);

 }
 
 GdkWindow *
 wxRadioButton::GTKGetWindow(wxArrayGdkWindows& WXUNUSED(windows)) const
 {
 }
 
 GdkWindow *
 wxRadioButton::GTKGetWindow(wxArrayGdkWindows& WXUNUSED(windows)) const
 {

-    return GTK_BUTTON(m_widget)->event_window;
+    return gtk_button_get_event_window(GTK_BUTTON(m_widget));

 }
 
 // static
 }
 
 // static