hm if we save the default style, we should also provide a function to

Sun Mar  1 18:41:07 1998  Tim Janik  <timj@gimp.org>

        * gtk/gtkwidget.c (gtk_widget_restore_default_style): hm if we save the
        default style, we should also provide a function to restore it ;).

        * gtk/main.[hc]: small fixups to idle handlers, added support for quit
        handlers.

diff --git a/ChangeLog b/ChangeLog
index 6fe1840e3925f36f36e5bdc037c8eedcc6ba599a..89e13b04f87c1365e02ab49adfe3baf545b4ea15 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Sun Mar  1 18:41:07 1998  Tim Janik  <timj@gimp.org>
+
+       * gtk/gtkwidget.c (gtk_widget_restore_default_style): hm if we save the
+       default style, we should also provide a function to restore it ;).
+
+       * gtk/main.[hc]: small fixups to idle handlers, added support for quit
+       handlers.
+
 Sun Mar  1 05:18:11 1998  Owen Taylor  <owt1@cornell.edu>
 
        * gtk/gtkentry.c gtk/gtktext.c gtkeditable.[ch]

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 6fe1840e3925f36f36e5bdc037c8eedcc6ba599a..89e13b04f87c1365e02ab49adfe3baf545b4ea15 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,11 @@
+Sun Mar  1 18:41:07 1998  Tim Janik  <timj@gimp.org>
+
+       * gtk/gtkwidget.c (gtk_widget_restore_default_style): hm if we save the
+       default style, we should also provide a function to restore it ;).
+
+       * gtk/main.[hc]: small fixups to idle handlers, added support for quit
+       handlers.
+
 Sun Mar  1 05:18:11 1998  Owen Taylor  <owt1@cornell.edu>
 
        * gtk/gtkentry.c gtk/gtktext.c gtkeditable.[ch]

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 6fe1840e3925f36f36e5bdc037c8eedcc6ba599a..89e13b04f87c1365e02ab49adfe3baf545b4ea15 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,11 @@
+Sun Mar  1 18:41:07 1998  Tim Janik  <timj@gimp.org>
+
+       * gtk/gtkwidget.c (gtk_widget_restore_default_style): hm if we save the
+       default style, we should also provide a function to restore it ;).
+
+       * gtk/main.[hc]: small fixups to idle handlers, added support for quit
+       handlers.
+
 Sun Mar  1 05:18:11 1998  Owen Taylor  <owt1@cornell.edu>
 
        * gtk/gtkentry.c gtk/gtktext.c gtkeditable.[ch]

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 6fe1840e3925f36f36e5bdc037c8eedcc6ba599a..89e13b04f87c1365e02ab49adfe3baf545b4ea15 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,11 @@
+Sun Mar  1 18:41:07 1998  Tim Janik  <timj@gimp.org>
+
+       * gtk/gtkwidget.c (gtk_widget_restore_default_style): hm if we save the
+       default style, we should also provide a function to restore it ;).
+
+       * gtk/main.[hc]: small fixups to idle handlers, added support for quit
+       handlers.
+
 Sun Mar  1 05:18:11 1998  Owen Taylor  <owt1@cornell.edu>
 
        * gtk/gtkentry.c gtk/gtktext.c gtkeditable.[ch]

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 6fe1840e3925f36f36e5bdc037c8eedcc6ba599a..89e13b04f87c1365e02ab49adfe3baf545b4ea15 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,11 @@
+Sun Mar  1 18:41:07 1998  Tim Janik  <timj@gimp.org>
+
+       * gtk/gtkwidget.c (gtk_widget_restore_default_style): hm if we save the
+       default style, we should also provide a function to restore it ;).
+
+       * gtk/main.[hc]: small fixups to idle handlers, added support for quit
+       handlers.
+
 Sun Mar  1 05:18:11 1998  Owen Taylor  <owt1@cornell.edu>
 
        * gtk/gtkentry.c gtk/gtktext.c gtkeditable.[ch]

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 6fe1840e3925f36f36e5bdc037c8eedcc6ba599a..89e13b04f87c1365e02ab49adfe3baf545b4ea15 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,11 @@
+Sun Mar  1 18:41:07 1998  Tim Janik  <timj@gimp.org>
+
+       * gtk/gtkwidget.c (gtk_widget_restore_default_style): hm if we save the
+       default style, we should also provide a function to restore it ;).
+
+       * gtk/main.[hc]: small fixups to idle handlers, added support for quit
+       handlers.
+
 Sun Mar  1 05:18:11 1998  Owen Taylor  <owt1@cornell.edu>
 
        * gtk/gtkentry.c gtk/gtktext.c gtkeditable.[ch]

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 6fe1840e3925f36f36e5bdc037c8eedcc6ba599a..89e13b04f87c1365e02ab49adfe3baf545b4ea15 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,11 @@
+Sun Mar  1 18:41:07 1998  Tim Janik  <timj@gimp.org>
+
+       * gtk/gtkwidget.c (gtk_widget_restore_default_style): hm if we save the
+       default style, we should also provide a function to restore it ;).
+
+       * gtk/main.[hc]: small fixups to idle handlers, added support for quit
+       handlers.
+
 Sun Mar  1 05:18:11 1998  Owen Taylor  <owt1@cornell.edu>
 
        * gtk/gtkentry.c gtk/gtktext.c gtkeditable.[ch]

diff --git a/docs/styles.txt b/docs/styles.txt
index 0975d6d2b99ea839af518365d2ef43643a06e400..051dc4b107544774bad0efbaf763182e82ff22b7 100644 (file)
--- a/docs/styles.txt
+++ b/docs/styles.txt
@@ -25,6 +25,11 @@ gtk_widget_set_rc_style ()
   restore the default style otherwise.
   This will override a previously set user style or rc style.
 
+gtk_widget_restore_default_style ()
+  Reset the widget's style to the default style, this is only usefull if
+  the widgets default style had been saved by previous calls to
+  gtk_widget_set_style() or gtk_widget_set_rc_style().
+
 gtk_widget_ensure_style ()
   Ensure taht the widget either has a user style set, or an rc lookup
   has been performed.

diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c
index e9e76a69af978a254d8a07fef5fc6ea5cab989bd..8416586514feebaef67785fe0d47659a94812daa 100644 (file)
--- a/gtk/gtkwidget.c
+++ b/gtk/gtkwidget.c
@@ -2411,6 +2411,24 @@ gtk_widget_set_rc_style (GtkWidget *widget)
     }
 }
 
+void
+gtk_widget_restore_default_style (GtkWidget *widget)
+{
+  GtkStyle *default_style;
+
+  g_return_if_fail (widget != NULL);
+
+  GTK_PRIVATE_UNSET_FLAG (widget, GTK_USER_STYLE);
+
+  default_style = gtk_object_get_data (GTK_OBJECT (widget), saved_default_style_key);
+  if (default_style)
+    {
+      gtk_object_remove_data (GTK_OBJECT (widget), saved_default_style_key);
+      gtk_widget_set_style_internal (widget, default_style, FALSE);
+      gtk_style_unref (default_style);
+    }
+}
+
 GtkStyle*
 gtk_widget_get_style (GtkWidget *widget)
 {