X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/77ffb5937e89927b621128789401db8921fe580f..8c3b65d941ffaf5c207881ca56bfe9c37b3604c5:/src/gtk1/radiobut.cpp?ds=sidebyside

diff --git a/src/gtk1/radiobut.cpp b/src/gtk1/radiobut.cpp
index 04a6d4266f..9367e3fde1 100644
--- a/src/gtk1/radiobut.cpp
+++ b/src/gtk1/radiobut.cpp
@@ -4,14 +4,9 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "radiobut.h"
-#endif
-
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
@@ -19,7 +14,7 @@
 
 #include "wx/radiobut.h"
 
-#include "wx/gtk/private.h"
+#include "wx/gtk1/private.h"
 
 //-----------------------------------------------------------------------------
 // idle system
@@ -40,23 +35,25 @@ extern wxWindowGTK   *g_delayedFocus;
 // "clicked"
 //-----------------------------------------------------------------------------
 
-static 
+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 (!button->active) return;
-    
+
     if (rb->m_blockEvent) return;
-  
+
     wxCommandEvent event( wxEVT_COMMAND_RADIOBUTTON_SELECTED, rb->GetId());
     event.SetInt( rb->GetValue() );
     event.SetEventObject( rb );
-    rb->GetEventHandler()->ProcessEvent( event );
+    rb->HandleWindowEvent( event );
+}
 }
 
 //-----------------------------------------------------------------------------
@@ -64,7 +61,7 @@ void gtk_radiobutton_clicked_callback( GtkToggleButton *button, wxRadioButton *r
 //-----------------------------------------------------------------------------
 
 IMPLEMENT_DYNAMIC_CLASS(wxRadioButton,wxControl)
-  
+
 bool wxRadioButton::Create( wxWindow *parent,
                             wxWindowID id,
                             const wxString& label,
@@ -76,7 +73,7 @@ bool wxRadioButton::Create( wxWindow *parent,
 {
     m_acceptsFocus = TRUE;
     m_needParent = TRUE;
-    
+
     m_blockEvent = FALSE;
 
     if (!PreCreation( parent, pos, size ) ||
@@ -86,12 +83,8 @@ bool wxRadioButton::Create( wxWindow *parent,
         return FALSE;
     }
 
-    if (HasFlag(wxRB_GROUP))
-    {
-        // start a new group
-        m_radioButtonGroup = (GSList*) NULL;
-    }
-    else
+    GSList* radioButtonGroup = NULL;
+    if (!HasFlag(wxRB_GROUP))
     {
         // search backward for last group start
         wxRadioButton *chief = (wxRadioButton*) NULL;
@@ -110,24 +103,19 @@ bool wxRadioButton::Create( wxWindow *parent,
         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;
+            radioButtonGroup = gtk_radio_button_group( GTK_RADIO_BUTTON(chief->m_widget) );
         }
     }
 
-    m_widget = gtk_radio_button_new_with_label( m_radioButtonGroup, wxGTK_CONV( label ) );
-      
+    m_widget = gtk_radio_button_new_with_label( radioButtonGroup, wxGTK_CONV( label ) );
+
     SetLabel(label);
 
-    gtk_signal_connect( GTK_OBJECT(m_widget), "clicked", 
+    gtk_signal_connect( GTK_OBJECT(m_widget), "clicked",
       GTK_SIGNAL_FUNC(gtk_radiobutton_clicked_callback), (gpointer*)this );
-       
+
     m_parent->DoAddChild( this );
-  
+
     PostCreation(size);
 
     return TRUE;
@@ -136,15 +124,8 @@ bool wxRadioButton::Create( wxWindow *parent,
 void wxRadioButton::SetLabel( const wxString& label )
 {
     wxCHECK_RET( m_widget != NULL, wxT("invalid radiobutton") );
-  
-    wxControl::SetLabel( label );
-    GtkLabel *g_label = GTK_LABEL( BUTTON_CHILD(m_widget) );
-#ifdef __WXGTK20__
-    wxString label2 = PrepareLabelMnemonics( label );
-    gtk_label_set_text_with_mnemonic( g_label, wxGTK_CONV( label2 ) );
-#else
-    gtk_label_set( g_label, wxGTK_CONV( GetLabel() ) );
-#endif
+
+    GTKSetLabelForLabel(GTK_LABEL(BUTTON_CHILD(m_widget)), label);
 }
 
 void wxRadioButton::SetValue( bool val )
@@ -173,7 +154,7 @@ void wxRadioButton::SetValue( bool val )
 bool wxRadioButton::GetValue() const
 {
     wxCHECK_MSG( m_widget != NULL, FALSE, wxT("invalid radiobutton") );
-  
+
     return GTK_TOGGLE_BUTTON(m_widget)->active;
 }
 
@@ -181,17 +162,16 @@ bool wxRadioButton::Enable( bool enable )
 {
     if ( !wxControl::Enable( enable ) )
         return FALSE;
-  
+
     gtk_widget_set_sensitive( BUTTON_CHILD(m_widget), enable );
 
     return TRUE;
 }
 
-void wxRadioButton::ApplyWidgetStyle()
+void wxRadioButton::DoApplyWidgetStyle(GtkRcStyle *style)
 {
-    SetWidgetStyle();
-    gtk_widget_set_style( m_widget, m_widgetStyle );
-    gtk_widget_set_style( BUTTON_CHILD(m_widget), m_widgetStyle );
+    gtk_widget_modify_style(m_widget, style);
+    gtk_widget_modify_style(BUTTON_CHILD(m_widget), style);
 }
 
 bool wxRadioButton::IsOwnGtkWindow( GdkWindow *window )
@@ -211,7 +191,7 @@ void wxRadioButton::OnInternalIdle()
        as setting the cursor in a parent window also effects the
        windows above so that checking for the current cursor is
        not possible. */
-       
+
        gdk_window_set_cursor( win, cursor.GetCursor() );
     }
 
@@ -238,9 +218,12 @@ wxVisualAttributes
 wxRadioButton::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
 {
     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(widget);
+    gtk_widget_destroy(wnd);
     return attr;
 }