X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9864c56dedec23b11ae6f9f792d6787ecad2355a..64ea838d8f4d1853b7d850db93ee565e901d099a:/src/gtk1/radiobut.cpp diff --git a/src/gtk1/radiobut.cpp b/src/gtk1/radiobut.cpp index 91c5da2c3e..d07bbcdeea 100644 --- a/src/gtk1/radiobut.cpp +++ b/src/gtk1/radiobut.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: radiobut.cpp +// Name: src/gtk1/radiobut.cpp // Purpose: // Author: Robert Roebling // Id: $Id$ @@ -7,19 +7,14 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// - -#ifdef __GNUG__ -#pragma implementation "radiobut.h" -#endif - -#include "wx/defs.h" +// For compilers that support precompilation, includes "wx.h". +#include "wx/wxprec.h" #if wxUSE_RADIOBOX #include "wx/radiobut.h" -#include -#include +#include "wx/gtk1/private.h" //----------------------------------------------------------------------------- // idle system @@ -32,46 +27,51 @@ extern bool g_isIdle; // data //----------------------------------------------------------------------------- -extern bool g_blockEventsOnDrag; -extern wxCursor g_globalCursor; +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 ); +} } //----------------------------------------------------------------------------- // wxRadioButton //----------------------------------------------------------------------------- -IMPLEMENT_DYNAMIC_CLASS(wxRadioButton,wxControl) - -bool wxRadioButton::Create( wxWindow *parent, wxWindowID id, const wxString& label, - const wxPoint& pos, const wxSize& size, long style, - const wxValidator& validator, const wxString& name ) +bool wxRadioButton::Create( wxWindow *parent, + wxWindowID id, + const wxString& label, + const wxPoint& pos, + const wxSize& size, + long style, + const wxValidator& validator, + const wxString& name ) { m_acceptsFocus = TRUE; m_needParent = TRUE; - m_isRadioButton = TRUE; - + m_blockEvent = FALSE; if (!PreCreation( parent, pos, size ) || @@ -81,64 +81,40 @@ bool wxRadioButton::Create( wxWindow *parent, wxWindowID id, const wxString& lab 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::Node *node = parent->GetChildren().GetLast(); + wxRadioButton *chief = NULL; + wxWindowList::compatibility_iterator node = parent->GetChildren().GetLast(); while (node) { wxWindow *child = node->GetData(); - if (child->m_isRadioButton) + if (child->IsRadioButton()) { chief = (wxRadioButton*) child; - if (child->HasFlag(wxRB_GROUP)) break; + 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; + radioButtonGroup = gtk_radio_button_group( GTK_RADIO_BUTTON(chief->m_widget) ); } } - m_widget = gtk_radio_button_new_with_label( m_radioButtonGroup, label.mbc_str() ); - + 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(); - - 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() ); - - Show( TRUE ); + + PostCreation(size); return TRUE; } @@ -146,11 +122,8 @@ bool wxRadioButton::Create( wxWindow *parent, wxWindowID id, const wxString& lab void wxRadioButton::SetLabel( const wxString& label ) { 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().mbc_str() ); + + GTKSetLabelForLabel(GTK_LABEL(BUTTON_CHILD(m_widget)), label); } void wxRadioButton::SetValue( bool val ) @@ -179,7 +152,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; } @@ -187,40 +160,50 @@ 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; } -void wxRadioButton::ApplyWidgetStyle() +void wxRadioButton::DoApplyWidgetStyle(GtkRcStyle *style) { - SetWidgetStyle(); - gtk_widget_set_style( m_widget, m_widgetStyle ); - gtk_widget_set_style( GTK_BUTTON(m_widget)->child, m_widgetStyle ); + gtk_widget_modify_style(m_widget, style); + gtk_widget_modify_style(BUTTON_CHILD(m_widget), style); } bool wxRadioButton::IsOwnGtkWindow( GdkWindow *window ) { - return (window == GTK_TOGGLE_BUTTON(m_widget)->event_window); + return window == TOGGLE_BUTTON_EVENT_WIN(m_widget); } void wxRadioButton::OnInternalIdle() { wxCursor cursor = m_cursor; - if (g_globalCursor.Ok()) cursor = g_globalCursor; + if (g_globalCursor.IsOk()) cursor = g_globalCursor; - if (GTK_TOGGLE_BUTTON(m_widget)->event_window && cursor.Ok()) + GdkWindow *win = TOGGLE_BUTTON_EVENT_WIN(m_widget); + if ( win && cursor.IsOk()) { /* 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( GTK_TOGGLE_BUTTON(m_widget)->event_window, cursor.GetCursor() ); + + gdk_window_set_cursor( win, cursor.GetCursor() ); } - UpdateWindowUI(); + 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); } wxSize wxRadioButton::DoGetBestSize() const @@ -228,4 +211,19 @@ wxSize wxRadioButton::DoGetBestSize() const return wxControl::DoGetBestSize(); } +// static +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(wnd); + return attr; +} + + #endif