palette->priv->text_size_group = NULL;
}
+ if (palette->priv->settings_connection > 0)
+ {
+ g_signal_handler_disconnect (palette->priv->settings, palette->priv->settings_connection);
+ palette->priv->settings_connection = 0;
+ }
+
+ g_clear_object (&palette->priv->settings);
+
G_OBJECT_CLASS (gtk_tool_palette_parent_class)->dispose (object);
}
attributes.event_mask = gtk_widget_get_events (widget)
| GDK_VISIBILITY_NOTIFY_MASK | GDK_EXPOSURE_MASK
| GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
- | GDK_BUTTON_MOTION_MASK;
+ | GDK_BUTTON_MOTION_MASK
+ | GDK_SCROLL_MASK | GDK_SMOOTH_SCROLL_MASK
+ | GDK_TOUCH_MASK;
attributes_mask = GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL;
window = gdk_window_new (gtk_widget_get_parent_window (widget),
&attributes, attributes_mask);
gtk_widget_set_window (widget, window);
- gdk_window_set_user_data (window, widget);
+ gtk_widget_register_window (widget, window);
gtk_style_context_set_background (gtk_widget_get_style_context (widget),
window);
if (old_settings)
{
g_signal_handler_disconnect (old_settings, priv->settings_connection);
+ priv->settings_connection = 0;
g_object_unref (old_settings);
}
return palette->priv->style;
}
-gint
-_gtk_tool_palette_compare_groups (gconstpointer a,
- gconstpointer b)
+static gint
+gtk_tool_palette_compare_groups (gconstpointer a,
+ gconstpointer b)
{
const GtkToolItemGroupInfo *group_a = a;
const GtkToolItemGroupInfo *group_b = b;
group_new->pos = position;
group_old->pos = old_position;
- g_ptr_array_sort (palette->priv->groups, _gtk_tool_palette_compare_groups);
+ g_ptr_array_sort (palette->priv->groups, gtk_tool_palette_compare_groups);
gtk_widget_queue_resize (GTK_WIDGET (palette));
}