X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/83624f79609f0d5e240c1f7d77d044bfff9702fc..1d0edc0f7306aac10a75c545f9cace25d3cee83d:/src/gtk1/radiobut.cpp?ds=sidebyside diff --git a/src/gtk1/radiobut.cpp b/src/gtk1/radiobut.cpp index abf7ac99f2..92b78d4223 100644 --- a/src/gtk1/radiobut.cpp +++ b/src/gtk1/radiobut.cpp @@ -4,7 +4,7 @@ // Author: Robert Roebling // Id: $Id$ // Copyright: (c) 1998 Robert Roebling -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -12,33 +12,46 @@ #pragma implementation "radiobut.h" #endif +#include "wx/defs.h" + +#if wxUSE_RADIOBOX + #include "wx/radiobut.h" -#include "gdk/gdk.h" -#include "gtk/gtk.h" + +#include "wx/gtk/private.h" + +//----------------------------------------------------------------------------- +// idle system +//----------------------------------------------------------------------------- + +extern void wxapp_install_idle_handler(); +extern bool g_isIdle; //----------------------------------------------------------------------------- // data //----------------------------------------------------------------------------- -extern bool g_blockEventsOnDrag; +extern bool g_blockEventsOnDrag; +extern wxCursor g_globalCursor; +extern wxWindowGTK *g_delayedFocus; //----------------------------------------------------------------------------- // "clicked" //----------------------------------------------------------------------------- static -void gtk_radiobutton_clicked_callback( GtkWidget *WXUNUSED(widget), wxRadioButton *rb ) +void gtk_radiobutton_clicked_callback( GtkToggleButton *button, wxRadioButton *rb ) { - if (!rb->HasVMT()) return; - - if (rb->m_blockFirstEvent) - { - rb->m_blockFirstEvent = FALSE; - return; - } + 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 ); @@ -57,37 +70,71 @@ bool wxRadioButton::Create( wxWindow *parent, wxWindowID id, const wxString& lab { m_acceptsFocus = TRUE; m_needParent = TRUE; + m_isRadioButton = TRUE; + + m_blockEvent = FALSE; - wxSize newSize = size; - - PreCreation( parent, id, pos, newSize, style, name ); - - SetValidator( validator ); + if (!PreCreation( parent, pos, size ) || + !CreateBase( parent, id, pos, size, style, validator, name )) + { + wxFAIL_MSG( wxT("wxRadioButton creation failed") ); + return FALSE; + } - m_widget = gtk_radio_button_new_with_label( (GSList *) NULL, label ); + if (HasFlag(wxRB_GROUP)) + { + // start a new group + m_radioButtonGroup = (GSList*) NULL; + } + else + { + // 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; + } + 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, label.mbc_str() ); - m_theOtherRadioButtton = - gtk_radio_button_new_with_label( - gtk_radio_button_group( GTK_RADIO_BUTTON(m_widget) ), - "button2" ); - 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 ); - gtk_signal_connect( GTK_OBJECT(m_widget), "clicked", GTK_SIGNAL_FUNC(gtk_radiobutton_clicked_callback), (gpointer*)this ); - m_parent->AddChild( this ); - - (m_parent->m_insertCallback)( m_parent, this ); + m_parent->DoAddChild( this ); PostCreation(); + SetFont( parent->GetFont() ); + + wxSize size_best( DoGetBestSize() ); + wxSize new_size( size ); + if (new_size.x == -1) + new_size.x = size_best.x; + if (new_size.y == -1) + new_size.y = size_best.y; + if ((new_size.x != size.x) || (new_size.y != size.y)) + SetSize( new_size.x, new_size.y ); + SetBackgroundColour( parent->GetBackgroundColour() ); SetForegroundColour( parent->GetForegroundColour() ); @@ -98,50 +145,96 @@ bool wxRadioButton::Create( wxWindow *parent, wxWindowID id, const wxString& lab void wxRadioButton::SetLabel( const wxString& label ) { - wxCHECK_RET( m_widget != NULL, "invalid radiobutton" ); + wxCHECK_RET( m_widget != NULL, wxT("invalid radiobutton") ); wxControl::SetLabel( label ); - GtkButton *bin = GTK_BUTTON( m_widget ); - GtkLabel *g_label = GTK_LABEL( bin->child ); - gtk_label_set( g_label, GetLabel() ); + GtkLabel *g_label = GTK_LABEL( BUTTON_CHILD(m_widget) ); + gtk_label_set( g_label, GetLabel().mbc_str() ); } void wxRadioButton::SetValue( bool val ) { - wxCHECK_RET( m_widget != NULL, "invalid radiobutton" ); - - if ( val == GetValue() ) + wxCHECK_RET( m_widget != NULL, wxT("invalid radiobutton") ); + + if (val == GetValue()) return; - m_blockFirstEvent = TRUE; - + m_blockEvent = TRUE; + 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 - gtk_toggle_button_set_state( GTK_TOGGLE_BUTTON(m_theOtherRadioButtton), TRUE ); + { + // should give an assert + // RL - No it shouldn't. A wxGenericValidator might try to set it + // as FALSE. Failing silently is probably TRTTD here. + } + + m_blockEvent = FALSE; } -bool wxRadioButton::GetValue(void) const +bool wxRadioButton::GetValue() const { - wxCHECK_MSG( m_widget != NULL, FALSE, "invalid radiobutton" ); + wxCHECK_MSG( m_widget != NULL, FALSE, wxT("invalid radiobutton") ); return GTK_TOGGLE_BUTTON(m_widget)->active; } -void wxRadioButton::Enable( bool enable ) +bool wxRadioButton::Enable( bool enable ) { - wxCHECK_RET( m_widget != NULL, "invalid radiobutton" ); - - wxControl::Enable( enable ); + if ( !wxControl::Enable( enable ) ) + return FALSE; - gtk_widget_set_sensitive( GTK_BUTTON(m_widget)->child, enable ); + gtk_widget_set_sensitive( BUTTON_CHILD(m_widget), enable ); + + return TRUE; } void wxRadioButton::ApplyWidgetStyle() { SetWidgetStyle(); gtk_widget_set_style( m_widget, m_widgetStyle ); - gtk_widget_set_style( GTK_BUTTON(m_widget)->child, m_widgetStyle ); + gtk_widget_set_style( BUTTON_CHILD(m_widget), m_widgetStyle ); +} + +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; + } + } + + UpdateWindowUI(); } +wxSize wxRadioButton::DoGetBestSize() const +{ + return wxControl::DoGetBestSize(); +} +#endif