Fix regression in wxGTK wxFilePickerCtrl due to wxFileDialog changes.

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

diff --git a/src/gtk/radiobut.cpp b/src/gtk/radiobut.cpp
index 294820894fbbf55635d35b544a12f2ebd0c84d62..2dbfb916ee2d60bbb815a01973a8c81bc51b990f 100644 (file)
--- a/src/gtk/radiobut.cpp
+++ b/src/gtk/radiobut.cpp
@@ -1,191 +1,188 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"

 
 

-#ifdef __GNUG__
-#pragma implementation "radiobut.h"
-#endif
+#if wxUSE_RADIOBTN

 
 #include "wx/radiobut.h"
 
 
 #include "wx/radiobut.h"
 

-#if wxUSE_RADIOBOX
-
-#include "gdk/gdk.h"
-#include "gtk/gtk.h"
-
-//-----------------------------------------------------------------------------
-// idle system
-//-----------------------------------------------------------------------------
-
-extern void wxapp_install_idle_handler();
-extern bool g_isIdle;
+#include <gtk/gtk.h>
+#include "wx/gtk/private.h"
+#include "wx/gtk/private/gtk2-compat.h"

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

-extern bool g_blockEventsOnDrag;
+extern bool           g_blockEventsOnDrag;

 
 //-----------------------------------------------------------------------------
 // "clicked"
 //-----------------------------------------------------------------------------
 
 
 //-----------------------------------------------------------------------------
 // "clicked"
 //-----------------------------------------------------------------------------
 

-static 
-void gtk_radiobutton_clicked_callback( GtkWidget *WXUNUSED(widget), wxRadioButton *rb )
+extern "C" {
+static
+void gtk_radiobutton_clicked_callback( GtkToggleButton *button, wxRadioButton *rb )

 {
 {

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

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

-  
-    wxCommandEvent event( wxEVT_COMMAND_RADIOBUTTON_SELECTED, rb->GetId());
+
+    if (!gtk_toggle_button_get_active(button)) return;
+
+    wxCommandEvent event( wxEVT_RADIOBUTTON, rb->GetId());

     event.SetInt( rb->GetValue() );
     event.SetEventObject( rb );
     event.SetInt( rb->GetValue() );
     event.SetEventObject( rb );

-    rb->GetEventHandler()->ProcessEvent( event );
+    rb->HandleWindowEvent( event );
+}

 }
 
 //-----------------------------------------------------------------------------
 // wxRadioButton
 //-----------------------------------------------------------------------------
 
 }
 
 //-----------------------------------------------------------------------------
 // wxRadioButton
 //-----------------------------------------------------------------------------
 

-IMPLEMENT_DYNAMIC_CLASS(wxRadioButton,wxControl)
-  
-bool wxRadioButton::Create( wxWindow *parent, wxWindowID id, const wxString& label,
-  const wxPoint& pos,  const wxSize& size, long style,
-  const wxValidator& validator, const wxString& name )
+bool wxRadioButton::Create( wxWindow *parent,
+                            wxWindowID id,
+                            const wxString& label,
+                            const wxPoint& pos,
+                            const wxSize& size,
+                            long style,
+                            const wxValidator& validator,
+                            const wxString& name )

 {
 {

-    m_acceptsFocus = TRUE;
-    m_needParent = TRUE;
-
-    wxSize newSize = size;
-
-    PreCreation( parent, id, pos, newSize, style, name );
-    
-    m_isRadioButton = TRUE;
-  
-#if wxUSE_VALIDATORS
-    SetValidator( validator );
-#endif
-
-
-    if (HasFlag(wxRB_GROUP))
+    if (!PreCreation( parent, pos, size ) ||
+        !CreateBase( parent, id, pos, size, style, validator, name ))

     {
     {

-        /* start a new group */
-        m_radioButtonGroup = (GSList*) NULL;
+        wxFAIL_MSG( wxT("wxRadioButton creation failed") );
+        return false;

     }
     }

-    else
+
+    // 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))

     {
     {

-        /* search backward for last group start */
-        wxRadioButton *chief = (wxRadioButton*) NULL;
-        wxWindowList::Node *node = parent->GetChildren().GetLast();
-        while (node)
-       {
-           wxWindow *child = node->GetData();
-           if (child->m_isRadioButton)
-           {
-                chief = (wxRadioButton*) child;
-                if (child->HasFlag(wxRB_GROUP)) break;
-           }
-           if (chief)
-           {
-                /* we are part of the group started by chief */
-               m_radioButtonGroup = gtk_radio_button_group( GTK_RADIO_BUTTON(chief->m_widget) );
-           }
-           else
-           {
-                /* start a new group */
-                m_radioButtonGroup = (GSList*) NULL;
-           }
-           node = node->GetPrevious();
+        // search backward for last group start
+        wxWindowList::compatibility_iterator node = parent->GetChildren().GetLast();
+        for (; node; node = node->GetPrevious())
+        {
+            wxWindow *child = node->GetData();
+
+            // 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))
+            {
+                // 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;
+            }

         }
     }
 
         }
     }
 

-    m_widget = gtk_radio_button_new_with_label( m_radioButtonGroup, label.mbc_str() );
-      
+    m_widget = gtk_radio_button_new_with_label( radioButtonGroup, wxGTK_CONV( label ) );
+    g_object_ref(m_widget);
+

     SetLabel(label);
 
     SetLabel(label);
 

-    if (newSize.x == -1) newSize.x = 22+gdk_string_measure( m_widget->style->font, label.mbc_str() );
-    if (newSize.y == -1) newSize.y = 26;
-    SetSize( newSize.x, newSize.y );
+    g_signal_connect_after (m_widget, "clicked",
+                            G_CALLBACK (gtk_radiobutton_clicked_callback), this);

 
 

-    gtk_signal_connect( GTK_OBJECT(m_widget), "clicked", 
-      GTK_SIGNAL_FUNC(gtk_radiobutton_clicked_callback), (gpointer*)this );
-       

     m_parent->DoAddChild( this );
     m_parent->DoAddChild( this );

-  
-    PostCreation();

 
 

-    SetBackgroundColour( parent->GetBackgroundColour() );
-    SetForegroundColour( parent->GetForegroundColour() );
-    SetFont( parent->GetFont() );
-  
-    Show( TRUE );
+    PostCreation(size);

 
 

-    return TRUE;
+    return true;

 }
 
 void wxRadioButton::SetLabel( const wxString& label )
 {
 }
 
 void wxRadioButton::SetLabel( const wxString& label )
 {

-    wxCHECK_RET( m_widget != NULL, _T("invalid radiobutton") );
-  
-    wxControl::SetLabel( label );
-    GtkButton *bin = GTK_BUTTON( m_widget );
-    GtkLabel *g_label = GTK_LABEL( bin->child );
-    gtk_label_set( g_label, GetLabel().mbc_str() );
+    wxCHECK_RET( m_widget != NULL, wxT("invalid radiobutton") );
+
+    // save the original label
+    wxControlBase::SetLabel(label);
+
+    GTKSetLabelForLabel(GTK_LABEL(gtk_bin_get_child(GTK_BIN(m_widget))), label);

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

-    wxCHECK_RET( m_widget != NULL, _T("invalid radiobutton") );
-  
+    wxCHECK_RET( m_widget != NULL, wxT("invalid radiobutton") );
+

     if (val == GetValue())
         return;
 
     if (val == GetValue())
         return;
 

-    gtk_signal_disconnect_by_func( GTK_OBJECT(m_widget),
-      GTK_SIGNAL_FUNC(gtk_radiobutton_clicked_callback), (gpointer*)this );
+    g_signal_handlers_block_by_func(
+        m_widget, (void*)gtk_radiobutton_clicked_callback, this);

 
     if (val)
     {
 
     if (val)
     {

-        gtk_toggle_button_set_state( GTK_TOGGLE_BUTTON(m_widget), TRUE );
+        gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON(m_widget), TRUE );

     }
     else
     {
         // should give an assert
     }
     else
     {
         // should give an assert

+        // RL - No it shouldn't.  A wxGenericValidator might try to set it
+        //      as FALSE.  Failing silently is probably TRTTD here.

     }
     }

-       
-    gtk_signal_connect( GTK_OBJECT(m_widget), "clicked", 
-      GTK_SIGNAL_FUNC(gtk_radiobutton_clicked_callback), (gpointer*)this );
+
+    g_signal_handlers_unblock_by_func(
+        m_widget, (void*)gtk_radiobutton_clicked_callback, this);

 }
 
 bool wxRadioButton::GetValue() const
 {
 }
 
 bool wxRadioButton::GetValue() const
 {

-    wxCHECK_MSG( m_widget != NULL, FALSE, _T("invalid radiobutton") );
-  
-    return GTK_TOGGLE_BUTTON(m_widget)->active;
+    wxCHECK_MSG( m_widget != NULL, false, wxT("invalid radiobutton") );
+
+    return gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(m_widget)) != 0;

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

-    if ( !wxControl::Enable( enable ) )
-        return FALSE;
-  
-    gtk_widget_set_sensitive( GTK_BUTTON(m_widget)->child, enable );
+    if (!base_type::Enable(enable))
+        return false;
+
+    gtk_widget_set_sensitive(gtk_bin_get_child(GTK_BIN(m_widget)), enable);
+
+    if (enable)
+        GTKFixSensitivity();
+
+    return true;
+}
+
+void wxRadioButton::DoApplyWidgetStyle(GtkRcStyle *style)
+{
+    GTKApplyStyle(m_widget, style);
+    GTKApplyStyle(gtk_bin_get_child(GTK_BIN(m_widget)), style);
+}

 
 

-    return TRUE;
+GdkWindow *
+wxRadioButton::GTKGetWindow(wxArrayGdkWindows& WXUNUSED(windows)) const
+{
+    return gtk_button_get_event_window(GTK_BUTTON(m_widget));

 }
 
 }
 

-void wxRadioButton::ApplyWidgetStyle()
+// static
+wxVisualAttributes
+wxRadioButton::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))

 {
 {

-    SetWidgetStyle();
-    gtk_widget_set_style( m_widget, m_widgetStyle );
-    gtk_widget_set_style( GTK_BUTTON(m_widget)->child, m_widgetStyle );
+    return GetDefaultAttributesFromGTKWidget(gtk_radio_button_new_with_label(NULL, ""));

 }
 
 }
 

+

 #endif
 #endif