X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/289532452089421ddadbd4726a8469511a19ab76..4e15d1caa03346c126015019c1fdf093033ef40b:/src/gtk/checkbox.cpp diff --git a/src/gtk/checkbox.cpp b/src/gtk/checkbox.cpp index 415b5c4e64..b19cacc6d3 100644 --- a/src/gtk/checkbox.cpp +++ b/src/gtk/checkbox.cpp @@ -15,6 +15,7 @@ #include "wx/checkbox.h" #include <gtk/gtk.h> +#include "wx/gtk/private/gtk2-compat.h" //----------------------------------------------------------------------------- // data @@ -29,8 +30,6 @@ extern bool g_blockEventsOnDrag; extern "C" { static void gtk_checkbox_toggled_callback(GtkWidget *widget, wxCheckBox *cb) { - if (!cb->m_hasVMT) return; - if (g_blockEventsOnDrag) return; // Transitions for 3state checkbox must be done manually, GTK's checkbox @@ -44,8 +43,8 @@ static void gtk_checkbox_toggled_callback(GtkWidget *widget, wxCheckBox *cb) { // The 3 states cycle like this when clicked: // checked -> undetermined -> unchecked -> checked -> ... - bool active = gtk_toggle_button_get_active(toggle); - bool inconsistent = gtk_toggle_button_get_inconsistent(toggle); + bool active = gtk_toggle_button_get_active(toggle) != 0; + bool inconsistent = gtk_toggle_button_get_inconsistent(toggle) != 0; cb->GTKDisableEvents(); @@ -131,7 +130,7 @@ bool wxCheckBox::Create(wxWindow *parent, else { m_widgetCheckbox = gtk_check_button_new_with_label(""); - m_widgetLabel = GTK_BIN(m_widgetCheckbox)->child; + m_widgetLabel = gtk_bin_get_child(GTK_BIN(m_widgetCheckbox)); m_widget = m_widgetCheckbox; } g_object_ref(m_widget); @@ -177,7 +176,7 @@ bool wxCheckBox::GetValue() const { wxCHECK_MSG( m_widgetCheckbox != NULL, false, wxT("invalid checkbox") ); - return gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(m_widgetCheckbox)); + return gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(m_widgetCheckbox)) != 0; } void wxCheckBox::DoSet3StateValue(wxCheckBoxState state) @@ -224,13 +223,13 @@ bool wxCheckBox::Enable( bool enable ) void wxCheckBox::DoApplyWidgetStyle(GtkRcStyle *style) { - gtk_widget_modify_style(m_widgetCheckbox, style); - gtk_widget_modify_style(m_widgetLabel, style); + GTKApplyStyle(m_widgetCheckbox, style); + GTKApplyStyle(m_widgetLabel, style); } GdkWindow *wxCheckBox::GTKGetWindow(wxArrayGdkWindows& WXUNUSED(windows)) const { - return GTK_BUTTON(m_widgetCheckbox)->event_window; + return gtk_button_get_event_window(GTK_BUTTON(m_widgetCheckbox)); } // static