Commit c3154703 authored by Tim Janik's avatar Tim Janik

watch the next ChangeLog update...

-timj
parent 57bae555
...@@ -166,6 +166,8 @@ static GtkWindowClass *color_selection_dialog_parent_class = NULL; ...@@ -166,6 +166,8 @@ static GtkWindowClass *color_selection_dialog_parent_class = NULL;
static gint color_selection_signals[LAST_SIGNAL] = {0}; static gint color_selection_signals[LAST_SIGNAL] = {0};
static const gchar *value_index_key = "gtk-value-index";
#define SF GtkSignalFunc #define SF GtkSignalFunc
...@@ -392,11 +394,11 @@ gtk_color_selection_init (GtkColorSelection *colorsel) ...@@ -392,11 +394,11 @@ gtk_color_selection_init (GtkColorSelection *colorsel)
gtk_signal_connect_object (GTK_OBJECT (adj), "value_changed", gtk_signal_connect_object (GTK_OBJECT (adj), "value_changed",
scale_vals[n].updater, (gpointer) colorsel->scales[n]); scale_vals[n].updater, (gpointer) colorsel->scales[n]);
gtk_object_set_data (GTK_OBJECT (colorsel->scales[n]), "_GtkColorSelection", (gpointer) colorsel); gtk_object_set_data (GTK_OBJECT (colorsel->scales[n]), "_GtkColorSelection", (gpointer) colorsel);
gtk_object_set_data (GTK_OBJECT (colorsel->scales[n]), "_ValueIndex", (gpointer) n); gtk_object_set_data (GTK_OBJECT (colorsel->scales[n]), value_index_key, (gpointer) n);
gtk_signal_connect_object (GTK_OBJECT (colorsel->entries[n]), "changed", gtk_signal_connect_object (GTK_OBJECT (colorsel->entries[n]), "changed",
scale_vals[n].updater, (gpointer) colorsel->entries[n]); scale_vals[n].updater, (gpointer) colorsel->entries[n]);
gtk_object_set_data (GTK_OBJECT (colorsel->entries[n]), "_GtkColorSelection", (gpointer) colorsel); gtk_object_set_data (GTK_OBJECT (colorsel->entries[n]), "_GtkColorSelection", (gpointer) colorsel);
gtk_object_set_data (GTK_OBJECT (colorsel->entries[n]), "_ValueIndex", (gpointer) n); gtk_object_set_data (GTK_OBJECT (colorsel->entries[n]), value_index_key, (gpointer) n);
} }
colorsel->opacity_label = label; colorsel->opacity_label = label;
...@@ -625,7 +627,7 @@ gtk_color_selection_hsv_updater (GtkWidget *widget, ...@@ -625,7 +627,7 @@ gtk_color_selection_hsv_updater (GtkWidget *widget,
if (GTK_WIDGET_DRAWABLE (GTK_WIDGET (widget))) if (GTK_WIDGET_DRAWABLE (GTK_WIDGET (widget)))
{ {
colorsel = (GtkColorSelection*) gtk_object_get_data (GTK_OBJECT (widget), "_GtkColorSelection"); colorsel = (GtkColorSelection*) gtk_object_get_data (GTK_OBJECT (widget), "_GtkColorSelection");
i = (gint) gtk_object_get_data (GTK_OBJECT (widget), "_ValueIndex"); i = (gint) gtk_object_get_data (GTK_OBJECT (widget), value_index_key);
if (GTK_IS_SCALE (widget)) if (GTK_IS_SCALE (widget))
{ {
...@@ -675,7 +677,7 @@ gtk_color_selection_rgb_updater (GtkWidget *widget, ...@@ -675,7 +677,7 @@ gtk_color_selection_rgb_updater (GtkWidget *widget,
if (GTK_WIDGET_DRAWABLE (GTK_WIDGET (widget))) if (GTK_WIDGET_DRAWABLE (GTK_WIDGET (widget)))
{ {
colorsel = (GtkColorSelection*) gtk_object_get_data (GTK_OBJECT (widget), "_GtkColorSelection"); colorsel = (GtkColorSelection*) gtk_object_get_data (GTK_OBJECT (widget), "_GtkColorSelection");
i = (gint) gtk_object_get_data (GTK_OBJECT (widget), "_ValueIndex"); i = (gint) gtk_object_get_data (GTK_OBJECT (widget), value_index_key);
if (GTK_IS_SCALE (widget)) if (GTK_IS_SCALE (widget))
{ {
......
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
#include "gdk/gdkkeysyms.h" #include "gdk/gdkkeysyms.h"
#include "gtkcombo.h" #include "gtkcombo.h"
const gchar *gtk_combo_string_key = "_combo_string_value"; const gchar *gtk_combo_string_key = "gtk-combo-string-value";
#define COMBO_LIST_MAX_HEIGHT 400 #define COMBO_LIST_MAX_HEIGHT 400
...@@ -84,8 +84,8 @@ gtk_combo_class_init (GtkComboClass * klass) ...@@ -84,8 +84,8 @@ gtk_combo_class_init (GtkComboClass * klass)
static void static void
gtk_combo_destroy (GtkObject * combo) gtk_combo_destroy (GtkObject * combo)
{ {
gtk_widget_destroy (GTK_COMBO (combo)->popwin);
gtk_object_unref (GTK_OBJECT (GTK_COMBO (combo)->popwin)); gtk_widget_unref (GTK_COMBO (combo)->popwin);
if (GTK_OBJECT_CLASS (parent_class)->destroy) if (GTK_OBJECT_CLASS (parent_class)->destroy)
(*GTK_OBJECT_CLASS (parent_class)->destroy) (combo); (*GTK_OBJECT_CLASS (parent_class)->destroy) (combo);
...@@ -148,7 +148,7 @@ gtk_combo_find (GtkCombo * combo) ...@@ -148,7 +148,7 @@ gtk_combo_find (GtkCombo * combo)
if (combo->case_sensitive) if (combo->case_sensitive)
string_compare = strcmp; string_compare = strcmp;
else else
string_compare = g_strcasecmp; string_compare = (void*) g_strcasecmp;
text = gtk_entry_get_text (GTK_ENTRY (combo->entry)); text = gtk_entry_get_text (GTK_ENTRY (combo->entry));
clist = GTK_LIST (combo->list)->children; clist = GTK_LIST (combo->list)->children;
...@@ -386,6 +386,7 @@ gtk_combo_init (GtkCombo * combo) ...@@ -386,6 +386,7 @@ gtk_combo_init (GtkCombo * combo)
(GtkSignalFunc)prelight_bug, combo); */ (GtkSignalFunc)prelight_bug, combo); */
combo->popwin = gtk_window_new (GTK_WINDOW_POPUP); combo->popwin = gtk_window_new (GTK_WINDOW_POPUP);
gtk_widget_ref (combo->popwin);
gtk_window_set_policy (GTK_WINDOW (combo->popwin), 1, 1, 0); gtk_window_set_policy (GTK_WINDOW (combo->popwin), 1, 1, 0);
combo->popup = gtk_scrolled_window_new (NULL, NULL); combo->popup = gtk_scrolled_window_new (NULL, NULL);
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (combo->popup), gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (combo->popup),
......
...@@ -100,21 +100,24 @@ static GSList *living_objs = NULL; ...@@ -100,21 +100,24 @@ static GSList *living_objs = NULL;
static void static void
gtk_object_debug (void) gtk_object_debug (void)
{ {
if (1)
{
GSList *node; GSList *node;
printf ("%d living objects\n", obj_count); printf ("living objects (%d):\n", obj_count);
for (node = living_objs; node; node = node->next) for (node = living_objs; node; node = node->next)
{ {
GtkObject *obj; GtkObject *obj;
obj = (GtkObject*) node->data; obj = (GtkObject*) node->data;
/*
printf ("%p: %s %d %s\n", printf ("%p: %s %d %s\n",
obj, gtk_type_name (GTK_OBJECT_TYPE (obj)), obj, gtk_type_name (GTK_OBJECT_TYPE (obj)),
obj->ref_count, obj->ref_count,
GTK_OBJECT_FLOATING (obj)? "floating" : ""); GTK_OBJECT_FLOATING (obj)? "floating" : "");
*/
} }
}
printf ("%d living objects\n", obj_count);
} }
#endif GTK_OBJECT_DEBUG #endif GTK_OBJECT_DEBUG
...@@ -531,7 +534,7 @@ struct _GtkWeakRef ...@@ -531,7 +534,7 @@ struct _GtkWeakRef
gpointer data; gpointer data;
}; };
static const gchar *weakrefs_key = "weakrefs"; static const gchar *weakrefs_key = "gtk-weakrefs";
void void
gtk_object_weakref (GtkObject *object, gtk_object_weakref (GtkObject *object,
......
...@@ -47,7 +47,7 @@ enum ...@@ -47,7 +47,7 @@ enum
#define GTK_PRIVATE_FLAGS(wid) (GTK_WIDGET (wid)->private_flags) #define GTK_PRIVATE_FLAGS(wid) (GTK_WIDGET (wid)->private_flags)
#define GTK_WIDGET_USER_STYLE(obj) (GTK_PRIVATE_FLAGS (obj) & PRIVATE_GTK_USER_STYLE) #define GTK_WIDGET_USER_STYLE(obj) (GTK_PRIVATE_FLAGS (obj) & PRIVATE_GTK_USER_STYLE)
#define GTK_WIDGET_REDRAW_PENDING(obj) (GTK_PRIVATE_FLAGS (obj) & PRIVATE_GTK_REDRAW_PENDING) #define GTK_WIDGET_REDRAW_PENDING(obj) (GTK_PRIVATE_FLAGS (obj) & PRIVATE_GTK_REDRAW_PENDING)
#define GTK_WIDGET_RESIZE_PENDING(obj) (GTK_PRIVATE_FLAGS (obj) & PRIVATE_GTK_RESIZE_PENDING) #define GTK_CONTAINER_RESIZE_PENDING(obj) (GTK_PRIVATE_FLAGS (obj) & PRIVATE_GTK_RESIZE_PENDING)
#define GTK_WIDGET_RESIZE_NEEDED(obj) (GTK_PRIVATE_FLAGS (obj) & PRIVATE_GTK_RESIZE_NEEDED) #define GTK_WIDGET_RESIZE_NEEDED(obj) (GTK_PRIVATE_FLAGS (obj) & PRIVATE_GTK_RESIZE_NEEDED)
#define GTK_WIDGET_LEAVE_PENDING(obj) (GTK_PRIVATE_FLAGS (obj) & PRIVATE_GTK_LEAVE_PENDING) #define GTK_WIDGET_LEAVE_PENDING(obj) (GTK_PRIVATE_FLAGS (obj) & PRIVATE_GTK_LEAVE_PENDING)
#define GTK_WIDGET_HAS_SHAPE_MASK(obj) (GTK_PRIVATE_FLAGS (obj) & PRIVATE_GTK_HAS_SHAPE_MASK) #define GTK_WIDGET_HAS_SHAPE_MASK(obj) (GTK_PRIVATE_FLAGS (obj) & PRIVATE_GTK_HAS_SHAPE_MASK)
......
...@@ -147,7 +147,7 @@ static GList *current_incrs = NULL; ...@@ -147,7 +147,7 @@ static GList *current_incrs = NULL;
static GList *current_selections = NULL; static GList *current_selections = NULL;
static GdkAtom gtk_selection_atoms[LAST_ATOM]; static GdkAtom gtk_selection_atoms[LAST_ATOM];
static const char *gtk_selection_handler_key = "selection_handlers"; static const char *gtk_selection_handler_key = "gtk-selection-handlers";
/************************************************************* /*************************************************************
* gtk_selection_owner_set: * gtk_selection_owner_set:
......
...@@ -210,13 +210,13 @@ static GSList *style_stack = NULL; ...@@ -210,13 +210,13 @@ static GSList *style_stack = NULL;
static GSList *gtk_widget_redraw_queue = NULL; static GSList *gtk_widget_redraw_queue = NULL;
static GSList *gtk_widget_resize_queue = NULL; static GSList *gtk_widget_resize_queue = NULL;
static const gchar *aux_info_key = "aux_info"; static const gchar *aux_info_key = "gtk-aux-info";
static const gchar *colormap_key = "colormap"; static const gchar *colormap_key = "gtk-colormap";
static const gchar *visual_key = "visual"; static const gchar *visual_key = "gtk-visual";
static const gchar *event_key = "event_mask"; static const gchar *event_key = "gtk-event-mask";
static const gchar *extension_event_key = "extension_event_mode"; static const gchar *extension_event_key = "gtk-extension-event-mode";
static const gchar *parent_window_key = "parent_window"; static const gchar *parent_window_key = "gtk-parent-window";
static const gchar *shape_info_key = "shape_info"; static const gchar *shape_info_key = "gtk-shape-info";
...@@ -1442,7 +1442,7 @@ gtk_widget_queue_resize (GtkWidget *widget) ...@@ -1442,7 +1442,7 @@ gtk_widget_queue_resize (GtkWidget *widget)
{ {
if (GTK_WIDGET_VISIBLE (toplevel)) if (GTK_WIDGET_VISIBLE (toplevel))
{ {
if (!GTK_WIDGET_RESIZE_PENDING (toplevel)) if (!GTK_CONTAINER_RESIZE_PENDING (toplevel))
{ {
GTK_PRIVATE_SET_FLAGS (toplevel, GTK_RESIZE_PENDING); GTK_PRIVATE_SET_FLAGS (toplevel, GTK_RESIZE_PENDING);
if (gtk_widget_resize_queue == NULL) if (gtk_widget_resize_queue == NULL)
...@@ -3080,7 +3080,7 @@ gtk_widget_real_destroy (GtkObject *object) ...@@ -3080,7 +3080,7 @@ gtk_widget_real_destroy (GtkObject *object)
GTK_PRIVATE_UNSET_FLAGS (widget, GTK_REDRAW_PENDING); GTK_PRIVATE_UNSET_FLAGS (widget, GTK_REDRAW_PENDING);
} }
if (GTK_WIDGET_RESIZE_PENDING (widget)) if (GTK_CONTAINER_RESIZE_PENDING (widget))
{ {
gtk_widget_resize_queue = g_slist_remove (gtk_widget_resize_queue, widget); gtk_widget_resize_queue = g_slist_remove (gtk_widget_resize_queue, widget);
GTK_PRIVATE_UNSET_FLAGS (widget, GTK_RESIZE_PENDING); GTK_PRIVATE_UNSET_FLAGS (widget, GTK_RESIZE_PENDING);
......
...@@ -1275,7 +1275,7 @@ gtk_window_set_hints (GtkWidget *widget, ...@@ -1275,7 +1275,7 @@ gtk_window_set_hints (GtkWidget *widget,
ux = 0; ux = 0;
uy = 0; uy = 0;
aux_info = gtk_object_get_data (GTK_OBJECT (widget), "aux_info"); aux_info = gtk_object_get_data (GTK_OBJECT (widget), "gtk-aux-info");
if (aux_info && (aux_info->x != -1) && (aux_info->y != -1)) if (aux_info && (aux_info->x != -1) && (aux_info->y != -1))
{ {
ux = aux_info->x; ux = aux_info->x;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment