X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/68567a967bc8afd37a40cb9a7ee5021b9ee6cd96..c56ae04274fda26269c6d06be34cf59a45eb70ce:/src/gtk/checkbox.cpp?ds=sidebyside diff --git a/src/gtk/checkbox.cpp b/src/gtk/checkbox.cpp index f76fdded93..09a67f104b 100644 --- a/src/gtk/checkbox.cpp +++ b/src/gtk/checkbox.cpp @@ -156,15 +156,13 @@ bool wxCheckBox::Create(wxWindow *parent, else { m_widgetCheckbox = gtk_check_button_new_with_label(""); - m_widgetLabel = BUTTON_CHILD( m_widgetCheckbox ); + m_widgetLabel = GTK_BIN(m_widgetCheckbox)->child; m_widget = m_widgetCheckbox; } SetLabel( label ); - gtk_signal_connect( GTK_OBJECT(m_widgetCheckbox), - "toggled", - GTK_SIGNAL_FUNC(gtk_checkbox_toggled_callback), - (gpointer *)this ); + g_signal_connect (m_widgetCheckbox, "toggled", + G_CALLBACK (gtk_checkbox_toggled_callback), this); m_parent->DoAddChild( this ); @@ -182,7 +180,7 @@ void wxCheckBox::SetValue( bool state ) m_blockEvent = TRUE; - gtk_toggle_button_set_state( GTK_TOGGLE_BUTTON(m_widgetCheckbox), state ); + gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON(m_widgetCheckbox), state ); m_blockEvent = FALSE; } @@ -238,7 +236,7 @@ void wxCheckBox::DoApplyWidgetStyle(GtkRcStyle *style) bool wxCheckBox::IsOwnGtkWindow( GdkWindow *window ) { - return window == TOGGLE_BUTTON_EVENT_WIN(m_widget); + return window == GTK_BUTTON(m_widget)->event_window; } void wxCheckBox::OnInternalIdle() @@ -246,7 +244,7 @@ void wxCheckBox::OnInternalIdle() wxCursor cursor = m_cursor; if (g_globalCursor.Ok()) cursor = g_globalCursor; - GdkWindow *event_window = TOGGLE_BUTTON_EVENT_WIN(m_widgetCheckbox); + GdkWindow *event_window = GTK_BUTTON(m_widgetCheckbox)->event_window; if ( event_window && cursor.Ok() ) { /* I now set the cursor the anew in every OnInternalIdle call