X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/afa7bd1eef03eb167b7f70412f1b4ef08ad73138..b84aec037f06174a9e911aa9c9307c2a4e5b8f0b:/src/gtk/checkbox.cpp?ds=sidebyside diff --git a/src/gtk/checkbox.cpp b/src/gtk/checkbox.cpp index 93a9ed2c88..4b7adcc208 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$ @@ -10,21 +10,12 @@ // 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" -//----------------------------------------------------------------------------- -// idle system -//----------------------------------------------------------------------------- - -extern void wxapp_install_idle_handler(); -extern bool g_isIdle; - //----------------------------------------------------------------------------- // data //----------------------------------------------------------------------------- @@ -120,15 +111,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 || @@ -168,7 +159,7 @@ bool wxCheckBox::Create(wxWindow *parent, PostCreation(size); - return TRUE; + return true; } void wxCheckBox::SetValue( bool state ) @@ -178,16 +169,16 @@ 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 ); + gtk_toggle_button_set_active( 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") ); return gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(m_widgetCheckbox)); } @@ -221,11 +212,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)