X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/db434467a143a2c847c4bcfe987f0202c2d02bf2..21bd196564d8483879a57c40ec1eea64114f9bd4:/src/gtk/checkbox.cpp diff --git a/src/gtk/checkbox.cpp b/src/gtk/checkbox.cpp index 051e51b500..a0655d0912 100644 --- a/src/gtk/checkbox.cpp +++ b/src/gtk/checkbox.cpp @@ -8,16 +8,20 @@ ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "checkbox.h" #endif -#include "wx/checkbox.h" +// For compilers that support precompilation, includes "wx.h". +#include "wx/wxprec.h" + +#include "wx/defs.h" #if wxUSE_CHECKBOX -#include -#include +#include "wx/checkbox.h" + +#include "wx/gtk/private.h" //----------------------------------------------------------------------------- // idle system @@ -30,26 +34,83 @@ 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 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; + + if (cb->m_blockEvent) return; + +#ifdef __WXGTK20__ + // 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->m_blockEvent = true; + + 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(_T("3state wxCheckBox in unexpected state!")); + } + + cb->m_blockEvent = false; + } + else + { + // user's action unsets undetermined state: + gtk_toggle_button_set_inconsistent(toggle, false); + } + } +#endif wxCommandEvent event(wxEVT_COMMAND_CHECKBOX_CLICKED, cb->GetId()); - event.SetInt( cb->GetValue() ); +#ifdef __WXGTK20__ + event.SetInt(cb->Get3StateValue()); +#else + event.SetInt(cb->GetValue()); +#endif event.SetEventObject(cb); cb->GetEventHandler()->ProcessEvent(event); } +} //----------------------------------------------------------------------------- // wxCheckBox @@ -72,15 +133,19 @@ bool wxCheckBox::Create(wxWindow *parent, { m_needParent = TRUE; m_acceptsFocus = TRUE; + m_blockEvent = FALSE; 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 ); + wxASSERT_MSG( (style & wxCHK_ALLOW_3RD_STATE_FOR_USER) == 0 || + (style & wxCHK_3STATE) != 0, + wxT("Using wxCHK_ALLOW_3RD_STATE_FOR_USER") + wxT(" style flag for a 2-state checkbox is useless") ); if ( style & wxALIGN_RIGHT ) { @@ -89,7 +154,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 +166,20 @@ 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 = BUTTON_CHILD( m_widgetCheckbox ); m_widget = m_widgetCheckbox; } + SetLabel( label ); gtk_signal_connect( GTK_OBJECT(m_widgetCheckbox), - "clicked", - GTK_SIGNAL_FUNC(gtk_checkbox_clicked_callback), + "toggled", + GTK_SIGNAL_FUNC(gtk_checkbox_toggled_callback), (gpointer *)this ); m_parent->DoAddChild( this ); - PostCreation(); - - ApplyWidgetStyle(); - - 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; } @@ -143,24 +191,44 @@ 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 ); + m_blockEvent = TRUE; gtk_toggle_button_set_state( GTK_TOGGLE_BUTTON(m_widgetCheckbox), state ); - - gtk_signal_connect( GTK_OBJECT(m_widgetCheckbox), - "clicked", - GTK_SIGNAL_FUNC(gtk_checkbox_clicked_callback), - (gpointer *)this ); + + m_blockEvent = FALSE; } bool wxCheckBox::GetValue() const { wxCHECK_MSG( m_widgetCheckbox != NULL, FALSE, wxT("invalid checkbox") ); +#ifdef __WXGTK20__ + return gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(m_widgetCheckbox)); +#else return GTK_TOGGLE_BUTTON(m_widgetCheckbox)->active; +#endif +} + +#ifdef __WXGTK20__ +void wxCheckBox::DoSet3StateValue(wxCheckBoxState state) +{ + SetValue(state != wxCHK_UNCHECKED); + gtk_toggle_button_set_inconsistent(GTK_TOGGLE_BUTTON(m_widgetCheckbox), + state == wxCHK_UNDETERMINED); +} + +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; + } } +#endif void wxCheckBox::SetLabel( const wxString& label ) { @@ -168,7 +236,12 @@ void wxCheckBox::SetLabel( const wxString& label ) wxControl::SetLabel( label ); - gtk_label_set( GTK_LABEL(m_widgetLabel), GetLabel().mbc_str() ); +#ifdef __WXGTK20__ + wxString label2 = PrepareLabelMnemonics( label ); + gtk_label_set_text_with_mnemonic( GTK_LABEL(m_widgetLabel), wxGTK_CONV( label2 ) ); +#else + gtk_label_set( GTK_LABEL(m_widgetLabel), wxGTK_CONV( GetLabel() ) ); +#endif } bool wxCheckBox::Enable( bool enable ) @@ -181,16 +254,15 @@ bool wxCheckBox::Enable( bool enable ) return TRUE; } -void wxCheckBox::ApplyWidgetStyle() +void wxCheckBox::DoApplyWidgetStyle(GtkRcStyle *style) { - SetWidgetStyle(); - gtk_widget_set_style( m_widgetCheckbox, m_widgetStyle ); - gtk_widget_set_style( m_widgetLabel, m_widgetStyle ); + gtk_widget_modify_style(m_widgetCheckbox, style); + gtk_widget_modify_style(m_widgetLabel, style); } bool wxCheckBox::IsOwnGtkWindow( GdkWindow *window ) { - return (window == GTK_TOGGLE_BUTTON(m_widget)->event_window); + return window == TOGGLE_BUTTON_EVENT_WIN(m_widget); } void wxCheckBox::OnInternalIdle() @@ -198,17 +270,28 @@ void wxCheckBox::OnInternalIdle() wxCursor cursor = m_cursor; if (g_globalCursor.Ok()) cursor = g_globalCursor; - if (GTK_TOGGLE_BUTTON(m_widgetCheckbox)->event_window && cursor.Ok()) + GdkWindow *event_window = TOGGLE_BUTTON_EVENT_WIN(m_widgetCheckbox); + if ( 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() ); + 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( event_window, 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 wxCheckBox::DoGetBestSize() const @@ -216,4 +299,11 @@ wxSize wxCheckBox::DoGetBestSize() const return wxControl::DoGetBestSize(); } +// static +wxVisualAttributes +wxCheckBox::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant)) +{ + return GetDefaultAttributesFromGTKWidget(gtk_check_button_new); +} + #endif