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

use gtk_block_event instead of m_block event field

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55404 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
2008-09-01 08:27:56 +00:00
parent f4ef4722ac
commit c71ab7c15c
4 changed files with 59 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/gtk/checkbox.cpp
View File

@@ -33,8 +33,6 @@ static void gtk_checkbox_toggled_callback(GtkWidget *widget, wxCheckBox *cb)
if (g_blockEventsOnDrag) return;
if (cb->m_blockEvent) return;
// Transitions for 3state checkbox must be done manually, GTK's checkbox
// is 2state with additional "undetermined state" flag which isn't
// changed automatically:
@@ -49,7 +47,7 @@ static void gtk_checkbox_toggled_callback(GtkWidget *widget, wxCheckBox *cb)
bool active = gtk_toggle_button_get_active(toggle);
bool inconsistent = gtk_toggle_button_get_inconsistent(toggle);
cb->m_blockEvent = true;
cb->GTKDisableEvents();
if (!active && !inconsistent)
{
@@ -72,7 +70,7 @@ static void gtk_checkbox_toggled_callback(GtkWidget *widget, wxCheckBox *cb)
wxFAIL_MSG(_T("3state wxCheckBox in unexpected state!"));
}
cb->m_blockEvent = false;
cb->GTKEnableEvents();
}
else
{
@@ -107,8 +105,6 @@ bool wxCheckBox::Create(wxWindow *parent,
const wxValidator& validator,
const wxString &name )
{
m_blockEvent = false;
if (!PreCreation( parent, pos, size ) ||
!CreateBase( parent, id, pos, size, style, validator, name ))
{
@@ -157,18 +153,30 @@ bool wxCheckBox::Create(wxWindow *parent,
return true;
}
void wxCheckBox::GTKDisableEvents()
{
g_signal_handlers_block_by_func(m_widgetCheckbox,
(gpointer) gtk_checkbox_toggled_callback, this);
}
void wxCheckBox::GTKEnableEvents()
{
g_signal_handlers_unblock_by_func(m_widgetCheckbox,
(gpointer) gtk_checkbox_toggled_callback, this);
}
void wxCheckBox::SetValue( bool state )
{
wxCHECK_RET( m_widgetCheckbox != NULL, wxT("invalid checkbox") );
if (state == GetValue())
return;
m_blockEvent = true;
GTKDisableEvents();
gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON(m_widgetCheckbox), state );
m_blockEvent = false;
GTKEnableEvents();
}
bool wxCheckBox::GetValue() const