X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b2ff89d648e5b73172dc2f4aa84d2aadbdc063ec..6e204d57c44bdaaace6b0a45409c00a2af43d8ab:/src/gtk1/checkbox.cpp?ds=inline diff --git a/src/gtk1/checkbox.cpp b/src/gtk1/checkbox.cpp index 8b561f3929..a85a9b4acf 100644 --- a/src/gtk1/checkbox.cpp +++ b/src/gtk1/checkbox.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: checkbox.cpp +// Name: src/gtk1/checkbox.cpp // Purpose: // Author: Robert Roebling // Id: $Id$ @@ -10,13 +10,11 @@ // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" -#include "wx/defs.h" - #if wxUSE_CHECKBOX #include "wx/checkbox.h" -#include "wx/gtk/private.h" +#include "wx/gtk1/private.h" //----------------------------------------------------------------------------- // idle system @@ -45,63 +43,11 @@ static void gtk_checkbox_toggled_callback(GtkWidget *widget, wxCheckBox *cb) 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 + if (cb->m_blockEvent) return; wxCommandEvent event(wxEVT_COMMAND_CHECKBOX_CLICKED, cb->GetId()); -#ifdef __WXGTK20__ - event.SetInt(cb->Get3StateValue()); -#else event.SetInt(cb->GetValue()); -#endif event.SetEventObject(cb); cb->GetEventHandler()->ProcessEvent(event); } @@ -126,15 +72,15 @@ bool wxCheckBox::Create(wxWindow *parent, const wxValidator& validator, const wxString &name ) { - m_needParent = TRUE; - m_acceptsFocus = TRUE; - m_blockEvent = FALSE; + 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; } wxASSERT_MSG( (style & wxCHK_ALLOW_3RD_STATE_FOR_USER) == 0 || @@ -176,7 +122,7 @@ bool wxCheckBox::Create(wxWindow *parent, PostCreation(size); - return TRUE; + return true; } void wxCheckBox::SetValue( bool state ) @@ -186,45 +132,20 @@ void wxCheckBox::SetValue( bool state ) if (state == GetValue()) return; - m_blockEvent = TRUE; + m_blockEvent = true; gtk_toggle_button_set_state( GTK_TOGGLE_BUTTON(m_widgetCheckbox), state ); - m_blockEvent = FALSE; + m_blockEvent = false; } bool wxCheckBox::GetValue() const { - wxCHECK_MSG( m_widgetCheckbox != NULL, FALSE, wxT("invalid checkbox") ); + 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 ) { wxCHECK_RET( m_widgetLabel != NULL, wxT("invalid checkbox") ); @@ -235,11 +156,11 @@ void wxCheckBox::SetLabel( const wxString& label ) bool wxCheckBox::Enable( bool enable ) { if ( !wxControl::Enable( enable ) ) - return FALSE; + return false; gtk_widget_set_sensitive( m_widgetLabel, enable ); - return TRUE; + return true; } void wxCheckBox::DoApplyWidgetStyle(GtkRcStyle *style) @@ -277,7 +198,7 @@ void wxCheckBox::OnInternalIdle() g_delayedFocus = NULL; } } - + if (wxUpdateUIEvent::CanUpdate(this)) UpdateWindowUI(wxUPDATE_UI_FROMIDLE); }