X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3cbab64109b007fa1d939fe588f5e79f9105b915..180b5b4827d08f1ac13bbb5eca03f775ab35a0b1:/src/gtk1/checkbox.cpp diff --git a/src/gtk1/checkbox.cpp b/src/gtk1/checkbox.cpp index c9d1c422d3..c61796d946 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,8 +10,6 @@ // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" -#include "wx/defs.h" - #if wxUSE_CHECKBOX #include "wx/checkbox.h" @@ -38,7 +36,8 @@ extern wxWindowGTK *g_delayedFocus; //----------------------------------------------------------------------------- extern "C" { -static void gtk_checkbox_toggled_callback(GtkWidget *widget, wxCheckBox *cb) +static void gtk_checkbox_toggled_callback(GtkWidget *WXUNUSED(widget), + wxCheckBox *cb) { if (g_isIdle) wxapp_install_idle_handler(); @@ -74,15 +73,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 || @@ -124,7 +123,7 @@ bool wxCheckBox::Create(wxWindow *parent, PostCreation(size); - return TRUE; + return true; } void wxCheckBox::SetValue( bool state ) @@ -134,16 +133,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 ); - 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(m_widgetCheckbox)->active; } @@ -158,11 +157,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)