X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1db8dc4a2b5b664e922b9d049320ec0354e0eccf..abd474ea63667f727940a009cc3e0b23ba9f418f:/src/gtk/checkbox.cpp?ds=sidebyside diff --git a/src/gtk/checkbox.cpp b/src/gtk/checkbox.cpp index e63a67f08a..f7dc166843 100644 --- a/src/gtk/checkbox.cpp +++ b/src/gtk/checkbox.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: checkbox.cpp +// Name: src/gtk/checkbox.cpp // Purpose: // Author: Robert Roebling // Id: $Id$ @@ -7,56 +7,89 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// +// For compilers that support precompilation, includes "wx.h". +#include "wx/wxprec.h" -#ifdef __GNUG__ -#pragma implementation "checkbox.h" -#endif +#if wxUSE_CHECKBOX #include "wx/checkbox.h" -#if wxUSE_CHECKBOX - -#include #include -//----------------------------------------------------------------------------- -// idle system -//----------------------------------------------------------------------------- - -extern void wxapp_install_idle_handler(); -extern bool g_isIdle; - //----------------------------------------------------------------------------- // data //----------------------------------------------------------------------------- -extern bool g_blockEventsOnDrag; -extern wxCursor g_globalCursor; +extern bool g_blockEventsOnDrag; //----------------------------------------------------------------------------- // "clicked" //----------------------------------------------------------------------------- -static void gtk_checkbox_clicked_callback( GtkWidget *WXUNUSED(widget), wxCheckBox *cb ) +extern "C" { +static void gtk_checkbox_toggled_callback(GtkWidget *widget, wxCheckBox *cb) { - if (g_isIdle) wxapp_install_idle_handler(); - if (!cb->m_hasVMT) return; if (g_blockEventsOnDrag) return; + // Transitions for 3state checkbox must be done manually, GTK's checkbox + // is 2state with additional "undetermined state" flag which isn't + // changed automatically: + if (cb->Is3State()) + { + GtkToggleButton *toggle = GTK_TOGGLE_BUTTON(widget); + + if (cb->Is3rdStateAllowedForUser()) + { + // The 3 states cycle like this when clicked: + // checked -> undetermined -> unchecked -> checked -> ... + bool active = gtk_toggle_button_get_active(toggle); + bool inconsistent = gtk_toggle_button_get_inconsistent(toggle); + + cb->GTKDisableEvents(); + + if (!active && !inconsistent) + { + // checked -> undetermined + gtk_toggle_button_set_active(toggle, true); + gtk_toggle_button_set_inconsistent(toggle, true); + } + else if (!active && inconsistent) + { + // undetermined -> unchecked + gtk_toggle_button_set_inconsistent(toggle, false); + } + else if (active && !inconsistent) + { + // unchecked -> checked + // nothing to do + } + else + { + wxFAIL_MSG(wxT("3state wxCheckBox in unexpected state!")); + } + + cb->GTKEnableEvents(); + } + else + { + // user's action unsets undetermined state: + gtk_toggle_button_set_inconsistent(toggle, false); + } + } + wxCommandEvent event(wxEVT_COMMAND_CHECKBOX_CLICKED, cb->GetId()); - event.SetInt( cb->GetValue() ); + event.SetInt(cb->Get3StateValue()); event.SetEventObject(cb); - cb->GetEventHandler()->ProcessEvent(event); + cb->HandleWindowEvent(event); +} } //----------------------------------------------------------------------------- // wxCheckBox //----------------------------------------------------------------------------- -IMPLEMENT_DYNAMIC_CLASS(wxCheckBox,wxControl) - wxCheckBox::wxCheckBox() { } @@ -70,18 +103,14 @@ bool wxCheckBox::Create(wxWindow *parent, const wxValidator& validator, const wxString &name ) { - m_needParent = TRUE; - m_acceptsFocus = TRUE; - + WXValidateStyle( &style ); if (!PreCreation( parent, pos, size ) || !CreateBase( parent, id, pos, size, style, validator, name )) { wxFAIL_MSG( wxT("wxCheckBox creation failed") ); - return FALSE; + return false; } - wxControl::SetLabel( label ); - if ( style & wxALIGN_RIGHT ) { // VZ: as I don't know a way to create a right aligned checkbox with @@ -89,7 +118,7 @@ bool wxCheckBox::Create(wxWindow *parent, // left of it m_widgetCheckbox = gtk_check_button_new(); - m_widgetLabel = gtk_label_new(m_label.mbc_str()); + m_widgetLabel = gtk_label_new(""); gtk_misc_set_alignment(GTK_MISC(m_widgetLabel), 0.0, 0.5); m_widget = gtk_hbox_new(FALSE, 0); @@ -101,37 +130,33 @@ bool wxCheckBox::Create(wxWindow *parent, } else { - m_widgetCheckbox = gtk_check_button_new_with_label( m_label.mbc_str() ); - m_widgetLabel = GTK_BUTTON( m_widgetCheckbox )->child; + m_widgetCheckbox = gtk_check_button_new_with_label(""); + m_widgetLabel = gtk_bin_get_child(GTK_BIN(m_widgetCheckbox)); m_widget = m_widgetCheckbox; } + g_object_ref(m_widget); + SetLabel( label ); - gtk_signal_connect( GTK_OBJECT(m_widgetCheckbox), - "clicked", - GTK_SIGNAL_FUNC(gtk_checkbox_clicked_callback), - (gpointer *)this ); + g_signal_connect (m_widgetCheckbox, "toggled", + G_CALLBACK (gtk_checkbox_toggled_callback), 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 ); + PostCreation(size); - SetBackgroundColour( parent->GetBackgroundColour() ); - SetForegroundColour( parent->GetForegroundColour() ); + return true; +} - Show( TRUE ); +void wxCheckBox::GTKDisableEvents() +{ + g_signal_handlers_block_by_func(m_widgetCheckbox, + (gpointer) gtk_checkbox_toggled_callback, this); +} - return TRUE; +void wxCheckBox::GTKEnableEvents() +{ + g_signal_handlers_unblock_by_func(m_widgetCheckbox, + (gpointer) gtk_checkbox_toggled_callback, this); } void wxCheckBox::SetValue( bool state ) @@ -141,77 +166,78 @@ void wxCheckBox::SetValue( bool state ) if (state == GetValue()) return; - gtk_signal_disconnect_by_func( GTK_OBJECT(m_widgetCheckbox), - GTK_SIGNAL_FUNC(gtk_checkbox_clicked_callback), - (gpointer *)this ); + GTKDisableEvents(); - gtk_toggle_button_set_state( GTK_TOGGLE_BUTTON(m_widgetCheckbox), state ); + gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON(m_widgetCheckbox), state ); - gtk_signal_connect( GTK_OBJECT(m_widgetCheckbox), - "clicked", - GTK_SIGNAL_FUNC(gtk_checkbox_clicked_callback), - (gpointer *)this ); + GTKEnableEvents(); } bool wxCheckBox::GetValue() const { - wxCHECK_MSG( m_widgetCheckbox != NULL, FALSE, wxT("invalid checkbox") ); + wxCHECK_MSG( m_widgetCheckbox != NULL, false, wxT("invalid checkbox") ); + + return gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(m_widgetCheckbox)); +} + +void wxCheckBox::DoSet3StateValue(wxCheckBoxState state) +{ + SetValue(state != wxCHK_UNCHECKED); + gtk_toggle_button_set_inconsistent(GTK_TOGGLE_BUTTON(m_widgetCheckbox), + state == wxCHK_UNDETERMINED); +} - return GTK_TOGGLE_BUTTON(m_widgetCheckbox)->active; +wxCheckBoxState wxCheckBox::DoGet3StateValue() const +{ + if (gtk_toggle_button_get_inconsistent(GTK_TOGGLE_BUTTON(m_widgetCheckbox))) + { + return wxCHK_UNDETERMINED; + } + else + { + return GetValue() ? wxCHK_CHECKED : wxCHK_UNCHECKED; + } } void wxCheckBox::SetLabel( const wxString& label ) { wxCHECK_RET( m_widgetLabel != NULL, wxT("invalid checkbox") ); - wxControl::SetLabel( label ); + // save the label inside m_label in case user calls GetLabel() later + wxControl::SetLabel(label); - gtk_label_set( GTK_LABEL(m_widgetLabel), GetLabel().mbc_str() ); + GTKSetLabelForLabel(GTK_LABEL(m_widgetLabel), label); } bool wxCheckBox::Enable( bool enable ) { - if ( !wxControl::Enable( enable ) ) - return FALSE; + if (!base_type::Enable(enable)) + return false; gtk_widget_set_sensitive( m_widgetLabel, enable ); - return TRUE; -} + if (enable) + GTKFixSensitivity(); -void wxCheckBox::ApplyWidgetStyle() -{ - SetWidgetStyle(); - gtk_widget_set_style( m_widgetCheckbox, m_widgetStyle ); - gtk_widget_set_style( m_widgetLabel, m_widgetStyle ); + return true; } -bool wxCheckBox::IsOwnGtkWindow( GdkWindow *window ) +void wxCheckBox::DoApplyWidgetStyle(GtkRcStyle *style) { - return (window == GTK_TOGGLE_BUTTON(m_widget)->event_window); + gtk_widget_modify_style(m_widgetCheckbox, style); + gtk_widget_modify_style(m_widgetLabel, style); } -void wxCheckBox::OnInternalIdle() +GdkWindow *wxCheckBox::GTKGetWindow(wxArrayGdkWindows& WXUNUSED(windows)) const { - wxCursor cursor = m_cursor; - if (g_globalCursor.Ok()) cursor = g_globalCursor; - - if (GTK_TOGGLE_BUTTON(m_widgetCheckbox)->event_window && 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( GTK_TOGGLE_BUTTON(m_widgetCheckbox)->event_window, cursor.GetCursor() ); - } - - UpdateWindowUI(); + return GTK_BUTTON(m_widgetCheckbox)->event_window; } -wxSize wxCheckBox::DoGetBestSize() const +// static +wxVisualAttributes +wxCheckBox::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant)) { - return wxControl::DoGetBestSize(); + return GetDefaultAttributesFromGTKWidget(gtk_check_button_new); } #endif