From ac209d13a328ed74d14ba14de8f562dd80b99d77 Mon Sep 17 00:00:00 2001 From: Sven Neumann Date: Tue, 29 Jul 2003 09:08:22 +0000 Subject: [PATCH] Resurrected documentation that got lost when the window parameter was 2003-07-29 Sven Neumann * gdk/tmpl/pixmaps.sgml: Resurrected documentation that got lost when the window parameter was renamed to drawable. --- docs/reference/ChangeLog | 5 +++ docs/reference/gdk-pixbuf/.cvsignore | 1 + docs/reference/gdk/.cvsignore | 1 + docs/reference/gdk/tmpl/pixmaps.sgml | 58 ++++++++-------------------- docs/reference/gtk/.cvsignore | 1 + 5 files changed, 25 insertions(+), 41 deletions(-) diff --git a/docs/reference/ChangeLog b/docs/reference/ChangeLog index 9e947c88d3..196fe62567 100644 --- a/docs/reference/ChangeLog +++ b/docs/reference/ChangeLog @@ -1,3 +1,8 @@ +2003-07-29 Sven Neumann + + * gdk/tmpl/pixmaps.sgml: Resurrected documentation that got lost + when the window parameter was renamed to drawable. + 2003-07-21 Matthias Clasen * gtk/tmpl/gtkdnd.sgml: It is GTK_DEST_DEFAULT_DROP, not GTK_DRAG_DEFAULT_DROP. (#117917, diff --git a/docs/reference/gdk-pixbuf/.cvsignore b/docs/reference/gdk-pixbuf/.cvsignore index dc7b80fbf0..0ce352549f 100644 --- a/docs/reference/gdk-pixbuf/.cvsignore +++ b/docs/reference/gdk-pixbuf/.cvsignore @@ -9,6 +9,7 @@ gdk-pixbuf.hierarchy gdk-pixbuf.interfaces gdk-pixbuf.prerequisites gdk-pixbuf.signals +deprecated html xml *.stamp diff --git a/docs/reference/gdk/.cvsignore b/docs/reference/gdk/.cvsignore index f21af13ff9..66034a82df 100644 --- a/docs/reference/gdk/.cvsignore +++ b/docs/reference/gdk/.cvsignore @@ -9,6 +9,7 @@ gdk.hierarchy gdk.interfaces gdk.prerequisites gdk.signals +deprecated html xml *.stamp diff --git a/docs/reference/gdk/tmpl/pixmaps.sgml b/docs/reference/gdk/tmpl/pixmaps.sgml index 83bde31d9e..890ac424ed 100644 --- a/docs/reference/gdk/tmpl/pixmaps.sgml +++ b/docs/reference/gdk/tmpl/pixmaps.sgml @@ -33,16 +33,14 @@ these types. Create a new pixmap with a given size and depth. -@drawable: +@drawable: A #GdkDrawable, used to determine default values +for the new pixmap. Can be %NULL if @depth is specified, @width: The width of the new pixmap in pixels. @height: The height of the new pixmap in pixels. @depth: The depth (number of bits per pixel) of the new pixmap. - If -1, and @window is not %NULL, the depth of the new - pixmap will be equal to that of @window. + If -1, and @drawable is not %NULL, the depth of the new + pixmap will be equal to that of @drawable. @Returns: the #GdkPixmap - -@window: a #GdkWindow, used to determine default values for the - new pixmap. Can be %NULL if @depth is specified, @@ -50,15 +48,13 @@ Create a new pixmap with a given size and depth. Creates a new bitmap from data in XBM format. -@drawable: +@drawable: a #GdkDrawable, used to determine default values +for the new pixmap. Can be %NULL, in which case the root +window is used. @data: a pointer to the XBM data. @width: the width of the new pixmap in pixels. @height: the height of the new pixmap in pixels. @Returns: the #GdkBitmap - -@window: a #GdkWindow, used to determine default values for the - new pixmap. Can be %NULL, in which case the root window is - used. @@ -66,7 +62,8 @@ Creates a new bitmap from data in XBM format. Create a two-color pixmap from data in XBM data. -@drawable: +@drawable: a #GdkDrawable, used to determine default values +for the new pixmap. Can be %NULL, if the depth is given. @data: a pointer to the data. @width: the width of the new pixmap in pixels. @height: the height of the new pixmap in pixels. @@ -74,9 +71,6 @@ Create a two-color pixmap from data in XBM data. @fg: the foreground color. @bg: the background color. @Returns: the #GdkPixmap - -@window: a #GdkWindow, used to determine default values for the - new pixmap. Can be %NULL, if the depth is given. @@ -84,7 +78,8 @@ Create a two-color pixmap from data in XBM data. Create a pixmap from a XPM file. -@drawable: +@drawable: a #GdkDrawable, used to determine default values +for the new pixmap. @mask: a pointer to a place to store a bitmap representing the transparency mask of the XPM file. Can be %NULL, in which case transparency will be ignored. @@ -93,9 +88,6 @@ that are transparent in the input file. Can be %NULL, in which case a default color will be used. @filename: the filename of a file containing XPM data. @Returns: the #GdkPixmap - -@window: a #GdkWindow, used to determine default values for the - new pixmap. @@ -103,7 +95,8 @@ in which case a default color will be used. Create a pixmap from a XPM file using a particular colormap. -@drawable: +@drawable: a #GdkDrawable, used to determine default values +for the new pixmap. Can be %NULL if @colormap is given. @colormap: the #GdkColormap that the new pixmap will be use. If omitted, the colormap for @window will be used. @mask: a pointer to a place to store a bitmap representing @@ -114,9 +107,6 @@ that are transparent in the input file. Can be %NULL, in which case a default color will be used. @filename: the filename of a file containing XPM data. @Returns: the #GdkPixmap. - -@window: a #GdkWindow, used to determine default values for the - new pixmap. Can be %NULL if @colormap is given. @@ -124,7 +114,8 @@ in which case a default color will be used. Create a pixmap from data in XPM format. -@drawable: +@drawable: a #GdkDrawable, used to determine default values +for the new pixmap. @mask: Pointer to a place to store a bitmap representing the transparency mask of the XPM file. Can be %NULL, in which case transparency will be ignored. @@ -133,9 +124,6 @@ that are transparent in the input file. Can be %NULL in which case a default color will be used. @data: Pointer to a string containing the XPM data. @Returns: the #GdkPixmap - -@window: a #GdkWindow, used to determine default values for the - new pixmap. @@ -144,7 +132,8 @@ Create a pixmap from data in XPM format using a particular colormap. -@drawable: +@drawable: a #GdkDrawable, used to determine default values +for the new pixmap. Can be %NULL if @colormap is given. @colormap: the #GdkColormap that the new pixmap will be use. If omitted, the colormap for @window will be used. @mask: a pointer to a place to store a bitmap representing @@ -155,9 +144,6 @@ that are transparent in the input file. Can be %NULL, in which case a default color will be used. @data: Pointer to a string containing the XPM data. @Returns: the #GdkPixmap. - -@window: a #GdkWindow, used to determine default values for the - new pixmap. Can be %NULL if @colormap is given. @@ -166,8 +152,6 @@ Deprecated equivalent of g_object_ref(). @Returns: @pixmap - -@pixmap: a #GdkPixmap @@ -175,9 +159,6 @@ Deprecated equivalent of g_object_ref(). Deprecated equivalent of g_object_unref(). - -@pixmap: a #GdkPixmap - @@ -195,8 +176,6 @@ Deprecated equivalent of g_object_ref(). @Returns: @pixmap - -@pixmap: a #GdkBitmap @@ -204,7 +183,4 @@ Deprecated equivalent of g_object_ref(). Deprecated equivalent of g_object_unref(). - -@pixmap: a #GdkBitmap - diff --git a/docs/reference/gtk/.cvsignore b/docs/reference/gtk/.cvsignore index 5f004bf398..f83a3544fb 100644 --- a/docs/reference/gtk/.cvsignore +++ b/docs/reference/gtk/.cvsignore @@ -10,6 +10,7 @@ gtk.hierarchy gtk.interfaces gtk.prerequisites gtk.signals +deprecated html xml *.stamp