From b24876a79ce8909036f76b5a66a7db88fbab8e41 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Wed, 5 Oct 2005 13:23:21 +0000 Subject: [PATCH] Documentation improvements. (gtk_style_detach): Assert that the 2005-10-05 Matthias Clasen * gtk/gtkstyle.c (gtk_style_detach): (gtk_style_attach): Documentation improvements. (gtk_style_detach): Assert that the attach_count is > 0. --- ChangeLog | 6 ++++++ ChangeLog.pre-2-10 | 6 ++++++ gtk/gtkstyle.c | 13 +++++++++++++ 3 files changed, 25 insertions(+) diff --git a/ChangeLog b/ChangeLog index c113af9833..88ef5e0089 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2005-10-05 Matthias Clasen + + * gtk/gtkstyle.c (gtk_style_detach): + (gtk_style_attach): Documentation improvements. + (gtk_style_detach): Assert that the attach_count is > 0. + 2005-10-04 Federico Mena Quintero * gtk/gtkfilechooserdefault.c (switch_to_shortcut): Take a diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index c113af9833..88ef5e0089 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +2005-10-05 Matthias Clasen + + * gtk/gtkstyle.c (gtk_style_detach): + (gtk_style_attach): Documentation improvements. + (gtk_style_detach): Assert that the attach_count is > 0. + 2005-10-04 Federico Mena Quintero * gtk/gtkfilechooserdefault.c (switch_to_shortcut): Take a diff --git a/gtk/gtkstyle.c b/gtk/gtkstyle.c index 44a6573080..8df20d2c8e 100644 --- a/gtk/gtkstyle.c +++ b/gtk/gtkstyle.c @@ -716,6 +716,10 @@ gtk_style_new (void) * it to a particular visual and colormap. The process may * involve the creation of a new style if the style has already * been attached to a window with a different style and colormap. + * + * Since this function may return a new object, you have to use it + * in the following way: + * style = gtk_style_attach (style, window) **/ GtkStyle* gtk_style_attach (GtkStyle *style, @@ -792,10 +796,19 @@ gtk_style_attach (GtkStyle *style, return new_style; } +/** + * gtk_style_detach: + * @style: a #GtkStyle + * + * Detaches a style from a window. If the style is not attached + * to any windows anymore, it is unrealized. See gtk_style_attach(). + * + */ void gtk_style_detach (GtkStyle *style) { g_return_if_fail (GTK_IS_STYLE (style)); + g_return_if_fail (style->attach_count > 0); style->attach_count -= 1; if (style->attach_count == 0)