static wxVisualAttributes
GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
- // implementation
- // --------------
-
- GtkWidget *m_widgetCheckbox;
- GtkWidget *m_widgetLabel;
-
- bool m_blockEvent;
-
protected:
virtual wxSize DoGetBestSize() const;
virtual void DoApplyWidgetStyle(GtkRcStyle *style);
void DoSet3StateValue(wxCheckBoxState state);
wxCheckBoxState DoGet3StateValue() const;
+public:
+ // implementation
+ void GTKDisableEvents();
+ void GTKEnableEvents();
+
+ GtkWidget *m_widgetCheckbox;
+ GtkWidget *m_widgetLabel;
+
private:
DECLARE_DYNAMIC_CLASS(wxCheckBox)
};
GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
// implementation
- bool m_blockEvent;
wxBitmap m_bitmap;
void OnSetBitmap();
protected:
+ void GTKDisableEvents();
+ void GTKEnableEvents();
+
virtual wxSize DoGetBestSize() const;
virtual void DoApplyWidgetStyle(GtkRcStyle *style);
virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const;
static wxVisualAttributes
GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
- // implementation
- bool m_blockEvent;
-
protected:
+ void GTKDisableEvents();
+ void GTKEnableEvents();
+
virtual wxSize DoGetBestSize() const;
virtual void DoApplyWidgetStyle(GtkRcStyle *style);
virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const;
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:
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)
{
wxFAIL_MSG(_T("3state wxCheckBox in unexpected state!"));
}
- cb->m_blockEvent = false;
+ cb->GTKEnableEvents();
}
else
{
const wxValidator& validator,
const wxString &name )
{
- m_blockEvent = false;
-
if (!PreCreation( parent, pos, size ) ||
!CreateBase( parent, id, pos, size, style, validator, name ))
{
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
if (!cb->m_hasVMT || g_blockEventsOnDrag)
return;
- if (cb->m_blockEvent) return;
-
// Generate a wx event.
wxCommandEvent event(wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, cb->GetId());
event.SetInt(cb->GetValue());
const wxValidator& validator,
const wxString &name)
{
- m_blockEvent = false;
-
if (!PreCreation(parent, pos, size) ||
!CreateBase(parent, id, pos, size, style, validator, name ))
{
return true;
}
+void wxBitmapToggleButton::GTKDisableEvents()
+{
+ g_signal_handlers_block_by_func(m_widget,
+ (gpointer) gtk_togglebutton_clicked_callback, this);
+}
+
+void wxBitmapToggleButton::GTKEnableEvents()
+{
+ g_signal_handlers_unblock_by_func(m_widget,
+ (gpointer) gtk_togglebutton_clicked_callback, this);
+}
+
// void SetValue(bool state)
// Set the value of the toggle button.
void wxBitmapToggleButton::SetValue(bool state)
if (state == GetValue())
return;
- m_blockEvent = true;
+ GTKDisableEvents();
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(m_widget), state);
- m_blockEvent = false;
+ GTKEnableEvents();
}
// bool GetValue() const
const wxValidator& validator,
const wxString &name)
{
- m_blockEvent = false;
-
if (!PreCreation(parent, pos, size) ||
!CreateBase(parent, id, pos, size, style, validator, name ))
{
return true;
}
+void wxToggleButton::GTKDisableEvents()
+{
+ g_signal_handlers_block_by_func(m_widget,
+ (gpointer) gtk_togglebutton_clicked_callback, this);
+}
+
+void wxToggleButton::GTKEnableEvents()
+{
+ g_signal_handlers_unblock_by_func(m_widget,
+ (gpointer) gtk_togglebutton_clicked_callback, this);
+}
+
// void SetValue(bool state)
// Set the value of the toggle button.
void wxToggleButton::SetValue(bool state)
if (state == GetValue())
return;
- m_blockEvent = true;
+ GTKEnableEvents();
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(m_widget), state);
- m_blockEvent = false;
+ GTKDisableEvents();
}
// bool GetValue() const