diff options
| author | Owen Taylor <otaylor@redhat.com> | 1998-11-24 16:15:46 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 1998-11-24 16:15:46 +0000 |
| commit | 1bb0d4c0f32d8cda26207a7c2048d647211f3340 (patch) | |
| tree | 652420216f6da8588a21e5deb5c7004d580a8286 /gdk/gdkpixmap.c | |
| parent | 5efb9be963cb79b9a1a7cd4ee1d58f645eae9832 (diff) | |
| download | gtk+-1bb0d4c0f32d8cda26207a7c2048d647211f3340.tar.gz | |
Fixed up copyright message.
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.
Diffstat (limited to 'gdk/gdkpixmap.c')
| -rw-r--r-- | gdk/gdkpixmap.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/gdk/gdkpixmap.c b/gdk/gdkpixmap.c index 3467388d46..f76e097d32 100644 --- a/gdk/gdkpixmap.c +++ b/gdk/gdkpixmap.c @@ -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); |