X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fe161a2685012cf90bb5bfe95f2260aee71d8ad7..2e334012b4babcf063fbe79540c4c154cd54ab2b:/src/gtk/radiobut.cpp?ds=inline diff --git a/src/gtk/radiobut.cpp b/src/gtk/radiobut.cpp index 837cd33058..649a520830 100644 --- a/src/gtk/radiobut.cpp +++ b/src/gtk/radiobut.cpp @@ -7,56 +7,40 @@ // 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" -#if wxUSE_RADIOBOX +#if wxUSE_RADIOBTN #include "wx/radiobut.h" #include "wx/gtk/private.h" -//----------------------------------------------------------------------------- -// idle system -//----------------------------------------------------------------------------- - -extern void wxapp_install_idle_handler(); -extern bool g_isIdle; - //----------------------------------------------------------------------------- // data //----------------------------------------------------------------------------- extern bool g_blockEventsOnDrag; -extern wxCursor g_globalCursor; -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 +48,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, @@ -74,79 +58,49 @@ 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 + GSList* radioButtonGroup = NULL; + if (!HasFlag(wxRB_GROUP)) { // 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()) + if (child->HasFlag(wxRB_GROUP) && wxIsKindOf(child, wxRadioButton)) { - chief = (wxRadioButton*) child; - if (child->HasFlag(wxRB_GROUP)) - break; + 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 ) ); + SetLabel(label); - gtk_signal_connect( GTK_OBJECT(m_widget), "clicked", - GTK_SIGNAL_FUNC(gtk_radiobutton_clicked_callback), (gpointer*)this ); - + g_signal_connect (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 - PostSetLabel(); + GTKSetLabelForLabel(GTK_LABEL(GTK_BIN(m_widget)->child), label); } void wxRadioButton::SetValue( bool val ) @@ -156,7 +110,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) { @@ -169,69 +124,37 @@ 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") ); - + wxCHECK_MSG( m_widget != NULL, false, wxT("invalid radiobutton") ); + return GTK_TOGGLE_BUTTON(m_widget)->active; } bool wxRadioButton::Enable( bool enable ) { if ( !wxControl::Enable( enable ) ) - return FALSE; - - gtk_widget_set_sensitive( BUTTON_CHILD(m_widget), enable ); + return false; + + gtk_widget_set_sensitive(GTK_BIN(m_widget)->child, enable); - return TRUE; + return true; } void wxRadioButton::DoApplyWidgetStyle(GtkRcStyle *style) { gtk_widget_modify_style(m_widget, style); - gtk_widget_modify_style(BUTTON_CHILD(m_widget), style); -} - -bool wxRadioButton::IsOwnGtkWindow( GdkWindow *window ) -{ - return window == TOGGLE_BUTTON_EVENT_WIN(m_widget); -} - -void wxRadioButton::OnInternalIdle() -{ - 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); + gtk_widget_modify_style(GTK_BIN(m_widget)->child, style); } -wxSize wxRadioButton::DoGetBestSize() const +GdkWindow * +wxRadioButton::GTKGetWindow(wxArrayGdkWindows& WXUNUSED(windows)) const { - return wxControl::DoGetBestSize(); + return GTK_BUTTON(m_widget)->event_window; } // static @@ -239,9 +162,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; }