+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.
+
Tue Nov 24 07:46:09 1998 Tim Janik <timj@gtk.org>
* docs/Changes-1.2.txt: added a section on scrolled windows and
+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.
+
Tue Nov 24 07:46:09 1998 Tim Janik <timj@gtk.org>
* docs/Changes-1.2.txt: added a section on scrolled windows and
+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.
+
Tue Nov 24 07:46:09 1998 Tim Janik <timj@gtk.org>
* docs/Changes-1.2.txt: added a section on scrolled windows and
+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.
+
Tue Nov 24 07:46:09 1998 Tim Janik <timj@gtk.org>
* docs/Changes-1.2.txt: added a section on scrolled windows and
+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.
+
Tue Nov 24 07:46:09 1998 Tim Janik <timj@gtk.org>
* docs/Changes-1.2.txt: added a section on scrolled windows and
+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.
+
Tue Nov 24 07:46:09 1998 Tim Janik <timj@gtk.org>
* docs/Changes-1.2.txt: added a section on scrolled windows and
+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.
+
Tue Nov 24 07:46:09 1998 Tim Janik <timj@gtk.org>
* docs/Changes-1.2.txt: added a section on scrolled windows and
gint width,
gint height,
gint depth);
-GdkBitmap* gdk_bitmap_create_from_data (GdkWindow *window,
- gchar *data,
- gint width,
- gint height);
-GdkPixmap* gdk_pixmap_create_from_data (GdkWindow *window,
- gchar *data,
- gint width,
- gint height,
- gint depth,
- GdkColor *fg,
- GdkColor *bg);
+GdkBitmap* gdk_bitmap_create_from_data (GdkWindow *window,
+ const gchar *data,
+ gint width,
+ gint height);
+GdkPixmap* gdk_pixmap_create_from_data (GdkWindow *window,
+ const gchar *data,
+ gint width,
+ gint height,
+ gint depth,
+ GdkColor *fg,
+ GdkColor *bg);
GdkPixmap* gdk_pixmap_create_from_xpm (GdkWindow *window,
GdkBitmap **mask,
GdkColor *transparent_color,
}
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;
private->xwindow = XCreateBitmapFromData (private->xdisplay,
window_private->xwindow,
- data, width, height);
+ (char *)data, width, height);
gdk_xid_table_insert (&private->xwindow, pixmap);
}
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;
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);
#define DM_WIDTH 128
#define DM_WIDTH_SHIFT 7
#define DM_HEIGHT 128
-static guchar DM[128][128] =
+static const guchar DM[128][128] =
{
{ 0, 41, 23, 5, 17, 39, 7, 15, 62, 23, 40, 51, 31, 47, 9, 32, 52, 27, 57, 25, 6, 61, 27, 52, 37, 7, 40, 63, 18, 36, 10, 42, 25, 62, 45, 34, 20, 42, 37, 14, 35, 29, 50, 10, 61, 2, 40, 8, 37, 12, 58, 22, 5, 41, 10, 39, 0, 60, 11, 46, 2, 55, 38, 17, 36, 59, 13, 54, 37, 56, 8, 29, 16, 13, 63, 22, 41, 55, 7, 20, 49, 14, 23, 55, 37, 23, 19, 36, 15, 49, 23, 63, 30, 14, 38, 27, 53, 13, 22, 41, 19, 31, 7, 19, 50, 30, 49, 16, 3, 32, 56, 40, 29, 34, 8, 48, 19, 45, 4, 51, 12, 46, 35, 49, 16, 42, 12, 62 },
{ 30, 57, 36, 54, 47, 34, 52, 27, 43, 4, 28, 7, 17, 36, 62, 13, 44, 7, 18, 48, 33, 21, 44, 14, 30, 47, 12, 33, 5, 55, 31, 58, 13, 30, 4, 17, 52, 10, 60, 26, 46, 0, 39, 27, 42, 22, 47, 25, 60, 32, 9, 38, 48, 17, 59, 30, 49, 18, 34, 25, 51, 19, 5, 48, 21, 8, 28, 46, 1, 32, 41, 19, 54, 47, 37, 18, 28, 11, 44, 30, 39, 56, 2, 33, 8, 42, 61, 28, 58, 8, 46, 9, 41, 4, 58, 7, 21, 48, 59, 10, 52, 14, 42, 57, 12, 25, 7, 53, 42, 24, 11, 50, 17, 59, 42, 2, 36, 60, 32, 17, 63, 29, 21, 7, 59, 32, 24, 39 },
guchar *obuf, *obptr;
guchar *bptr, *bp2;
gint r, g, b;
- guchar *dmp;
+ const guchar *dmp;
gint dith;
bptr = buf;
guchar *obuf, *obptr;
guchar *bptr, *bp2;
gint r, g, b;
- guchar *dmp;
+ const guchar *dmp;
gint dith;
gint rs, gs, bs;
gint i;
gint dith;
gint r1, g1, b1;
- guchar *dmp;
+ const guchar *dmp;
r_right = 8 - image_info->visual->red_prec;
r_left = image_info->visual->red_shift;
gint shift, shift_init;
gint dith;
gint r1, g1, b1;
- guchar *dmp;
+ const guchar *dmp;
r_right = 8 - image_info->visual->red_prec;
r_left = image_info->visual->red_shift;
guchar *obuf, *obptr;
guchar *bptr, *bp2;
gint r, g, b;
- guchar *dmp;
+ const guchar *dmp;
gint dith;
bptr = buf;
guchar *obuf, *obptr;
guchar *bptr, *bp2;
gint r, g, b;
- guchar *dmp;
+ const guchar *dmp;
gint prec, right;
gint gray;
guchar *obuf, *obptr;
guchar *bptr, *bp2;
gint r, g, b;
- guchar *dmp;
+ const guchar *dmp;
gint prec, right;
gint gray;
guchar pix0, pix1;
guchar *obuf, *obptr;
guchar *bptr, *bp2;
gint r, g, b;
- guchar *dmp;
+ const guchar *dmp;
gint dith;
guchar byte;
}
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;
private->xwindow = XCreateBitmapFromData (private->xdisplay,
window_private->xwindow,
- data, width, height);
+ (char *)data, width, height);
gdk_xid_table_insert (&private->xwindow, pixmap);
}
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;
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);
#define action_ask_width 16
#define action_ask_height 16
-static char action_ask_bits[] = {
+static const char action_ask_bits[] = {
0x00, 0x00, 0xfe, 0x7f, 0xfe, 0x1f, 0x06, 0xc0, 0x76, 0xf8, 0xb6, 0xf7,
0xd6, 0xec, 0x66, 0xdb, 0x66, 0xdb, 0x96, 0xec, 0x76, 0xf7, 0x76, 0xfb,
0xf6, 0xfc, 0x72, 0xfb, 0x7a, 0xfb, 0xf8, 0xfc, };
#define action_ask_mask_width 16
#define action_ask_mask_height 16
-static char action_ask_mask_bits[] = {
+static const char action_ask_mask_bits[] = {
0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0x8f, 0x07, 0xcf, 0x0f,
0xef, 0x1f, 0xff, 0x3c, 0xff, 0x3c, 0x6f, 0x1f, 0x8f, 0x0f, 0x8f, 0x07,
0x0f, 0x03, 0x8f, 0x07, 0x87, 0x07, 0x07, 0x03, };
#define action_copy_width 16
#define action_copy_height 16
-static char action_copy_bits[] = {
+static const char action_copy_bits[] = {
0x00, 0x00, 0xfe, 0x7f, 0xfe, 0x1f, 0x06, 0xc0, 0x76, 0xfb, 0x76, 0xfb,
0x76, 0xfb, 0x06, 0x83, 0xf6, 0xbf, 0xf6, 0xbf, 0x06, 0x83, 0x76, 0xfb,
0x76, 0xfb, 0x72, 0xfb, 0x7a, 0xf8, 0xf8, 0xff, };
#define action_copy_mask_width 16
#define action_copy_mask_height 16
-static char action_copy_mask_bits[] = {
+static const char action_copy_mask_bits[] = {
0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0x8f, 0x07, 0x8f, 0x07,
0x8f, 0x07, 0xff, 0x7f, 0xff, 0x7f, 0xff, 0x7f, 0xff, 0x7f, 0x8f, 0x07,
0x8f, 0x07, 0x8f, 0x07, 0x87, 0x07, 0x07, 0x00, };
#define action_move_width 16
#define action_move_height 16
-static char action_move_bits[] = {
+static const char action_move_bits[] = {
0x00, 0x00, 0xfe, 0x7f, 0xfe, 0x1f, 0x06, 0xc0, 0x96, 0xff, 0x26, 0xff,
0xc6, 0xf8, 0xd6, 0xe3, 0x96, 0x8f, 0xb6, 0xbf, 0x36, 0xc3, 0x76, 0xfb,
0x76, 0xfa, 0xf2, 0xfa, 0xfa, 0xf8, 0xf8, 0xff, };
#define action_move_mask_width 16
#define action_move_mask_height 16
-static char action_move_mask_bits[] = {
+static const char action_move_mask_bits[] = {
0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0x6f, 0x00, 0xff, 0x00,
0xff, 0x07, 0xef, 0x1f, 0xef, 0x7f, 0xcf, 0x7f, 0xcf, 0x3f, 0x8f, 0x07,
0x8f, 0x07, 0x0f, 0x07, 0x07, 0x07, 0x07, 0x00, };
#define action_link_width 16
#define action_link_height 16
-static char action_link_bits[] = {
+static const char action_link_bits[] = {
0x00, 0x00, 0xfe, 0x7f, 0xfe, 0x1f, 0x06, 0xc0, 0x36, 0xf8, 0xd6, 0xf7,
0x66, 0xec, 0xa6, 0xe8, 0x26, 0xdf, 0xe6, 0xbd, 0xd6, 0xa7, 0xb6, 0xa8,
0xb6, 0xb1, 0x72, 0xdf, 0xfa, 0xe0, 0xf8, 0xff, };
#define action_link_mask_width 16
#define action_link_mask_height 16
-static char action_link_mask_bits[] = {
+static const char action_link_mask_bits[] = {
0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0xcf, 0x07, 0xef, 0x0f,
0xff, 0x1f, 0x7f, 0x1f, 0xff, 0x3f, 0xff, 0x7f, 0xef, 0x7f, 0xcf, 0x77,
0xcf, 0x7f, 0x8f, 0x3f, 0x07, 0x1f, 0x07, 0x00, };
#define action_none_width 16
#define action_none_height 16
-static char action_none_bits[] = {
+static const char action_none_bits[] = {
0x00, 0x00, 0xfe, 0x7f, 0xfe, 0x1f, 0x06, 0xc0, 0xf6, 0xff, 0xf6, 0xff,
0xf6, 0xff, 0xf6, 0xff, 0xf6, 0xff, 0xf6, 0xff, 0xf6, 0xff, 0xf6, 0xff,
0xf6, 0xff, 0xf2, 0xff, 0xfa, 0xff, 0xf8, 0xff, };
#define action_none_mask_width 16
#define action_none_mask_height 16
-static char action_none_mask_bits[] = {
+static const char action_none_mask_bits[] = {
0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0x0f, 0x00, 0x0f, 0x00,
0x0f, 0x00, 0x0f, 0x00, 0x0f, 0x00, 0x0f, 0x00, 0x0f, 0x00, 0x0f, 0x00,
0x0f, 0x00, 0x0f, 0x00, 0x07, 0x00, 0x07, 0x00, };
static struct {
GdkDragAction action;
- char *bits;
- char *mask;
+ const char *bits;
+ const char *mask;
GdkCursor *cursor;
} drag_cursors[] = {
{ GDK_ACTION_DEFAULT, 0 },
-/* Copyright Owen Taylor, 1998
- *
- * This file may be distributed under either the terms of the
- * Netscape Public License, or the GNU Library General Public License
+/* GTK - The GIMP Toolkit
+ * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ *
+ * GtkLayout: Widget for scrolling of arbitrary-sized areas.
*
- * Note: No GTK+ or Mozilla code should be added to this file.
- * The coding style should be that of the the GTK core.
+ * Copyright Owen Taylor, 1998
*/
#include "gtklayout.h"
-/* Copyright Owen Taylor, 1998
- *
- * This file may be distributed under either the terms of the
- * Netscape Public License, or the GNU Library General Public License
+/* GTK - The GIMP Toolkit
+ * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
*
- * Note: No GTK+ or Mozilla code should be added to this file.
- * The coding style should be that of the the GTK core.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ *
+ * GtkLayout: Widget for scrolling of arbitrary-sized areas.
+ *
+ * Copyright Owen Taylor, 1998
*/
#ifndef __GTK_LAYOUT_H
projects / ~andy / gtk / commitdiff