callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove gdk_screen_close, add a section for GdkDisplayManager, add

Browse Source 
* gdk/gdk-sections.txt: Remove gdk_screen_close, add a section
	for GdkDisplayManager, add gdk_visual_get_screen and
	gdk_colormap_get_screen.
	* gdk/gdkdisplaymanager.c:
	* gdk/gdkdisplay.c (gdk_pointer_ungrab): Fix doc comments.

	* gdk/x11/gdkcolor-x11.c (gdk_colormap_get_screen):
	* gdk/x11/gdkimage-x11.c (gdk_image_new_bitmap): Make parameter
	names match those in the header file, to silence gtk-doc.
This commit is contained in:
Matthias Clasen
2002-08-12 21:34:45 +00:00
parent 12b90e7cfe
commit 592818d950
12 changed files with 96 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
gdk/x11/gdkimage-x11.c
View File

@ -146,8 +146,8 @@ _gdk_image_exit (void)
* gdk_image_new_bitmap:
* @visual: the #GdkVisual to use for the image.
* @data: the pixel data.
* @w: the width of the image in pixels.
* @h: the height of the image in pixels.
* @width: the width of the image in pixels.
* @height: the height of the image in pixels.
*
* Creates a new #GdkImage with a depth of 1 from the given data.
* <warning><para>THIS FUNCTION IS INCREDIBLY BROKEN. The passed-in data must
@ -157,7 +157,7 @@ _gdk_image_exit (void)
* Return value: a new #GdkImage.
**/
GdkImage *
gdk_image_new_bitmap(GdkVisual *visual, gpointer data, gint w, gint h)
gdk_image_new_bitmap(GdkVisual *visual, gpointer data, gint width, gint height)
{
Visual *xvisual;
GdkImage *image;
@ -171,8 +171,8 @@ gdk_image_new_bitmap(GdkVisual *visual, gpointer data, gint w, gint h)
image->type = GDK_IMAGE_NORMAL;
image->visual = visual;
image->width = w;
image->height = h;
image->width = width;
image->height = height;
image->depth = 1;
image->bits_per_pixel = 1;
if (display->closed)
@ -182,7 +182,7 @@ gdk_image_new_bitmap(GdkVisual *visual, gpointer data, gint w, gint h)
xvisual = ((GdkVisualPrivate*) visual)->xvisual;
private->ximage = XCreateImage (GDK_SCREEN_XDISPLAY (private->screen),
xvisual, 1, XYBitmap,
0, 0, w ,h, 8, 0);
0, 0, width, height, 8, 0);
}
private->ximage->data = data;