Commit 9c5dfcd3 authored by Tim Janik's avatar Tim Janik Committed by Tim Janik
Browse files

incremented version number to 1.1.13, bin age 0, interface age 0.

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.
parent 2daaea2f
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
......
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
......
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
......
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
......
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
......
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
......
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
......
......@@ -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)
......
......@@ -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 */
......
......@@ -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
......
......@@ -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,
......
......@@ -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
}
......
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