]> git.saurik.com Git - wxWidgets.git/blobdiff - src/gtk/radiobut.cpp
projects / wxWidgets.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Fix deprecating warning introduced in r72446.
[wxWidgets.git] / src / gtk / radiobut.cpp
diff --git a/src/gtk/radiobut.cpp b/src/gtk/radiobut.cpp
index a0a40eb861d2057e50235ba2d2b27c444e9a9942..a0d1b92d2c3900e446b0bb3d6d0ae090a7090609 100644 (file)
--- a/src/gtk/radiobut.cpp
+++ b/src/gtk/radiobut.cpp
@@ -1,133 +1,197 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////
-// 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"
 
+#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 (!rb->HasVMT()) return;
-  
-  if (rb->m_blockFirstEvent)
-  {
-    rb->m_blockFirstEvent = FALSE;
-    return;
-  } 
-  
-  if (g_blockEventsOnDrag) return;
-  
-  wxCommandEvent event( wxEVT_COMMAND_RADIOBUTTON_SELECTED, rb->GetId());
-  event.SetInt( rb->GetValue() );
-  event.SetEventObject( rb );
-  rb->GetEventHandler()->ProcessEvent( event );
+    if (!rb->m_hasVMT) return;
+
+    if (g_blockEventsOnDrag) return;
+
+    if (!gtk_toggle_button_get_active(button)) return;
+
+    wxCommandEvent event( wxEVT_COMMAND_RADIOBUTTON_SELECTED, rb->GetId());
+    event.SetInt( rb->GetValue() );
+    event.SetEventObject( rb );
+    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_needParent = TRUE;
-
-  wxSize newSize = size;
-
-  PreCreation( parent, id, pos, newSize, style, name );
-  
-  SetValidator( validator );
-
-  m_widget = gtk_radio_button_new_with_label( (GSList *) NULL, label );
-      
-  SetLabel(label);
-
-  m_blockFirstEvent = FALSE;
-    
-  if (newSize.x == -1) newSize.x = 22+gdk_string_measure( m_widget->style->font, label );
-  if (newSize.y == -1) newSize.y = 26;
-  SetSize( newSize.x, newSize.y );
+    if (!PreCreation( parent, pos, size ) ||
+        !CreateBase( parent, id, pos, size, style, validator, name ))
+    {
+        wxFAIL_MSG( wxT("wxRadioButton creation failed") );
+        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))
+    {
+        // 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( radioButtonGroup, wxGTK_CONV( label ) );
+    g_object_ref(m_widget);
+
+    SetLabel(label);
+
+    g_signal_connect_after (m_widget, "clicked",
+                            G_CALLBACK (gtk_radiobutton_clicked_callback), this);
+
+    m_parent->DoAddChild( this );
+
+    PostCreation(size);
+
+    return true;
+}
 
 
-  gtk_signal_connect( GTK_OBJECT(m_widget), "clicked", 
-    GTK_SIGNAL_FUNC(gtk_radiobutton_clicked_callback), (gpointer*)this );
-       
-  m_parent->AddChild( this );
+void wxRadioButton::SetLabel( const wxString& label )
+{
+    wxCHECK_RET( m_widget != NULL, wxT("invalid radiobutton") );
 
 
-  (m_parent->m_insertCallback)( m_parent, this );
-  
-  PostCreation();
+    // save the original label
+    wxControlBase::SetLabel(label);
 
 
-  SetBackgroundColour( parent->GetBackgroundColour() );
-  SetForegroundColour( parent->GetForegroundColour() );
-  
-  Show( TRUE );
+    GTKSetLabelForLabel(GTK_LABEL(gtk_bin_get_child(GTK_BIN(m_widget))), label);
+}
 
 
-  return TRUE;
+void wxRadioButton::SetValue( bool val )
+{
+    wxCHECK_RET( m_widget != NULL, wxT("invalid radiobutton") );
+
+    if (val == GetValue())
+        return;
+
+    g_signal_handlers_block_by_func(
+        m_widget, (void*)gtk_radiobutton_clicked_callback, this);
+
+    if (val)
+    {
+        gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON(m_widget), TRUE );
+    }
+    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.
+    }
+
+    g_signal_handlers_unblock_by_func(
+        m_widget, (void*)gtk_radiobutton_clicked_callback, this);
 }
 
 }
 
-void wxRadioButton::SetLabel( const wxString& label )
+bool wxRadioButton::GetValue() const
 {
 {
-  wxCHECK_RET( m_widget != NULL, "invalid radiobutton" );
-  
-  wxControl::SetLabel( label );
-  GtkButton *bin = GTK_BUTTON( m_widget );
-  GtkLabel *g_label = GTK_LABEL( bin->child );
-  gtk_label_set( g_label, GetLabel() );
+    wxCHECK_MSG( m_widget != NULL, false, wxT("invalid radiobutton") );
+
+    return gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(m_widget)) != 0;
 }
 
 }
 
-void wxRadioButton::SetValue( bool val )
+bool wxRadioButton::Enable( bool enable )
 {
 {
-  wxCHECK_RET( m_widget != NULL, "invalid radiobutton" );
-  
-  gtk_toggle_button_set_state( GTK_TOGGLE_BUTTON(m_widget), val );
-  
-  m_blockFirstEvent = TRUE;
+    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;
 }
 
 }
 
-bool wxRadioButton::GetValue(void) const
+void wxRadioButton::DoApplyWidgetStyle(GtkRcStyle *style)
 {
 {
-  wxCHECK_MSG( m_widget != NULL, FALSE, "invalid radiobutton" );
-  
-  return GTK_TOGGLE_BUTTON(m_widget)->active;
+    GTKApplyStyle(m_widget, style);
+    GTKApplyStyle(gtk_bin_get_child(GTK_BIN(m_widget)), style);
 }
 
 }
 
-void wxRadioButton::Enable( bool enable )
+GdkWindow *
+wxRadioButton::GTKGetWindow(wxArrayGdkWindows& WXUNUSED(windows)) const
 {
 {
-  wxCHECK_RET( m_widget != NULL, "invalid radiobutton" );
-  
-  wxControl::Enable( enable );
-  
-  gtk_widget_set_sensitive( GTK_BUTTON(m_widget)->child, enable );
+    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 );
+    wxVisualAttributes attr;
+    // NB: we need toplevel window so that GTK+ can find the right style
+    GtkWidget *wnd = gtk_window_new(GTK_WINDOW_TOPLEVEL);
+    GtkWidget* widget = gtk_radio_button_new_with_label(NULL, "");
+    gtk_container_add(GTK_CONTAINER(wnd), widget);
+    attr = GetDefaultAttributesFromGTKWidget(widget);
+    gtk_widget_destroy(wnd);
+    return attr;
 }
 
 
 }
 
 
+#endif
wxWidgets (Impactor)