X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4dcaf11a7b5189be78e52e1412febd7689a959f8..e3fed5c49ab00309ec63dbf05fd498e658ad81e2:/src/gtk1/radiobut.cpp diff --git a/src/gtk1/radiobut.cpp b/src/gtk1/radiobut.cpp index f7771f4ea6..7d2557692f 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,12 +12,13 @@ #pragma implementation "radiobut.h" #endif -#include "wx/radiobut.h" +#include "wx/defs.h" #if wxUSE_RADIOBOX -#include "gdk/gdk.h" -#include "gtk/gtk.h" +#include "wx/radiobut.h" + +#include "wx/gtk/private.h" //----------------------------------------------------------------------------- // idle system @@ -30,14 +31,15 @@ extern bool g_isIdle; // data //----------------------------------------------------------------------------- -extern bool g_blockEventsOnDrag; +extern bool g_blockEventsOnDrag; +extern wxCursor g_globalCursor; //----------------------------------------------------------------------------- // "clicked" //----------------------------------------------------------------------------- static -void gtk_radiobutton_clicked_callback( GtkWidget *WXUNUSED(widget), wxRadioButton *rb ) +void gtk_radiobutton_clicked_callback( GtkToggleButton *button, wxRadioButton *rb ) { if (g_isIdle) wxapp_install_idle_handler(); @@ -45,6 +47,10 @@ void gtk_radiobutton_clicked_callback( GtkWidget *WXUNUSED(widget), wxRadioButto 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 ); @@ -64,55 +70,52 @@ bool wxRadioButton::Create( wxWindow *parent, wxWindowID id, const wxString& lab m_acceptsFocus = TRUE; m_needParent = TRUE; m_isRadioButton = TRUE; + + m_blockEvent = FALSE; if (!PreCreation( parent, pos, size ) || !CreateBase( parent, id, pos, size, style, validator, name )) { - wxFAIL_MSG( _T("wxRadioButton creation failed") ); - return FALSE; + wxFAIL_MSG( wxT("wxRadioButton creation failed") ); + return FALSE; } if (HasFlag(wxRB_GROUP)) { - /* start a new group */ + // start a new group m_radioButtonGroup = (GSList*) NULL; } else { - /* search backward for last group start */ + // 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(); + { + 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) ); } - 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 */ + else + { + // start a new group m_radioButtonGroup = (GSList*) NULL; - } + } } m_widget = gtk_radio_button_new_with_label( m_radioButtonGroup, label.mbc_str() ); SetLabel(label); - wxSize newSize = size; - if (newSize.x == -1) newSize.x = 22+gdk_string_measure( m_widget->style->font, label.mbc_str() ); - 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 ); @@ -120,9 +123,19 @@ bool wxRadioButton::Create( wxWindow *parent, wxWindowID id, const wxString& lab 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() ); - SetFont( parent->GetFont() ); Show( TRUE ); @@ -131,40 +144,39 @@ bool wxRadioButton::Create( wxWindow *parent, wxWindowID id, const wxString& lab void wxRadioButton::SetLabel( const wxString& label ) { - wxCHECK_RET( m_widget != NULL, _T("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 ); + 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, _T("invalid radiobutton") ); - + wxCHECK_RET( m_widget != NULL, wxT("invalid radiobutton") ); + if (val == GetValue()) return; - gtk_signal_disconnect_by_func( GTK_OBJECT(m_widget), - GTK_SIGNAL_FUNC(gtk_radiobutton_clicked_callback), (gpointer*)this ); + 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 { // should give an assert + // RL - No it shouldn't. A wxGenericValidator might try to set it + // as FALSE. Failing silently is probably TRTTD here. } - - gtk_signal_connect( GTK_OBJECT(m_widget), "clicked", - GTK_SIGNAL_FUNC(gtk_radiobutton_clicked_callback), (gpointer*)this ); + + m_blockEvent = FALSE; } bool wxRadioButton::GetValue() const { - wxCHECK_MSG( m_widget != NULL, FALSE, _T("invalid radiobutton") ); + wxCHECK_MSG( m_widget != NULL, FALSE, wxT("invalid radiobutton") ); return GTK_TOGGLE_BUTTON(m_widget)->active; } @@ -174,7 +186,7 @@ bool wxRadioButton::Enable( bool 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; } @@ -183,7 +195,36 @@ 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() ); + } + + UpdateWindowUI(); +} + +wxSize wxRadioButton::DoGetBestSize() const +{ + return wxControl::DoGetBestSize(); } #endif