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

Fixed up copyright message.

Browse Source 
Tue Nov 24 11:11:05 1998  Owen Taylor  <otaylor@redhat.com>

	* gtk/gtklayout.[ch]: Fixed up copyright message.

	* gdk/gdkrgb.c (DM): Make the dither matrix constant
	so it can be shared.

	* gtk/gtkdnd.c: Make cursor bitmaps const.

	* gdk/gdk.h gdk/gdkpixmap.c: Added const to
	gdk_pixmap/bitmap_create_from_data.
This commit is contained in:
Owen Taylor
1998-11-24 16:15:46 +00:00
committed by Owen Taylor
parent 5efb9be963
commit 1bb0d4c0f3
14 changed files with 182 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
gdk/x11/gdkpixmap-x11.c
View File

@ -87,10 +87,10 @@ gdk_pixmap_new (GdkWindow *window,
}
GdkPixmap *
gdk_bitmap_create_from_data (GdkWindow *window,
gchar *data,
gint width,
gint height)
gdk_bitmap_create_from_data (GdkWindow *window,
const gchar *data,
gint width,
gint height)
{
GdkPixmap *pixmap;
GdkWindowPrivate *private;
@ -122,7 +122,7 @@ gdk_bitmap_create_from_data (GdkWindow *window,
private->xwindow = XCreateBitmapFromData (private->xdisplay,
window_private->xwindow,
data, width, height);
(char *)data, width, height);
gdk_xid_table_insert (&private->xwindow, pixmap);
@ -130,13 +130,13 @@ gdk_bitmap_create_from_data (GdkWindow *window,
}
GdkPixmap*
gdk_pixmap_create_from_data (GdkWindow *window,
gchar *data,
gint width,
gint height,
gint depth,
GdkColor *fg,
GdkColor *bg)
gdk_pixmap_create_from_data (GdkWindow *window,
const gchar *data,
gint width,
gint height,
gint depth,
GdkColor *fg,
GdkColor *bg)
{
GdkPixmap *pixmap;
GdkWindowPrivate *private;
@ -174,7 +174,7 @@ gdk_pixmap_create_from_data (GdkWindow *window,
private->xwindow = XCreatePixmapFromBitmapData (private->xdisplay,
window_private->xwindow,
data, width, height,
(char *)data, width, height,
fg->pixel, bg->pixel, depth);
gdk_xid_table_insert (&private->xwindow, pixmap);