diff options
| author | Tim Janik <timj@gtk.org> | 1998-08-17 14:48:51 +0000 |
|---|---|---|
| committer | Tim Janik <timj@src.gnome.org> | 1998-08-17 14:48:51 +0000 |
| commit | 47215ba40332127afcaed8c9b7f21d9591af59a0 (patch) | |
| tree | d20b932ea561a5eeb76718e18f5abb7740ecaff0 /gtk/gtkfontsel.c | |
| parent | 690a18f03288d8053a6c3f32f38b288ade30cde9 (diff) | |
| download | gdk-pixbuf-47215ba40332127afcaed8c9b7f21d9591af59a0.tar.gz | |
removed gtk_input_add_interp.merge-to-themes-2-2
Mon Aug 17 15:31:38 1998 Tim Janik <timj@gtk.org>
* gtk/gtkmain.c: removed gtk_input_add_interp.
* gtk/gtkeditable.c (gtk_editable_set_position): fixed bogus "return"
keyword.
(gtk_editable_get_event_time): fix default: case.
* gtk/gtkclist.c (gtk_clist_swap_rows): fixes for lvalue casts.
* gdk/gdkpixmap.c: made a bunch of unexported functions static.
* gdk/gdkcolor.c:
* gdk/gdkvisual.c: include "gdkx.h", since it exports prototypes
of our functions.
* various minor compilation cleanups, such as bogus commas in
enums and similar things.
M
Diffstat (limited to 'gtk/gtkfontsel.c')
| -rw-r--r-- | gtk/gtkfontsel.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/gtk/gtkfontsel.c b/gtk/gtkfontsel.c index da4e713b7..f4a725432 100644 --- a/gtk/gtkfontsel.c +++ b/gtk/gtkfontsel.c @@ -385,18 +385,18 @@ static gint gtk_font_selection_dialog_on_configure(GtkWidget *widget, static GtkWindowClass *font_selection_parent_class = NULL; static GtkNotebookClass *font_selection_dialog_parent_class = NULL; -guint +GtkType gtk_font_selection_get_type() { - static guint font_selection_type = 0; + static GtkType font_selection_type = 0; if(!font_selection_type) { - GtkTypeInfo fontsel_info = + GtkTypeInfo fontsel_type_info = { "GtkFontSelection", - sizeof(GtkFontSelection), - sizeof(GtkFontSelectionClass), + sizeof (GtkFontSelection), + sizeof (GtkFontSelectionClass), (GtkClassInitFunc) gtk_font_selection_class_init, (GtkObjectInitFunc) gtk_font_selection_init, /* reserved_1 */ NULL, @@ -404,8 +404,8 @@ gtk_font_selection_get_type() (GtkClassInitFunc) NULL, }; - font_selection_type = gtk_type_unique (gtk_notebook_get_type(), - &fontsel_info); + font_selection_type = gtk_type_unique (GTK_TYPE_NOTEBOOK, + &fontsel_type_info); } return font_selection_type; @@ -418,7 +418,7 @@ gtk_font_selection_class_init(GtkFontSelectionClass *klass) object_class = (GtkObjectClass *) klass; - font_selection_parent_class = gtk_type_class (gtk_notebook_get_type ()); + font_selection_parent_class = gtk_type_class (GTK_TYPE_NOTEBOOK); object_class->destroy = gtk_font_selection_destroy; @@ -853,7 +853,7 @@ gtk_font_selection_new() { GtkFontSelection *fontsel; - fontsel = gtk_type_new (gtk_font_selection_get_type ()); + fontsel = gtk_type_new (GTK_TYPE_FONT_SELECTION); return GTK_WIDGET (fontsel); } @@ -3068,7 +3068,7 @@ gtk_font_selection_create_xlfd (gint size, *****************************************************************************/ guint -gtk_font_selection_dialog_get_type (void) +gtk_font_selection_dialog_get_type (void) { static guint font_selection_dialog_type = 0; @@ -3086,7 +3086,7 @@ gtk_font_selection_dialog_get_type (void) (GtkClassInitFunc) NULL, }; - font_selection_dialog_type = gtk_type_unique (gtk_window_get_type (), &fontsel_diag_info); + font_selection_dialog_type = gtk_type_unique (GTK_TYPE_WINDOW, &fontsel_diag_info); } return font_selection_dialog_type; @@ -3099,7 +3099,7 @@ gtk_font_selection_dialog_class_init (GtkFontSelectionDialogClass *klass) object_class = (GtkObjectClass*) klass; - font_selection_dialog_parent_class = gtk_type_class (gtk_window_get_type ()); + font_selection_dialog_parent_class = gtk_type_class (GTK_TYPE_WINDOW); } static void @@ -3161,7 +3161,7 @@ gtk_font_selection_dialog_new (const gchar *title) { GtkFontSelectionDialog *fontseldiag; - fontseldiag = gtk_type_new (gtk_font_selection_dialog_get_type ()); + fontseldiag = gtk_type_new (GTK_TYPE_FONT_SELECTION_DIALOG); gtk_window_set_title (GTK_WINDOW (fontseldiag), title ? title : "Font Selection"); |