Rename to reset_rc_styles_recurse(). (#68084)

        * gtk/gtkwidget.c (gtk_widget_set_style_recurse): Rename to
        reset_rc_styles_recurse(). (#68084)

        * gtk/tmpl/gtkaccellabel.sgml: Remove duplicate docs.

        * gdk-pixbuf/Makefile.am (content_files): Add
        gdk-pixbuf-from-drawables.sgml. (#68232)

        * gtk/tmpl/gtkwidget.sgml: Improve docs for GTK_NO_REPARENT
        and GTK_APP_PAINTABLE. (#68060)

diff --git a/ChangeLog b/ChangeLog
index f453b00d978f735534a43249a118e6b18af2e09b..1120007b0052785087a311781d156bc76a601578 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-01-08  Matthias Clasen  <matthiasc@poet.de>
+
+       * gtk/gtkwidget.c (gtk_widget_set_style_recurse): Rename to
+       reset_rc_styles_recurse(). (#68084)
+
 2002-01-10            Vitaly Tishkov       <tvv@sparc.spb.su>
         * gtk/gtkimage.c
        * gtk/gtkimcontext.c
@@ -175,6 +180,7 @@ Wed Jan  9 11:23:39 2002  Tim Janik  <timj@gtk.org>
        * gtk/gtktreesortable.h : ditto.
        * gtk/gtkwidget.h : Don't reference incomplete _GdkRectangle type.
 
+>>>>>>> 1.2791
 2002-01-08  Matthias Clasen  <matthiasc@poet.de>
 
        * gtk/gtkplug.c, gtk/gtksocket.c: Speak of window IDs rather 

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index f453b00d978f735534a43249a118e6b18af2e09b..1120007b0052785087a311781d156bc76a601578 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,8 @@
+2002-01-08  Matthias Clasen  <matthiasc@poet.de>
+
+       * gtk/gtkwidget.c (gtk_widget_set_style_recurse): Rename to
+       reset_rc_styles_recurse(). (#68084)
+
 2002-01-10            Vitaly Tishkov       <tvv@sparc.spb.su>
         * gtk/gtkimage.c
        * gtk/gtkimcontext.c
@@ -175,6 +180,7 @@ Wed Jan  9 11:23:39 2002  Tim Janik  <timj@gtk.org>
        * gtk/gtktreesortable.h : ditto.
        * gtk/gtkwidget.h : Don't reference incomplete _GdkRectangle type.
 
+>>>>>>> 1.2791
 2002-01-08  Matthias Clasen  <matthiasc@poet.de>
 
        * gtk/gtkplug.c, gtk/gtksocket.c: Speak of window IDs rather 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index f453b00d978f735534a43249a118e6b18af2e09b..1120007b0052785087a311781d156bc76a601578 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2002-01-08  Matthias Clasen  <matthiasc@poet.de>
+
+       * gtk/gtkwidget.c (gtk_widget_set_style_recurse): Rename to
+       reset_rc_styles_recurse(). (#68084)
+
 2002-01-10            Vitaly Tishkov       <tvv@sparc.spb.su>
         * gtk/gtkimage.c
        * gtk/gtkimcontext.c
@@ -175,6 +180,7 @@ Wed Jan  9 11:23:39 2002  Tim Janik  <timj@gtk.org>
        * gtk/gtktreesortable.h : ditto.
        * gtk/gtkwidget.h : Don't reference incomplete _GdkRectangle type.
 
+>>>>>>> 1.2791
 2002-01-08  Matthias Clasen  <matthiasc@poet.de>
 
        * gtk/gtkplug.c, gtk/gtksocket.c: Speak of window IDs rather 

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index f453b00d978f735534a43249a118e6b18af2e09b..1120007b0052785087a311781d156bc76a601578 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,8 @@
+2002-01-08  Matthias Clasen  <matthiasc@poet.de>
+
+       * gtk/gtkwidget.c (gtk_widget_set_style_recurse): Rename to
+       reset_rc_styles_recurse(). (#68084)
+
 2002-01-10            Vitaly Tishkov       <tvv@sparc.spb.su>
         * gtk/gtkimage.c
        * gtk/gtkimcontext.c
@@ -175,6 +180,7 @@ Wed Jan  9 11:23:39 2002  Tim Janik  <timj@gtk.org>
        * gtk/gtktreesortable.h : ditto.
        * gtk/gtkwidget.h : Don't reference incomplete _GdkRectangle type.
 
+>>>>>>> 1.2791
 2002-01-08  Matthias Clasen  <matthiasc@poet.de>
 
        * gtk/gtkplug.c, gtk/gtksocket.c: Speak of window IDs rather 

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index f453b00d978f735534a43249a118e6b18af2e09b..1120007b0052785087a311781d156bc76a601578 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+2002-01-08  Matthias Clasen  <matthiasc@poet.de>
+
+       * gtk/gtkwidget.c (gtk_widget_set_style_recurse): Rename to
+       reset_rc_styles_recurse(). (#68084)
+
 2002-01-10            Vitaly Tishkov       <tvv@sparc.spb.su>
         * gtk/gtkimage.c
        * gtk/gtkimcontext.c
@@ -175,6 +180,7 @@ Wed Jan  9 11:23:39 2002  Tim Janik  <timj@gtk.org>
        * gtk/gtktreesortable.h : ditto.
        * gtk/gtkwidget.h : Don't reference incomplete _GdkRectangle type.
 
+>>>>>>> 1.2791
 2002-01-08  Matthias Clasen  <matthiasc@poet.de>
 
        * gtk/gtkplug.c, gtk/gtksocket.c: Speak of window IDs rather 

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index f453b00d978f735534a43249a118e6b18af2e09b..1120007b0052785087a311781d156bc76a601578 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+2002-01-08  Matthias Clasen  <matthiasc@poet.de>
+
+       * gtk/gtkwidget.c (gtk_widget_set_style_recurse): Rename to
+       reset_rc_styles_recurse(). (#68084)
+
 2002-01-10            Vitaly Tishkov       <tvv@sparc.spb.su>
         * gtk/gtkimage.c
        * gtk/gtkimcontext.c
@@ -175,6 +180,7 @@ Wed Jan  9 11:23:39 2002  Tim Janik  <timj@gtk.org>
        * gtk/gtktreesortable.h : ditto.
        * gtk/gtkwidget.h : Don't reference incomplete _GdkRectangle type.
 
+>>>>>>> 1.2791
 2002-01-08  Matthias Clasen  <matthiasc@poet.de>
 
        * gtk/gtkplug.c, gtk/gtksocket.c: Speak of window IDs rather 

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index f453b00d978f735534a43249a118e6b18af2e09b..1120007b0052785087a311781d156bc76a601578 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+2002-01-08  Matthias Clasen  <matthiasc@poet.de>
+
+       * gtk/gtkwidget.c (gtk_widget_set_style_recurse): Rename to
+       reset_rc_styles_recurse(). (#68084)
+
 2002-01-10            Vitaly Tishkov       <tvv@sparc.spb.su>
         * gtk/gtkimage.c
        * gtk/gtkimcontext.c
@@ -175,6 +180,7 @@ Wed Jan  9 11:23:39 2002  Tim Janik  <timj@gtk.org>
        * gtk/gtktreesortable.h : ditto.
        * gtk/gtkwidget.h : Don't reference incomplete _GdkRectangle type.
 
+>>>>>>> 1.2791
 2002-01-08  Matthias Clasen  <matthiasc@poet.de>
 
        * gtk/gtkplug.c, gtk/gtksocket.c: Speak of window IDs rather 

diff --git a/docs/reference/ChangeLog b/docs/reference/ChangeLog
index 16d51ac31037afea120c47c7fc678335c497efcf..838711553dd0e52a20d5318fcd178a1c9e100832 100644 (file)
--- a/docs/reference/ChangeLog
+++ b/docs/reference/ChangeLog
@@ -1,3 +1,13 @@
+2002-01-09  Matthias Clasen  <matthiasc@poet.de>
+
+       * gtk/tmpl/gtkaccellabel.sgml: Remove duplicate docs.
+       
+       * gdk-pixbuf/Makefile.am (content_files): Add 
+       gdk-pixbuf-from-drawables.sgml. (#68232)
+       
+       * gtk/tmpl/gtkwidget.sgml: Improve docs for GTK_NO_REPARENT
+       and GTK_APP_PAINTABLE. (#68060)
+
 2002-01-08  Matthias Clasen  <matthiasc@poet.de>
 
        * gtk/tmpl/gtkgc.sgml: Improve wording.

diff --git a/docs/reference/gdk-pixbuf/Makefile.am b/docs/reference/gdk-pixbuf/Makefile.am
index 4d1361cdbfb0a9d43be63b1a4b80a5b816a5058a..a47279e241d54fe206c74d799b53a86c24bf7c40 100644 (file)
--- a/docs/reference/gdk-pixbuf/Makefile.am
+++ b/docs/reference/gdk-pixbuf/Makefile.am
@@ -40,6 +40,7 @@ HTML_IMAGES =
 
 # Extra SGML files that are included by DOC_MAIN_SGML_FILE
 content_files =                                \
+       gdk-pixbuf-from-drawables.sgml  \
        gdk-pixbuf.sgml                 \
        porting-from-imlib.sgml
 

diff --git a/docs/reference/gtk/tmpl/gtkaccellabel.sgml b/docs/reference/gtk/tmpl/gtkaccellabel.sgml
index f8a416dbf53f8203b0809b94fbf2d6019ed2a5e3..27460fd6e383253e21ba584c42c13ba3d19d8524 100644 (file)
--- a/docs/reference/gtk/tmpl/gtkaccellabel.sgml
+++ b/docs/reference/gtk/tmpl/gtkaccellabel.sgml
@@ -114,11 +114,11 @@ Creates a new #GtkAccelLabel.
 
 <!-- ##### FUNCTION gtk_accel_label_set_accel_widget ##### -->
 <para>
-Sets the widget whose accelerators are to be shown.
+
 </para>
 
-@accel_label: a #GtkAccelLabel.
-@accel_widget: the widget whose accelerators are to be displayed.
+@accel_label: 
+@accel_widget:
 
 
 <!-- ##### FUNCTION gtk_accel_label_get_accel_width ##### -->

diff --git a/docs/reference/gtk/tmpl/gtkwidget.sgml b/docs/reference/gtk/tmpl/gtkwidget.sgml
index a576198d8daeba9108ab347471c5d4c13b6a758e..736f57129453367c762b496eb26932e77ff61513 100644 (file)
--- a/docs/reference/gtk/tmpl/gtkwidget.sgml
+++ b/docs/reference/gtk/tmpl/gtkwidget.sgml
@@ -76,9 +76,12 @@ Tells about certain properties of the widget.
 @GTK_COMPOSITE_CHILD: 
         Indicates that the widget is a composite child of its parent; see 
         gtk_widget_push_composite_child(), gtk_widget_pop_composite_child().
-@GTK_NO_REPARENT: 
+@GTK_NO_REPARENT:
+       Unused since before GTK+ 1.2, will be removed in a future version. 
 @GTK_APP_PAINTABLE: 
         Set and unset by gtk_widget_set_app_paintable().
+        Must be set on widgets whose window the application directly draws on, 
+       in order to keep GTK+ from overwriting the drawn stuff.
 @GTK_RECEIVES_DEFAULT: 
         The widget when focused will receive the default action and have 
         %GTK_HAS_DEFAULT set even if there is a different widget set as default.

diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c
index ee520ba8142ca89012de725f27b857181931038d..39f9e060c4a7914d278db15a61792ddea450a2c2 100644 (file)
--- a/gtk/gtkwidget.c
+++ b/gtk/gtkwidget.c
@@ -204,8 +204,6 @@ static void             gtk_widget_reset_rc_style               (GtkWidget
 static void            gtk_widget_set_style_internal           (GtkWidget        *widget,
                                                                 GtkStyle         *style,
                                                                 gboolean          initial_emission);
-static void            gtk_widget_set_style_recurse            (GtkWidget        *widget,
-                                                                gpointer          client_data);
 static gint            gtk_widget_event_internal               (GtkWidget        *widget,
                                                                 GdkEvent         *event);
 static gboolean                gtk_widget_real_mnemonic_activate       (GtkWidget        *widget,
@@ -3736,7 +3734,7 @@ gtk_widget_set_parent (GtkWidget *widget,
 
   gtk_widget_propagate_state (widget, &data);
   
-  gtk_widget_set_style_recurse (widget, NULL);
+  gtk_widget_reset_rc_styles (widget);
 
   gtk_signal_emit (GTK_OBJECT (widget), widget_signals[PARENT_SET], NULL);
   if (GTK_WIDGET_ANCHORED (widget->parent))
@@ -4182,19 +4180,6 @@ gtk_widget_set_style_internal (GtkWidget *widget,
   g_object_unref (G_OBJECT (widget));
 }
 
-static void
-gtk_widget_set_style_recurse (GtkWidget *widget,
-                             gpointer   client_data)
-{
-  if (GTK_WIDGET_RC_STYLE (widget))
-    gtk_widget_reset_rc_style (widget);
-  
-  if (GTK_IS_CONTAINER (widget))
-    gtk_container_forall (GTK_CONTAINER (widget),
-                         gtk_widget_set_style_recurse,
-                         NULL);
-}
-
 static void
 gtk_widget_propagate_hierarchy_changed_recurse (GtkWidget *widget,
                                                gpointer   client_data)
@@ -4247,12 +4232,24 @@ _gtk_widget_propagate_hierarchy_changed (GtkWidget    *widget,
     g_object_unref (previous_toplevel);
 }
 
+static void
+reset_rc_styles_recurse (GtkWidget *widget, gpointer data)
+{
+  if (GTK_WIDGET_RC_STYLE (widget))
+    gtk_widget_reset_rc_style (widget);
+  
+  if (GTK_IS_CONTAINER (widget))
+    gtk_container_forall (GTK_CONTAINER (widget),
+                         reset_rc_styles_recurse,
+                         NULL);
+}
+
 void
 gtk_widget_reset_rc_styles (GtkWidget *widget)
 {
   g_return_if_fail (GTK_IS_WIDGET (widget));
 
-  gtk_widget_set_style_recurse (widget, NULL);
+  reset_rc_styles_recurse (widget, NULL);
 }
 
 /**