diff --git a/ChangeLog b/ChangeLog index c08bc63fed..e1ffa8e204 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,12 @@ +2003-09-12 Matthias Clasen + + * gdk/gdkdraw.c (gdk_draw_string, gdk_draw_text) + (gdk_draw_text_wc): Add deprecation notes. (#121955, Martin Pool) + 2003-09-11 Matthias Clasen + * gdk/gdkpango.c: Doc tweaks. + * tests/testgtk.c: Add table menu tests. * gtk/gtkmenu.c (gtk_menu_free_private): Don't forget to free the diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index c08bc63fed..e1ffa8e204 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,5 +1,12 @@ +2003-09-12 Matthias Clasen + + * gdk/gdkdraw.c (gdk_draw_string, gdk_draw_text) + (gdk_draw_text_wc): Add deprecation notes. (#121955, Martin Pool) + 2003-09-11 Matthias Clasen + * gdk/gdkpango.c: Doc tweaks. + * tests/testgtk.c: Add table menu tests. * gtk/gtkmenu.c (gtk_menu_free_private): Don't forget to free the diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index c08bc63fed..e1ffa8e204 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,5 +1,12 @@ +2003-09-12 Matthias Clasen + + * gdk/gdkdraw.c (gdk_draw_string, gdk_draw_text) + (gdk_draw_text_wc): Add deprecation notes. (#121955, Martin Pool) + 2003-09-11 Matthias Clasen + * gdk/gdkpango.c: Doc tweaks. + * tests/testgtk.c: Add table menu tests. * gtk/gtkmenu.c (gtk_menu_free_private): Don't forget to free the diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index c08bc63fed..e1ffa8e204 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,5 +1,12 @@ +2003-09-12 Matthias Clasen + + * gdk/gdkdraw.c (gdk_draw_string, gdk_draw_text) + (gdk_draw_text_wc): Add deprecation notes. (#121955, Martin Pool) + 2003-09-11 Matthias Clasen + * gdk/gdkpango.c: Doc tweaks. + * tests/testgtk.c: Add table menu tests. * gtk/gtkmenu.c (gtk_menu_free_private): Don't forget to free the diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index c08bc63fed..e1ffa8e204 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,5 +1,12 @@ +2003-09-12 Matthias Clasen + + * gdk/gdkdraw.c (gdk_draw_string, gdk_draw_text) + (gdk_draw_text_wc): Add deprecation notes. (#121955, Martin Pool) + 2003-09-11 Matthias Clasen + * gdk/gdkpango.c: Doc tweaks. + * tests/testgtk.c: Add table menu tests. * gtk/gtkmenu.c (gtk_menu_free_private): Don't forget to free the diff --git a/docs/reference/ChangeLog b/docs/reference/ChangeLog index 51127c597e..0ecf9cb9f1 100644 --- a/docs/reference/ChangeLog +++ b/docs/reference/ChangeLog @@ -1,3 +1,12 @@ +2003-09-12 Matthias Clasen + + * gdk/tmpl/drawing.sgml: Add deprecation note for gdk_draw_pixmap(). + +2003-09-11 Matthias Clasen + + * gdk/tmpl/drawing.sgml: Add hints about obtaining Pango + structures. (#121953, Martin Pool) + 2003-09-04 Matthias Clasen * gtk/gtk-sections.txt: Add GtkUIManagerItemType. diff --git a/docs/reference/gdk/tmpl/drawing.sgml b/docs/reference/gdk/tmpl/drawing.sgml index 6599ce8de5..838a00d91c 100644 --- a/docs/reference/gdk/tmpl/drawing.sgml +++ b/docs/reference/gdk/tmpl/drawing.sgml @@ -19,6 +19,12 @@ the number of arguments needed for each drawing operation. See the Graphics Contexts section for more information. + +Some of the drawing operations take Pango data structures like #PangoContext, +#PangoLayout or #PangoLayoutLine as arguments. If you're using GTK+, the ususal +way to obtain these structures is via gtk_widget_create_pango_context() or +gtk_widget_create_pango_layout(). + @@ -387,6 +393,7 @@ function. Draws a pixmap, or a part of a pixmap, onto another drawable. +@Deprecated: Use gdk_draw_drawable() instead. diff --git a/gdk/gdkdraw.c b/gdk/gdkdraw.c index b9062caadd..ae8bb124f1 100644 --- a/gdk/gdkdraw.c +++ b/gdk/gdkdraw.c @@ -519,6 +519,8 @@ gdk_draw_polygon (GdkDrawable *drawable, * @string: the string of characters to draw. * * Draws a string of characters in the given font or fontset. + * + * Deprecated: Use gdk_draw_layout() instead. **/ void gdk_draw_string (GdkDrawable *drawable, @@ -548,6 +550,8 @@ gdk_draw_string (GdkDrawable *drawable, * @text_length: the number of characters of @text to draw. * * Draws a number of characters in the given font or fontset. + * + * Deprecated: Use gdk_draw_layout() instead. **/ void gdk_draw_text (GdkDrawable *drawable, @@ -579,6 +583,8 @@ gdk_draw_text (GdkDrawable *drawable, * Draws a number of wide characters using the given font of fontset. * If the font is a 1-byte font, the string is converted into 1-byte * characters (discarding the high bytes) before output. + * + * Deprecated: Use gdk_draw_layout() instead. **/ void gdk_draw_text_wc (GdkDrawable *drawable, diff --git a/gdk/gdkpango.c b/gdk/gdkpango.c index db0c871359..0f24309d36 100644 --- a/gdk/gdkpango.c +++ b/gdk/gdkpango.c @@ -134,11 +134,11 @@ gdk_pango_free_gc (PangoContext *context, * @colormap: a #GdkColormap * * Sets the colormap to be used for drawing with @context. + * * If you obtained your context from gtk_widget_get_pango_context() or * gtk_widget_create_pango_context(), the colormap will already be set * to the colormap for the widget, so you shouldn't need this * function. - * **/ void gdk_pango_context_set_colormap (PangoContext *context, @@ -441,6 +441,9 @@ gdk_draw_layout_line_with_colors (GdkDrawable *drawable, * Render a #PangoLayout onto a #GdkDrawable, overriding the * layout's normal colors with @foreground and/or @background. * @foreground and @background need not be allocated. + * + * If you're using GTK+, the ususal way to obtain a #PangoLayout + * is gtk_widget_create_pango_layout(). */ void gdk_draw_layout_with_colors (GdkDrawable *drawable, @@ -515,6 +518,9 @@ gdk_draw_layout_line (GdkDrawable *drawable, * @layout: a #PangoLayout * * Render a #PangoLayout onto a GDK drawable + * + * If you're using GTK+, the ususal way to obtain a #PangoLayout + * is gtk_widget_create_pango_layout(). */ void gdk_draw_layout (GdkDrawable *drawable,