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/gtkmisc.h | |
| parent | 7bb4d7d961d2856f235db861c93a4838ae7b4f50 (diff) | |
| download | gtk+-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/gtkmisc.h')
| -rw-r--r-- | gtk/gtkmisc.h | 33 |
1 files changed, 18 insertions, 15 deletions
diff --git a/gtk/gtkmisc.h b/gtk/gtkmisc.h index bcb28d61b4..0e1de8e6eb 100644 --- a/gtk/gtkmisc.h +++ b/gtk/gtkmisc.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,24 +26,27 @@ #ifdef __cplusplus extern "C" { +#pragma } #endif /* __cplusplus */ -#define GTK_MISC(obj) GTK_CHECK_CAST (obj, gtk_misc_get_type (), GtkMisc) -#define GTK_MISC_CLASS(klass) GTK_CHECK_CLASS_CAST (klass, gtk_misc_get_type (), GtkMiscClass) -#define GTK_IS_MISC(obj) GTK_CHECK_TYPE (obj, gtk_misc_get_type ()) +#define GTK_TYPE_MISC (gtk_misc_get_type ()) +#define GTK_MISC(obj) (GTK_CHECK_CAST ((obj), GTK_TYPE_MISC, GtkMisc)) +#define GTK_MISC_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_MISC, GtkMiscClass)) +#define GTK_IS_MISC(obj) (GTK_CHECK_TYPE ((obj), GTK_TYPE_MISC)) +#define GTK_IS_MISC_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_MISC)) -typedef struct _GtkMisc GtkMisc; +typedef struct _GtkMisc GtkMisc; typedef struct _GtkMiscClass GtkMiscClass; struct _GtkMisc { GtkWidget widget; - + gfloat xalign; gfloat yalign; - + guint16 xpad; guint16 ypad; }; @@ -54,13 +57,13 @@ struct _GtkMiscClass }; -guint gtk_misc_get_type (void); -void gtk_misc_set_alignment (GtkMisc *misc, - gfloat xalign, - gfloat yalign); -void gtk_misc_set_padding (GtkMisc *misc, - gint xpad, - gint ypad); +GtkType gtk_misc_get_type (void); +void gtk_misc_set_alignment (GtkMisc *misc, + gfloat xalign, + gfloat yalign); +void gtk_misc_set_padding (GtkMisc *misc, + gint xpad, + gint ypad); #ifdef __cplusplus @@ -68,4 +71,4 @@ void gtk_misc_set_padding (GtkMisc *misc, #endif /* __cplusplus */ -#endif /* __GTK_LABEL_H__ */ +#endif /* __GTK_MISC_H__ */ |