Commit a91be935 authored by Tim Janik's avatar Tim Janik Committed by Tim Janik

macro and GtkType fixups.

Tue Jul 14 11:41:38 1998  Tim Janik  <timj@gtk.org>

        * gtk/gtkdialog.h:
        * gtk/gtkseparator.h:
        * gtk/gtkhseparator.h:
        * gtk/gtkvseparator.h: macro and GtkType fixups.
parent da355fee
Tue Jul 14 11:41:38 1998 Tim Janik <timj@gtk.org>
* gtk/gtkdialog.h:
* gtk/gtkseparator.h:
* gtk/gtkhseparator.h:
* gtk/gtkvseparator.h: macro and GtkType fixups.
Tue Jul 14 06:25:46 1998 Tim Janik <timj@gtk.org> Tue Jul 14 06:25:46 1998 Tim Janik <timj@gtk.org>
* gtk/testgtk.c (create_cursors): display the current cursor name. * gtk/testgtk.c (create_cursors): display the current cursor name.
......
Tue Jul 14 11:41:38 1998 Tim Janik <timj@gtk.org>
* gtk/gtkdialog.h:
* gtk/gtkseparator.h:
* gtk/gtkhseparator.h:
* gtk/gtkvseparator.h: macro and GtkType fixups.
Tue Jul 14 06:25:46 1998 Tim Janik <timj@gtk.org> Tue Jul 14 06:25:46 1998 Tim Janik <timj@gtk.org>
* gtk/testgtk.c (create_cursors): display the current cursor name. * gtk/testgtk.c (create_cursors): display the current cursor name.
......
Tue Jul 14 11:41:38 1998 Tim Janik <timj@gtk.org>
* gtk/gtkdialog.h:
* gtk/gtkseparator.h:
* gtk/gtkhseparator.h:
* gtk/gtkvseparator.h: macro and GtkType fixups.
Tue Jul 14 06:25:46 1998 Tim Janik <timj@gtk.org> Tue Jul 14 06:25:46 1998 Tim Janik <timj@gtk.org>
* gtk/testgtk.c (create_cursors): display the current cursor name. * gtk/testgtk.c (create_cursors): display the current cursor name.
......
Tue Jul 14 11:41:38 1998 Tim Janik <timj@gtk.org>
* gtk/gtkdialog.h:
* gtk/gtkseparator.h:
* gtk/gtkhseparator.h:
* gtk/gtkvseparator.h: macro and GtkType fixups.
Tue Jul 14 06:25:46 1998 Tim Janik <timj@gtk.org> Tue Jul 14 06:25:46 1998 Tim Janik <timj@gtk.org>
* gtk/testgtk.c (create_cursors): display the current cursor name. * gtk/testgtk.c (create_cursors): display the current cursor name.
......
Tue Jul 14 11:41:38 1998 Tim Janik <timj@gtk.org>
* gtk/gtkdialog.h:
* gtk/gtkseparator.h:
* gtk/gtkhseparator.h:
* gtk/gtkvseparator.h: macro and GtkType fixups.
Tue Jul 14 06:25:46 1998 Tim Janik <timj@gtk.org> Tue Jul 14 06:25:46 1998 Tim Janik <timj@gtk.org>
* gtk/testgtk.c (create_cursors): display the current cursor name. * gtk/testgtk.c (create_cursors): display the current cursor name.
......
Tue Jul 14 11:41:38 1998 Tim Janik <timj@gtk.org>
* gtk/gtkdialog.h:
* gtk/gtkseparator.h:
* gtk/gtkhseparator.h:
* gtk/gtkvseparator.h: macro and GtkType fixups.
Tue Jul 14 06:25:46 1998 Tim Janik <timj@gtk.org> Tue Jul 14 06:25:46 1998 Tim Janik <timj@gtk.org>
* gtk/testgtk.c (create_cursors): display the current cursor name. * gtk/testgtk.c (create_cursors): display the current cursor name.
......
Tue Jul 14 11:41:38 1998 Tim Janik <timj@gtk.org>
* gtk/gtkdialog.h:
* gtk/gtkseparator.h:
* gtk/gtkhseparator.h:
* gtk/gtkvseparator.h: macro and GtkType fixups.
Tue Jul 14 06:25:46 1998 Tim Janik <timj@gtk.org> Tue Jul 14 06:25:46 1998 Tim Janik <timj@gtk.org>
* gtk/testgtk.c (create_cursors): display the current cursor name. * gtk/testgtk.c (create_cursors): display the current cursor name.
......
...@@ -27,10 +27,10 @@ static void gtk_dialog_class_init (GtkDialogClass *klass); ...@@ -27,10 +27,10 @@ static void gtk_dialog_class_init (GtkDialogClass *klass);
static void gtk_dialog_init (GtkDialog *dialog); static void gtk_dialog_init (GtkDialog *dialog);
guint GtkType
gtk_dialog_get_type (void) gtk_dialog_get_type (void)
{ {
static guint dialog_type = 0; static GtkType dialog_type = 0;
if (!dialog_type) if (!dialog_type)
{ {
...@@ -46,7 +46,7 @@ gtk_dialog_get_type (void) ...@@ -46,7 +46,7 @@ gtk_dialog_get_type (void)
(GtkClassInitFunc) NULL, (GtkClassInitFunc) NULL,
}; };
dialog_type = gtk_type_unique (gtk_window_get_type (), &dialog_info); dialog_type = gtk_type_unique (GTK_TYPE_WINDOW, &dialog_info);
} }
return dialog_type; return dialog_type;
...@@ -79,5 +79,5 @@ gtk_dialog_init (GtkDialog *dialog) ...@@ -79,5 +79,5 @@ gtk_dialog_init (GtkDialog *dialog)
GtkWidget* GtkWidget*
gtk_dialog_new (void) gtk_dialog_new (void)
{ {
return GTK_WIDGET (gtk_type_new (gtk_dialog_get_type ())); return GTK_WIDGET (gtk_type_new (GTK_TYPE_DIALOG));
} }
...@@ -26,12 +26,15 @@ ...@@ -26,12 +26,15 @@
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#pragma }
#endif /* __cplusplus */ #endif /* __cplusplus */
#define GTK_DIALOG(obj) GTK_CHECK_CAST (obj, gtk_dialog_get_type (), GtkDialog) #define GTK_TYPE_DIALOG (gtk_dialog_get_type ())
#define GTK_DIALOG_CLASS(klass) GTK_CHECK_CLASS_CAST (klass, gtk_dialog_get_type (), GtkDialogClass) #define GTK_DIALOG(obj) (GTK_CHECK_CAST ((obj), GTK_TYPE_DIALOG, GtkDialog))
#define GTK_IS_DIALOG(obj) GTK_CHECK_TYPE (obj, gtk_dialog_get_type ()) #define GTK_DIALOG_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_DIALOG, GtkDialogClass))
#define GTK_IS_DIALOG(obj) (GTK_CHECK_TYPE ((obj), GTK_TYPE_DIALOG))
#define GTK_IS_DIALOG_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_DIALOG))
typedef struct _GtkDialog GtkDialog; typedef struct _GtkDialog GtkDialog;
...@@ -53,7 +56,7 @@ struct _GtkDialogClass ...@@ -53,7 +56,7 @@ struct _GtkDialogClass
}; };
guint gtk_dialog_get_type (void); GtkType gtk_dialog_get_type (void);
GtkWidget* gtk_dialog_new (void); GtkWidget* gtk_dialog_new (void);
......
...@@ -25,10 +25,10 @@ static gint gtk_hseparator_expose (GtkWidget *widget, ...@@ -25,10 +25,10 @@ static gint gtk_hseparator_expose (GtkWidget *widget,
GdkEventExpose *event); GdkEventExpose *event);
guint GtkType
gtk_hseparator_get_type (void) gtk_hseparator_get_type (void)
{ {
static guint hseparator_type = 0; static GtkType hseparator_type = 0;
if (!hseparator_type) if (!hseparator_type)
{ {
...@@ -44,7 +44,7 @@ gtk_hseparator_get_type (void) ...@@ -44,7 +44,7 @@ gtk_hseparator_get_type (void)
(GtkClassInitFunc) NULL, (GtkClassInitFunc) NULL,
}; };
hseparator_type = gtk_type_unique (gtk_separator_get_type (), &hseparator_info); hseparator_type = gtk_type_unique (GTK_TYPE_SEPARATOR, &hseparator_info);
} }
return hseparator_type; return hseparator_type;
...@@ -70,7 +70,7 @@ gtk_hseparator_init (GtkHSeparator *hseparator) ...@@ -70,7 +70,7 @@ gtk_hseparator_init (GtkHSeparator *hseparator)
GtkWidget* GtkWidget*
gtk_hseparator_new (void) gtk_hseparator_new (void)
{ {
return GTK_WIDGET (gtk_type_new (gtk_hseparator_get_type ())); return GTK_WIDGET (gtk_type_new (GTK_TYPE_HSEPARATOR));
} }
......
...@@ -26,12 +26,15 @@ ...@@ -26,12 +26,15 @@
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#pragma }
#endif /* __cplusplus */ #endif /* __cplusplus */
#define GTK_HSEPARATOR(obj) GTK_CHECK_CAST (obj, gtk_hseparator_get_type (), GtkHSeparator) #define GTK_TYPE_HSEPARATOR (gtk_hseparator_get_type ())
#define GTK_HSEPARATOR_CLASS(klass) GTK_CHECK_CLASS_CAST (klass, gtk_hseparator_get_type (), GtkHSeparatorClass) #define GTK_HSEPARATOR(obj) (GTK_CHECK_CAST ((obj), GTK_TYPE_HSEPARATOR, GtkHSeparator))
#define GTK_IS_HSEPARATOR(obj) GTK_CHECK_TYPE (obj, gtk_hseparator_get_type ()) #define GTK_HSEPARATOR_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_HSEPARATOR, GtkHSeparatorClass))
#define GTK_IS_HSEPARATOR(obj) (GTK_CHECK_TYPE ((obj), GTK_TYPE_HSEPARATOR))
#define GTK_IS_HSEPARATOR_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_HSEPARATOR))
typedef struct _GtkHSeparator GtkHSeparator; typedef struct _GtkHSeparator GtkHSeparator;
...@@ -48,13 +51,13 @@ struct _GtkHSeparatorClass ...@@ -48,13 +51,13 @@ struct _GtkHSeparatorClass
}; };
guint gtk_hseparator_get_type (void); GtkType gtk_hseparator_get_type (void);
GtkWidget* gtk_hseparator_new (void); GtkWidget* gtk_hseparator_new (void);
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif /* __cplusplus */ #endif /* __cplusplus */
#endif /* __GTK_HSEPARATOR_H__ */ #endif /* __GTK_HSEPARATOR_H__ */
...@@ -23,10 +23,10 @@ static void gtk_separator_class_init (GtkSeparatorClass *klass); ...@@ -23,10 +23,10 @@ static void gtk_separator_class_init (GtkSeparatorClass *klass);
static void gtk_separator_init (GtkSeparator *separator); static void gtk_separator_init (GtkSeparator *separator);
guint GtkType
gtk_separator_get_type (void) gtk_separator_get_type (void)
{ {
static guint separator_type = 0; static GtkType separator_type = 0;
if (!separator_type) if (!separator_type)
{ {
...@@ -42,7 +42,7 @@ gtk_separator_get_type (void) ...@@ -42,7 +42,7 @@ gtk_separator_get_type (void)
(GtkClassInitFunc) NULL, (GtkClassInitFunc) NULL,
}; };
separator_type = gtk_type_unique (gtk_widget_get_type (), &separator_info); separator_type = gtk_type_unique (GTK_TYPE_WIDGET, &separator_info);
} }
return separator_type; return separator_type;
......
...@@ -26,12 +26,15 @@ ...@@ -26,12 +26,15 @@
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#pragma }
#endif /* __cplusplus */ #endif /* __cplusplus */
#define GTK_SEPARATOR(obj) GTK_CHECK_CAST (obj, gtk_separator_get_type (), GtkSeparator) #define GTK_TYPE_SEPARATOR (gtk_separator_get_type ())
#define GTK_SEPARATOR_CLASS(klass) GTK_CHECK_CLASS_CAST (klass, gtk_separator_get_type (), GtkSeparatorClass) #define GTK_SEPARATOR(obj) (GTK_CHECK_CAST ((obj), GTK_TYPE_SEPARATOR, GtkSeparator))
#define GTK_IS_SEPARATOR(obj) GTK_CHECK_TYPE (obj, gtk_separator_get_type ()) #define GTK_SEPARATOR_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_SEPARATOR, GtkSeparatorClass))
#define GTK_IS_SEPARATOR(obj) (GTK_CHECK_TYPE ((obj), GTK_TYPE_SEPARATOR))
#define GTK_IS_SEPARATOR_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_SEPARATOR))
typedef struct _GtkSeparator GtkSeparator; typedef struct _GtkSeparator GtkSeparator;
...@@ -48,12 +51,11 @@ struct _GtkSeparatorClass ...@@ -48,12 +51,11 @@ struct _GtkSeparatorClass
}; };
guint gtk_separator_get_type (void); GtkType gtk_separator_get_type (void);
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif /* __cplusplus */ #endif /* __cplusplus */
#endif /* __GTK_SEPARATOR_H__ */ #endif /* __GTK_SEPARATOR_H__ */
...@@ -25,10 +25,10 @@ static gint gtk_vseparator_expose (GtkWidget *widget, ...@@ -25,10 +25,10 @@ static gint gtk_vseparator_expose (GtkWidget *widget,
GdkEventExpose *event); GdkEventExpose *event);
guint GtkType
gtk_vseparator_get_type (void) gtk_vseparator_get_type (void)
{ {
static guint vseparator_type = 0; static GtkType vseparator_type = 0;
if (!vseparator_type) if (!vseparator_type)
{ {
...@@ -44,7 +44,7 @@ gtk_vseparator_get_type (void) ...@@ -44,7 +44,7 @@ gtk_vseparator_get_type (void)
(GtkClassInitFunc) NULL, (GtkClassInitFunc) NULL,
}; };
vseparator_type = gtk_type_unique (gtk_separator_get_type (), &vseparator_info); vseparator_type = gtk_type_unique (GTK_TYPE_SEPARATOR, &vseparator_info);
} }
return vseparator_type; return vseparator_type;
...@@ -70,7 +70,7 @@ gtk_vseparator_init (GtkVSeparator *vseparator) ...@@ -70,7 +70,7 @@ gtk_vseparator_init (GtkVSeparator *vseparator)
GtkWidget* GtkWidget*
gtk_vseparator_new (void) gtk_vseparator_new (void)
{ {
return GTK_WIDGET (gtk_type_new (gtk_vseparator_get_type ())); return GTK_WIDGET (gtk_type_new (GTK_TYPE_VSEPARATOR));
} }
......
...@@ -24,9 +24,17 @@ ...@@ -24,9 +24,17 @@
#include <gtk/gtkseparator.h> #include <gtk/gtkseparator.h>
#define GTK_VSEPARATOR(obj) GTK_CHECK_CAST (obj, gtk_vseparator_get_type (), GtkVSeparator) #ifdef __cplusplus
#define GTK_VSEPARATOR_CLASS(klass) GTK_CHECK_CLASS_CAST (klass, gtk_vseparator_get_type (), GtkVSeparatorClass) extern "C" {
#define GTK_IS_VSEPARATOR(obj) GTK_CHECK_TYPE (obj, gtk_vseparator_get_type ()) #pragma }
#endif /* __cplusplus */
#define GTK_TYPE_VSEPARATOR (gtk_vseparator_get_type ())
#define GTK_VSEPARATOR(obj) (GTK_CHECK_CAST ((obj), GTK_TYPE_VSEPARATOR, GtkVSeparator))
#define GTK_VSEPARATOR_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_VSEPARATOR, GtkVSeparatorClass))
#define GTK_IS_VSEPARATOR(obj) (GTK_CHECK_TYPE ((obj), GTK_TYPE_VSEPARATOR))
#define GTK_IS_VSEPARATOR_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_VSEPARATOR))
typedef struct _GtkVSeparator GtkVSeparator; typedef struct _GtkVSeparator GtkVSeparator;
...@@ -43,18 +51,13 @@ struct _GtkVSeparatorClass ...@@ -43,18 +51,13 @@ struct _GtkVSeparatorClass
}; };
#ifdef __cplusplus GtkType gtk_vseparator_get_type (void);
extern "C" {
#endif /* __cplusplus */
guint gtk_vseparator_get_type (void);
GtkWidget* gtk_vseparator_new (void); GtkWidget* gtk_vseparator_new (void);
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif /* __cplusplus */ #endif /* __cplusplus */
#endif /* __GTK_SEPARATOR_H__ */ #endif /* __GTK_SEPARATOR_H__ */
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment