Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wx/wxprec.h already includes wx/defs.h (with other minor cleaning).

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38788 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2006-04-18 08:11:26 +00:00
parent 8898456df4
commit 93763ad5ba
40 changed files with 429 additions and 497 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/gtk1/checkbox.cpp
View File

@@ -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"
@@ -74,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 ||
@@ -124,7 +122,7 @@ bool wxCheckBox::Create(wxWindow *parent,
PostCreation(size);
return TRUE;
return true;
}
void wxCheckBox::SetValue( bool state )
@@ -134,16 +132,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 +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)