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.

diff --git a/ChangeLog b/ChangeLog
index 87980f2939aaeb2cba60694c0b1b57b018aeb74b..24056fd57d74ef627df41e11b52f11ecd45efa2f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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 87980f2939aaeb2cba60694c0b1b57b018aeb74b..24056fd57d74ef627df41e11b52f11ecd45efa2f 100644 (file)
--- 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 87980f2939aaeb2cba60694c0b1b57b018aeb74b..24056fd57d74ef627df41e11b52f11ecd45efa2f 100644 (file)
--- 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 87980f2939aaeb2cba60694c0b1b57b018aeb74b..24056fd57d74ef627df41e11b52f11ecd45efa2f 100644 (file)
--- 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 87980f2939aaeb2cba60694c0b1b57b018aeb74b..24056fd57d74ef627df41e11b52f11ecd45efa2f 100644 (file)
--- 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 87980f2939aaeb2cba60694c0b1b57b018aeb74b..24056fd57d74ef627df41e11b52f11ecd45efa2f 100644 (file)
--- 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 87980f2939aaeb2cba60694c0b1b57b018aeb74b..24056fd57d74ef627df41e11b52f11ecd45efa2f 100644 (file)
--- 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 b466a21707de82fcfdf7f8350c3f453682319fab..468170b42a13b96be537e34a582246f0ed91eae2 100644 (file)
--- 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 06e114ee837813f3f0c54dd002b221def95eb958..983947b8975b948aa03d4dfbe3cb4246647830ff 100644 (file)
--- 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 4e04df9382b1d952abf2ed42a0df0a7812a5f64a..4ae4a3b52ae96c87d48e1d172d161829124a356e 100644 (file)
--- 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 ea69fd23b61cc5446499c76e13b702286dced274..097d68c2375dc603ab94c315450c8b4ae1cb616a 100644 (file)
--- 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 e286e1a83297fb9f5670579c5e33808894942259..9424af5ce0c40be2b36e61131c8a4634e1eb0dba 100644 (file)
--- 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
 }