Commit d00b2b0a authored by Matthias Clasen's avatar Matthias Clasen

doc comment fixes.

parent ec84d8d1
2002-10-29 Matthias Clasen <maclas@gmx.de> 2002-10-29 Matthias Clasen <maclas@gmx.de>
* gdk/x11/gdkcolor-x11.c (gdk_colors_free): Use the same parameter
names in header, docs and implementation.
* gdk/gdkcolor.c (gdk_colors_store): Doc comment fix.
* gdk/x11/gdkcursor-x11.c (gdk_cursor_new_from_pixmap): Fix
example in doc comment.
* gtk/gtkiconfactory.c (gtk_icon_size_lookup_for_settings): * gtk/gtkiconfactory.c (gtk_icon_size_lookup_for_settings):
* gtk/gtkfilesel.c (gtk_file_selection_get_selections): Doc * gtk/gtkfilesel.c (gtk_file_selection_get_selections): Doc
comment fixes. (#97136, #97125, Vitaly Tishkov) comment fixes. (#97136, #97125, Vitaly Tishkov)
......
2002-10-29 Matthias Clasen <maclas@gmx.de> 2002-10-29 Matthias Clasen <maclas@gmx.de>
* gdk/x11/gdkcolor-x11.c (gdk_colors_free): Use the same parameter
names in header, docs and implementation.
* gdk/gdkcolor.c (gdk_colors_store): Doc comment fix.
* gdk/x11/gdkcursor-x11.c (gdk_cursor_new_from_pixmap): Fix
example in doc comment.
* gtk/gtkiconfactory.c (gtk_icon_size_lookup_for_settings): * gtk/gtkiconfactory.c (gtk_icon_size_lookup_for_settings):
* gtk/gtkfilesel.c (gtk_file_selection_get_selections): Doc * gtk/gtkfilesel.c (gtk_file_selection_get_selections): Doc
comment fixes. (#97136, #97125, Vitaly Tishkov) comment fixes. (#97136, #97125, Vitaly Tishkov)
......
2002-10-29 Matthias Clasen <maclas@gmx.de> 2002-10-29 Matthias Clasen <maclas@gmx.de>
* gdk/x11/gdkcolor-x11.c (gdk_colors_free): Use the same parameter
names in header, docs and implementation.
* gdk/gdkcolor.c (gdk_colors_store): Doc comment fix.
* gdk/x11/gdkcursor-x11.c (gdk_cursor_new_from_pixmap): Fix
example in doc comment.
* gtk/gtkiconfactory.c (gtk_icon_size_lookup_for_settings): * gtk/gtkiconfactory.c (gtk_icon_size_lookup_for_settings):
* gtk/gtkfilesel.c (gtk_file_selection_get_selections): Doc * gtk/gtkfilesel.c (gtk_file_selection_get_selections): Doc
comment fixes. (#97136, #97125, Vitaly Tishkov) comment fixes. (#97136, #97125, Vitaly Tishkov)
......
2002-10-29 Matthias Clasen <maclas@gmx.de> 2002-10-29 Matthias Clasen <maclas@gmx.de>
* gdk/x11/gdkcolor-x11.c (gdk_colors_free): Use the same parameter
names in header, docs and implementation.
* gdk/gdkcolor.c (gdk_colors_store): Doc comment fix.
* gdk/x11/gdkcursor-x11.c (gdk_cursor_new_from_pixmap): Fix
example in doc comment.
* gtk/gtkiconfactory.c (gtk_icon_size_lookup_for_settings): * gtk/gtkiconfactory.c (gtk_icon_size_lookup_for_settings):
* gtk/gtkfilesel.c (gtk_file_selection_get_selections): Doc * gtk/gtkfilesel.c (gtk_file_selection_get_selections): Doc
comment fixes. (#97136, #97125, Vitaly Tishkov) comment fixes. (#97136, #97125, Vitaly Tishkov)
......
2002-10-29 Matthias Clasen <maclas@gmx.de> 2002-10-29 Matthias Clasen <maclas@gmx.de>
* gdk/x11/gdkcolor-x11.c (gdk_colors_free): Use the same parameter
names in header, docs and implementation.
* gdk/gdkcolor.c (gdk_colors_store): Doc comment fix.
* gdk/x11/gdkcursor-x11.c (gdk_cursor_new_from_pixmap): Fix
example in doc comment.
* gtk/gtkiconfactory.c (gtk_icon_size_lookup_for_settings): * gtk/gtkiconfactory.c (gtk_icon_size_lookup_for_settings):
* gtk/gtkfilesel.c (gtk_file_selection_get_selections): Doc * gtk/gtkfilesel.c (gtk_file_selection_get_selections): Doc
comment fixes. (#97136, #97125, Vitaly Tishkov) comment fixes. (#97136, #97125, Vitaly Tishkov)
......
2002-10-29 Matthias Clasen <maclas@gmx.de> 2002-10-29 Matthias Clasen <maclas@gmx.de>
* gdk/x11/gdkcolor-x11.c (gdk_colors_free): Use the same parameter
names in header, docs and implementation.
* gdk/gdkcolor.c (gdk_colors_store): Doc comment fix.
* gdk/x11/gdkcursor-x11.c (gdk_cursor_new_from_pixmap): Fix
example in doc comment.
* gtk/gtkiconfactory.c (gtk_icon_size_lookup_for_settings): * gtk/gtkiconfactory.c (gtk_icon_size_lookup_for_settings):
* gtk/gtkfilesel.c (gtk_file_selection_get_selections): Doc * gtk/gtkfilesel.c (gtk_file_selection_get_selections): Doc
comment fixes. (#97136, #97125, Vitaly Tishkov) comment fixes. (#97136, #97125, Vitaly Tishkov)
......
...@@ -82,8 +82,6 @@ gdk_colormap_get_visual (GdkColormap *colormap) ...@@ -82,8 +82,6 @@ gdk_colormap_get_visual (GdkColormap *colormap)
* Changes the value of the first @ncolors colors in * Changes the value of the first @ncolors colors in
* a private colormap. This function is obsolete and * a private colormap. This function is obsolete and
* should not be used. See gdk_color_change(). * should not be used. See gdk_color_change().
*
* Return value:
**/ **/
void void
gdk_colors_store (GdkColormap *colormap, gdk_colors_store (GdkColormap *colormap,
......
...@@ -604,8 +604,8 @@ gdk_colors_alloc (GdkColormap *colormap, ...@@ -604,8 +604,8 @@ gdk_colors_alloc (GdkColormap *colormap,
/** /**
* gdk_colors_free: * gdk_colors_free:
* @colormap: a #GdkColormap. * @colormap: a #GdkColormap.
* @in_pixels: the pixel values of the colors to free. * @pixels: the pixel values of the colors to free.
* @in_npixels: the number of values in @pixels. * @npixels: the number of values in @pixels.
* @planes: the plane masks for all planes to free, OR'd together. * @planes: the plane masks for all planes to free, OR'd together.
* *
* Frees colors allocated with gdk_colors_alloc(). This * Frees colors allocated with gdk_colors_alloc(). This
...@@ -613,17 +613,17 @@ gdk_colors_alloc (GdkColormap *colormap, ...@@ -613,17 +613,17 @@ gdk_colors_alloc (GdkColormap *colormap,
**/ **/
void void
gdk_colors_free (GdkColormap *colormap, gdk_colors_free (GdkColormap *colormap,
gulong *in_pixels, gulong *pixels,
gint in_npixels, gint npixels,
gulong planes) gulong planes)
{ {
GdkColormapPrivateX11 *private; GdkColormapPrivateX11 *private;
gulong *pixels; gulong *pixels_to_free;
gint npixels = 0; gint npixels_to_free = 0;
gint i; gint i;
g_return_if_fail (GDK_IS_COLORMAP (colormap)); g_return_if_fail (GDK_IS_COLORMAP (colormap));
g_return_if_fail (in_pixels != NULL); g_return_if_fail (pixels != NULL);
private = GDK_COLORMAP_PRIVATE_DATA (colormap); private = GDK_COLORMAP_PRIVATE_DATA (colormap);
...@@ -631,11 +631,11 @@ gdk_colors_free (GdkColormap *colormap, ...@@ -631,11 +631,11 @@ gdk_colors_free (GdkColormap *colormap,
(colormap->visual->type != GDK_VISUAL_GRAYSCALE)) (colormap->visual->type != GDK_VISUAL_GRAYSCALE))
return; return;
pixels = g_new (gulong, in_npixels); pixels_to_free = g_new (gulong, npixels);
for (i=0; i<in_npixels; i++) for (i=0; i<npixels; i++)
{ {
gulong pixel = in_pixels[i]; gulong pixel = pixels[i];
if (private->info[pixel].ref_count) if (private->info[pixel].ref_count)
{ {
...@@ -643,7 +643,7 @@ gdk_colors_free (GdkColormap *colormap, ...@@ -643,7 +643,7 @@ gdk_colors_free (GdkColormap *colormap,
if (private->info[pixel].ref_count == 0) if (private->info[pixel].ref_count == 0)
{ {
pixels[npixels++] = pixel; pixels_to_free[npixels_to_free++] = pixel;
if (!(private->info[pixel].flags & GDK_COLOR_WRITEABLE)) if (!(private->info[pixel].flags & GDK_COLOR_WRITEABLE))
g_hash_table_remove (private->hash, &colormap->colors[pixel]); g_hash_table_remove (private->hash, &colormap->colors[pixel]);
private->info[pixel].flags = 0; private->info[pixel].flags = 0;
...@@ -651,10 +651,10 @@ gdk_colors_free (GdkColormap *colormap, ...@@ -651,10 +651,10 @@ gdk_colors_free (GdkColormap *colormap,
} }
} }
if (npixels && !private->screen->closed) if (npixels_to_free && !private->screen->closed)
XFreeColors (GDK_SCREEN_XDISPLAY (private->screen), private->xcolormap, XFreeColors (GDK_SCREEN_XDISPLAY (private->screen), private->xcolormap,
pixels, npixels, planes); pixels_to_free, npixels_to_free, planes);
g_free (pixels); g_free (pixels_to_free);
} }
/* This is almost identical to gdk_colors_free. /* This is almost identical to gdk_colors_free.
......
...@@ -151,19 +151,19 @@ gdk_cursor_new_for_display (GdkDisplay *display, ...@@ -151,19 +151,19 @@ gdk_cursor_new_for_display (GdkDisplay *display,
* 0x80, 0x01, 0x40, 0x02, 0x20, 0x04, 0x10, 0x08, 0x08, 0x10, 0x04, 0x20, * 0x80, 0x01, 0x40, 0x02, 0x20, 0x04, 0x10, 0x08, 0x08, 0x10, 0x04, 0x20,
* 0x82, 0x41, 0x41, 0x82, 0x41, 0x82, 0x82, 0x41, 0x04, 0x20, 0x08, 0x10, * 0x82, 0x41, 0x41, 0x82, 0x41, 0x82, 0x82, 0x41, 0x04, 0x20, 0x08, 0x10,
* 0x10, 0x08, 0x20, 0x04, 0x40, 0x02, 0x80, 0x01}; * 0x10, 0x08, 0x20, 0x04, 0x40, 0x02, 0x80, 0x01};
* *
* static unsigned char cursor1mask_bits[] = { * static unsigned char cursor1mask_bits[] = {
* 0x80, 0x01, 0xc0, 0x03, 0x60, 0x06, 0x30, 0x0c, 0x18, 0x18, 0x8c, 0x31, * 0x80, 0x01, 0xc0, 0x03, 0x60, 0x06, 0x30, 0x0c, 0x18, 0x18, 0x8c, 0x31,
* 0xc6, 0x63, 0x63, 0xc6, 0x63, 0xc6, 0xc6, 0x63, 0x8c, 0x31, 0x18, 0x18, * 0xc6, 0x63, 0x63, 0xc6, 0x63, 0xc6, 0xc6, 0x63, 0x8c, 0x31, 0x18, 0x18,
* 0x30, 0x0c, 0x60, 0x06, 0xc0, 0x03, 0x80, 0x01}; * 0x30, 0x0c, 0x60, 0x06, 0xc0, 0x03, 0x80, 0x01};
* *
* *
* GdkCursor *cursor; * GdkCursor *cursor;
* GdkPixmap *source, *mask; * GdkPixmap *source, *mask;
* GdkColor fg = { 0, 65535, 0, 0 }; /<!-- -->* Red. *<!-- -->/ * GdkColor fg = { 0, 65535, 0, 0 }; /<!-- -->* Red. *<!-- -->/
* GdkColor bg = { 0, 0, 0, 65535 }; /<!-- -->* Blue. *<!-- -->/ * GdkColor bg = { 0, 0, 0, 65535 }; /<!-- -->* Blue. *<!-- -->/
* *
* *
* source = gdk_bitmap_create_from_data (NULL, cursor1_bits, * source = gdk_bitmap_create_from_data (NULL, cursor1_bits,
* cursor1_width, cursor1_height); * cursor1_width, cursor1_height);
* mask = gdk_bitmap_create_from_data (NULL, cursor1mask_bits, * mask = gdk_bitmap_create_from_data (NULL, cursor1mask_bits,
...@@ -171,8 +171,8 @@ gdk_cursor_new_for_display (GdkDisplay *display, ...@@ -171,8 +171,8 @@ gdk_cursor_new_for_display (GdkDisplay *display,
* cursor = gdk_cursor_new_from_pixmap (source, mask, &amp;fg, &amp;bg, 8, 8); * cursor = gdk_cursor_new_from_pixmap (source, mask, &amp;fg, &amp;bg, 8, 8);
* gdk_pixmap_unref (source); * gdk_pixmap_unref (source);
* gdk_pixmap_unref (mask); * gdk_pixmap_unref (mask);
* *
* *
* gdk_window_set_cursor (widget->window, cursor); * gdk_window_set_cursor (widget->window, cursor);
* </programlisting> * </programlisting>
* </example> * </example>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment