diff options
| author | Tim Janik <timj@gtk.org> | 1998-06-17 08:48:22 +0000 |
|---|---|---|
| committer | Tim Janik <timj@src.gnome.org> | 1998-06-17 08:48:22 +0000 |
| commit | 7d0331a679c00c20db87822739e7544c67c6c2fe (patch) | |
| tree | ca044e4a14619f6534aff6997b4212d6a0535fba /gtk/gtkpixmap.h | |
| parent | 7bb4d7d961d2856f235db861c93a4838ae7b4f50 (diff) | |
| download | gdk-pixbuf-7d0331a679c00c20db87822739e7544c67c6c2fe.tar.gz | |
new function gdk_window_at_pointer() to retrive the current GdkWindow the
Wed Jun 17 03:47:40 1998 Tim Janik <timj@gtk.org>
* gdk/gdk.h:
* gdk/gdkwindow.c: new function gdk_window_at_pointer() to retrive
the current GdkWindow the pointer is on if there is any.
* gtk/gtktable.c (gtk_table_init): preallocate a table with one row
and one column, so we don't construction logic at all. changed a few
(x < y - 1) to (x + 1 < y), to avoid failing evaluations due to
unsigned int wraps.
* gtk/gtkwidget.c (gtk_widget_set_parent): removed left over code
portion, added an additional check for parent != widget.
* more GtkType and macro fixups.
Diffstat (limited to 'gtk/gtkpixmap.h')
| -rw-r--r-- | gtk/gtkpixmap.h | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/gtk/gtkpixmap.h b/gtk/gtkpixmap.h index 9a7d5ad6a..fbcc74c6f 100644 --- a/gtk/gtkpixmap.h +++ b/gtk/gtkpixmap.h @@ -8,7 +8,7 @@ * * 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 + * 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 @@ -26,21 +26,24 @@ #ifdef __cplusplus extern "C" { +#pragma } #endif /* __cplusplus */ -#define GTK_PIXMAP(obj) GTK_CHECK_CAST (obj, gtk_pixmap_get_type (), GtkPixmap) -#define GTK_PIXMAP_CLASS(klass) GTK_CHECK_CLASS_CAST (klass, gtk_pixmap_get_type (), GtkPixmapClass) -#define GTK_IS_PIXMAP(obj) GTK_CHECK_TYPE (obj, gtk_pixmap_get_type ()) +#define GTK_TYPE_PIXMAP (gtk_pixmap_get_type ()) +#define GTK_PIXMAP(obj) (GTK_CHECK_CAST ((obj), GTK_TYPE_PIXMAP, GtkPixmap)) +#define GTK_PIXMAP_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_PIXMAP, GtkPixmapClass)) +#define GTK_IS_PIXMAP(obj) (GTK_CHECK_TYPE ((obj), GTK_TYPE_PIXMAP)) +#define GTK_IS_PIXMAP_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_PIXMAP)) -typedef struct _GtkPixmap GtkPixmap; -typedef struct _GtkPixmapClass GtkPixmapClass; +typedef struct _GtkPixmap GtkPixmap; +typedef struct _GtkPixmapClass GtkPixmapClass; struct _GtkPixmap { GtkMisc misc; - + GdkPixmap *pixmap; GdkBitmap *mask; }; @@ -51,13 +54,13 @@ struct _GtkPixmapClass }; -guint gtk_pixmap_get_type (void); -GtkWidget* gtk_pixmap_new (GdkPixmap *pixmap, +GtkType gtk_pixmap_get_type (void); +GtkWidget* gtk_pixmap_new (GdkPixmap *pixmap, GdkBitmap *mask); -void gtk_pixmap_set (GtkPixmap *pixmap, +void gtk_pixmap_set (GtkPixmap *pixmap, GdkPixmap *val, GdkBitmap *mask); -void gtk_pixmap_get (GtkPixmap *pixmap, +void gtk_pixmap_get (GtkPixmap *pixmap, GdkPixmap **val, GdkBitmap **mask); |