X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8907154c1a8a6882c6797d1f16393ddfb23e7f3a..7d6a4d96961eac84d05db8bb24c64d39003f6e54:/src/gtk/radiobut.cpp diff --git a/src/gtk/radiobut.cpp b/src/gtk/radiobut.cpp index d6440f577a..a0d1b92d2c 100644 --- 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$ @@ -10,49 +10,38 @@ // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" -#if wxUSE_RADIOBOX +#if wxUSE_RADIOBTN #include "wx/radiobut.h" +#include #include "wx/gtk/private.h" - -//----------------------------------------------------------------------------- -// idle system -//----------------------------------------------------------------------------- - -extern void wxapp_install_idle_handler(); -extern bool g_isIdle; +#include "wx/gtk/private/gtk2-compat.h" //----------------------------------------------------------------------------- // data //----------------------------------------------------------------------------- extern bool g_blockEventsOnDrag; -extern wxCursor g_globalCursor; -extern wxWindowGTK *g_delayedFocus; //----------------------------------------------------------------------------- // "clicked" //----------------------------------------------------------------------------- extern "C" { -static +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; - + + if (!gtk_toggle_button_get_active(button)) return; + wxCommandEvent event( wxEVT_COMMAND_RADIOBUTTON_SELECTED, rb->GetId()); event.SetInt( rb->GetValue() ); event.SetEventObject( rb ); - rb->GetEventHandler()->ProcessEvent( event ); + rb->HandleWindowEvent( event ); } } @@ -60,8 +49,6 @@ void gtk_radiobutton_clicked_callback( GtkToggleButton *button, wxRadioButton *r // wxRadioButton //----------------------------------------------------------------------------- -IMPLEMENT_DYNAMIC_CLASS(wxRadioButton,wxControl) - bool wxRadioButton::Create( wxWindow *parent, wxWindowID id, const wxString& label, @@ -71,77 +58,68 @@ bool wxRadioButton::Create( wxWindow *parent, const wxValidator& validator, const wxString& name ) { - m_acceptsFocus = TRUE; - m_needParent = TRUE; - - m_blockEvent = FALSE; - if (!PreCreation( parent, pos, size ) || !CreateBase( parent, id, pos, size, style, validator, name )) { wxFAIL_MSG( wxT("wxRadioButton creation failed") ); - return FALSE; + return false; } - if (HasFlag(wxRB_GROUP)) - { - // start a new group - m_radioButtonGroup = (GSList*) NULL; - } - 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::compatibility_iterator node = parent->GetChildren().GetLast(); - while (node) + for (; node; node = node->GetPrevious()) { wxWindow *child = node->GetData(); - if (child->IsRadioButton()) + + // 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)) { - chief = (wxRadioButton*) child; - if (child->HasFlag(wxRB_GROUP)) - break; + // 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; } - node = node->GetPrevious(); - } - 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; } } - 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 ) ); + g_object_ref(m_widget); + SetLabel(label); - gtk_signal_connect( GTK_OBJECT(m_widget), "clicked", - GTK_SIGNAL_FUNC(gtk_radiobutton_clicked_callback), (gpointer*)this ); - + g_signal_connect_after (m_widget, "clicked", + G_CALLBACK (gtk_radiobutton_clicked_callback), this); + m_parent->DoAddChild( this ); - + PostCreation(size); - return TRUE; + return true; } 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 + + // save the original label + wxControlBase::SetLabel(label); + + GTKSetLabelForLabel(GTK_LABEL(gtk_bin_get_child(GTK_BIN(m_widget))), label); } void wxRadioButton::SetValue( bool val ) @@ -151,7 +129,8 @@ void wxRadioButton::SetValue( bool val ) if (val == GetValue()) return; - m_blockEvent = TRUE; + g_signal_handlers_block_by_func( + m_widget, (void*)gtk_radiobutton_clicked_callback, this); if (val) { @@ -164,69 +143,40 @@ void wxRadioButton::SetValue( bool val ) // as FALSE. Failing silently is probably TRTTD here. } - m_blockEvent = FALSE; + g_signal_handlers_unblock_by_func( + m_widget, (void*)gtk_radiobutton_clicked_callback, this); } bool wxRadioButton::GetValue() const { - wxCHECK_MSG( m_widget != NULL, FALSE, wxT("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 ) { - if ( !wxControl::Enable( enable ) ) - return FALSE; - - gtk_widget_set_sensitive( BUTTON_CHILD(m_widget), enable ); + if (!base_type::Enable(enable)) + return false; - return TRUE; -} + gtk_widget_set_sensitive(gtk_bin_get_child(GTK_BIN(m_widget)), enable); -void wxRadioButton::DoApplyWidgetStyle(GtkRcStyle *style) -{ - gtk_widget_modify_style(m_widget, style); - gtk_widget_modify_style(BUTTON_CHILD(m_widget), style); -} + if (enable) + GTKFixSensitivity(); -bool wxRadioButton::IsOwnGtkWindow( GdkWindow *window ) -{ - return window == TOGGLE_BUTTON_EVENT_WIN(m_widget); + return true; } -void wxRadioButton::OnInternalIdle() +void wxRadioButton::DoApplyWidgetStyle(GtkRcStyle *style) { - wxCursor cursor = m_cursor; - if (g_globalCursor.Ok()) cursor = g_globalCursor; - - GdkWindow *win = TOGGLE_BUTTON_EVENT_WIN(m_widget); - if ( win && cursor.Ok()) - { - /* I now set the cursor the anew in every OnInternalIdle call - 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() ); - } - - if (g_delayedFocus == this) - { - if (GTK_WIDGET_REALIZED(m_widget)) - { - gtk_widget_grab_focus( m_widget ); - g_delayedFocus = NULL; - } - } - - if (wxUpdateUIEvent::CanUpdate(this)) - UpdateWindowUI(wxUPDATE_UI_FROMIDLE); + GTKApplyStyle(m_widget, style); + GTKApplyStyle(gtk_bin_get_child(GTK_BIN(m_widget)), style); } -wxSize wxRadioButton::DoGetBestSize() const +GdkWindow * +wxRadioButton::GTKGetWindow(wxArrayGdkWindows& WXUNUSED(windows)) const { - return wxControl::DoGetBestSize(); + return gtk_button_get_event_window(GTK_BUTTON(m_widget)); } // static