diff options
| -rw-r--r-- | ChangeLog | 13 | ||||
| -rw-r--r-- | ChangeLog.pre-2-0 | 13 | ||||
| -rw-r--r-- | ChangeLog.pre-2-10 | 13 | ||||
| -rw-r--r-- | ChangeLog.pre-2-2 | 13 | ||||
| -rw-r--r-- | ChangeLog.pre-2-4 | 13 | ||||
| -rw-r--r-- | ChangeLog.pre-2-6 | 13 | ||||
| -rw-r--r-- | ChangeLog.pre-2-8 | 13 | ||||
| -rw-r--r-- | configure.in | 6 | ||||
| -rw-r--r-- | gtk/gtkcompat.h | 2 | ||||
| -rw-r--r-- | gtk/gtkmain.c | 3 | ||||
| -rw-r--r-- | gtk/gtkstyle.c | 15 | ||||
| -rw-r--r-- | gtk/gtkstyle.h | 13 |
12 files changed, 100 insertions, 30 deletions
@@ -1,3 +1,16 @@ +Sun Jan 17 05:19:14 1999 Tim Janik <timj@gtk.org> + + * configure.in: incremented version number to 1.1.13, bin age 0, + interface age 0. + + * gtk/gtkmain.c (gtk_idle_remove_by_data): use g_idle_remove_by_data to + remove idles, so `data' cannot conflict with other sources. + + * gtk/gtkcompat.h: define gtk_style_apply_default_pixmap here. + + * gtk/gtkstyle.[hc]: removed gtk_style_apply_default_pixmap. + (struct _GtkStyle): reordered GtkStyleClass*klass; member. + Sat Jan 16 19:42:48 1999 George Lebl <jirka@5z.com> * gtk/gtktooltips.c: for NO_WINDOW widgets, add their allocation.y diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 87980f2939..24056fd57d 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,16 @@ +Sun Jan 17 05:19:14 1999 Tim Janik <timj@gtk.org> + + * configure.in: incremented version number to 1.1.13, bin age 0, + interface age 0. + + * gtk/gtkmain.c (gtk_idle_remove_by_data): use g_idle_remove_by_data to + remove idles, so `data' cannot conflict with other sources. + + * gtk/gtkcompat.h: define gtk_style_apply_default_pixmap here. + + * gtk/gtkstyle.[hc]: removed gtk_style_apply_default_pixmap. + (struct _GtkStyle): reordered GtkStyleClass*klass; member. + Sat Jan 16 19:42:48 1999 George Lebl <jirka@5z.com> * gtk/gtktooltips.c: for NO_WINDOW widgets, add their allocation.y diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 87980f2939..24056fd57d 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,16 @@ +Sun Jan 17 05:19:14 1999 Tim Janik <timj@gtk.org> + + * configure.in: incremented version number to 1.1.13, bin age 0, + interface age 0. + + * gtk/gtkmain.c (gtk_idle_remove_by_data): use g_idle_remove_by_data to + remove idles, so `data' cannot conflict with other sources. + + * gtk/gtkcompat.h: define gtk_style_apply_default_pixmap here. + + * gtk/gtkstyle.[hc]: removed gtk_style_apply_default_pixmap. + (struct _GtkStyle): reordered GtkStyleClass*klass; member. + Sat Jan 16 19:42:48 1999 George Lebl <jirka@5z.com> * gtk/gtktooltips.c: for NO_WINDOW widgets, add their allocation.y diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 87980f2939..24056fd57d 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,16 @@ +Sun Jan 17 05:19:14 1999 Tim Janik <timj@gtk.org> + + * configure.in: incremented version number to 1.1.13, bin age 0, + interface age 0. + + * gtk/gtkmain.c (gtk_idle_remove_by_data): use g_idle_remove_by_data to + remove idles, so `data' cannot conflict with other sources. + + * gtk/gtkcompat.h: define gtk_style_apply_default_pixmap here. + + * gtk/gtkstyle.[hc]: removed gtk_style_apply_default_pixmap. + (struct _GtkStyle): reordered GtkStyleClass*klass; member. + Sat Jan 16 19:42:48 1999 George Lebl <jirka@5z.com> * gtk/gtktooltips.c: for NO_WINDOW widgets, add their allocation.y diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 87980f2939..24056fd57d 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,16 @@ +Sun Jan 17 05:19:14 1999 Tim Janik <timj@gtk.org> + + * configure.in: incremented version number to 1.1.13, bin age 0, + interface age 0. + + * gtk/gtkmain.c (gtk_idle_remove_by_data): use g_idle_remove_by_data to + remove idles, so `data' cannot conflict with other sources. + + * gtk/gtkcompat.h: define gtk_style_apply_default_pixmap here. + + * gtk/gtkstyle.[hc]: removed gtk_style_apply_default_pixmap. + (struct _GtkStyle): reordered GtkStyleClass*klass; member. + Sat Jan 16 19:42:48 1999 George Lebl <jirka@5z.com> * gtk/gtktooltips.c: for NO_WINDOW widgets, add their allocation.y diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 87980f2939..24056fd57d 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,16 @@ +Sun Jan 17 05:19:14 1999 Tim Janik <timj@gtk.org> + + * configure.in: incremented version number to 1.1.13, bin age 0, + interface age 0. + + * gtk/gtkmain.c (gtk_idle_remove_by_data): use g_idle_remove_by_data to + remove idles, so `data' cannot conflict with other sources. + + * gtk/gtkcompat.h: define gtk_style_apply_default_pixmap here. + + * gtk/gtkstyle.[hc]: removed gtk_style_apply_default_pixmap. + (struct _GtkStyle): reordered GtkStyleClass*klass; member. + Sat Jan 16 19:42:48 1999 George Lebl <jirka@5z.com> * gtk/gtktooltips.c: for NO_WINDOW widgets, add their allocation.y diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 87980f2939..24056fd57d 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,16 @@ +Sun Jan 17 05:19:14 1999 Tim Janik <timj@gtk.org> + + * configure.in: incremented version number to 1.1.13, bin age 0, + interface age 0. + + * gtk/gtkmain.c (gtk_idle_remove_by_data): use g_idle_remove_by_data to + remove idles, so `data' cannot conflict with other sources. + + * gtk/gtkcompat.h: define gtk_style_apply_default_pixmap here. + + * gtk/gtkstyle.[hc]: removed gtk_style_apply_default_pixmap. + (struct _GtkStyle): reordered GtkStyleClass*klass; member. + Sat Jan 16 19:42:48 1999 George Lebl <jirka@5z.com> * gtk/gtktooltips.c: for NO_WINDOW widgets, add their allocation.y diff --git a/configure.in b/configure.in index b466a21707..468170b42a 100644 --- a/configure.in +++ b/configure.in @@ -14,9 +14,9 @@ cflags_set=${CFLAGS+set} # GTK_MAJOR_VERSION=1 GTK_MINOR_VERSION=1 -GTK_MICRO_VERSION=12 -GTK_INTERFACE_AGE=1 -GTK_BINARY_AGE=1 +GTK_MICRO_VERSION=13 +GTK_INTERFACE_AGE=0 +GTK_BINARY_AGE=0 GTK_VERSION=$GTK_MAJOR_VERSION.$GTK_MINOR_VERSION.$GTK_MICRO_VERSION AC_SUBST(GTK_MAJOR_VERSION) AC_SUBST(GTK_MINOR_VERSION) diff --git a/gtk/gtkcompat.h b/gtk/gtkcompat.h index 06e114ee83..983947b897 100644 --- a/gtk/gtkcompat.h +++ b/gtk/gtkcompat.h @@ -40,6 +40,8 @@ extern "C" { #define gtk_scale_value_width gtk_scale_get_value_width #define gtk_window_position gtk_window_set_position #define gtk_toggle_button_set_state gtk_toggle_button_set_active +#define gtk_style_apply_default_pixmap(s,gw,st,a,x,y,w,h) \ + gtk_style_apply_default_background (s,gw,TRUE,st,a,x,y,w,h) #endif /* GTK_DISABLE_COMPAT_H */ diff --git a/gtk/gtkmain.c b/gtk/gtkmain.c index 4e04df9382..4ae4a3b52a 100644 --- a/gtk/gtkmain.c +++ b/gtk/gtkmain.c @@ -1060,7 +1060,8 @@ gtk_idle_remove (guint tag) void gtk_idle_remove_by_data (gpointer data) { - g_source_remove_by_user_data (data); + if (!g_idle_remove_by_data (data)) + g_warning ("gtk_idle_remove_by_data(%p): no such idle", data); } guint diff --git a/gtk/gtkstyle.c b/gtk/gtkstyle.c index ea69fd23b6..097d68c237 100644 --- a/gtk/gtkstyle.c +++ b/gtk/gtkstyle.c @@ -1162,21 +1162,6 @@ gtk_style_apply_default_background (GtkStyle *style, } } -/* deprecated */ -void -gtk_style_apply_default_pixmap (GtkStyle *style, - GdkWindow *window, - GtkStateType state_type, - GdkRectangle *area, - gint x, - gint y, - gint width, - gint height) -{ - gtk_style_apply_default_background (style, window, TRUE, state_type, - area, x, y, width, height); -} - static void gtk_default_draw_hline (GtkStyle *style, GdkWindow *window, diff --git a/gtk/gtkstyle.h b/gtk/gtkstyle.h index e286e1a832..9424af5ce0 100644 --- a/gtk/gtkstyle.h +++ b/gtk/gtkstyle.h @@ -51,6 +51,8 @@ typedef struct _GtkWidget GtkWidget; struct _GtkStyle { + GtkStyleClass *klass; + GdkColor fg[5]; GdkColor bg[5]; GdkColor light[5]; @@ -83,7 +85,6 @@ struct _GtkStyle gint depth; GdkColormap *colormap; - GtkStyleClass *klass; /* Not private - reorder me */ GtkThemeEngine *engine; gpointer engine_data; @@ -762,16 +763,6 @@ void gtk_paint_handle (GtkStyle *style, gint height, GtkOrientation orientation); -/* Deprecated - */ -void gtk_style_apply_default_pixmap (GtkStyle *style, - GdkWindow *window, - GtkStateType state_type, - GdkRectangle *area, - gint x, - gint y, - gint width, - gint height); #ifdef __cplusplus } |