diff options
| -rw-r--r-- | ChangeLog | 19 | ||||
| -rw-r--r-- | ChangeLog.pre-2-0 | 19 | ||||
| -rw-r--r-- | ChangeLog.pre-2-10 | 19 | ||||
| -rw-r--r-- | ChangeLog.pre-2-2 | 19 | ||||
| -rw-r--r-- | ChangeLog.pre-2-4 | 19 | ||||
| -rw-r--r-- | ChangeLog.pre-2-6 | 19 | ||||
| -rw-r--r-- | ChangeLog.pre-2-8 | 19 | ||||
| -rw-r--r-- | gdk/gdkcolor.c | 1 | ||||
| -rw-r--r-- | gdk/gdkpixmap.c | 12 | ||||
| -rw-r--r-- | gdk/gdkvisual.c | 1 | ||||
| -rw-r--r-- | gdk/x11/gdkcolor-x11.c | 1 | ||||
| -rw-r--r-- | gdk/x11/gdkpixmap-x11.c | 12 | ||||
| -rw-r--r-- | gdk/x11/gdkvisual-x11.c | 1 | ||||
| -rw-r--r-- | gtk/gtkaccelgroup.c | 4 | ||||
| -rw-r--r-- | gtk/gtkaccellabel.c | 2 | ||||
| -rw-r--r-- | gtk/gtkclist.c | 18 | ||||
| -rw-r--r-- | gtk/gtkctree.c | 6 | ||||
| -rw-r--r-- | gtk/gtkeditable.c | 15 | ||||
| -rw-r--r-- | gtk/gtkentry.c | 2 | ||||
| -rw-r--r-- | gtk/gtkfontsel.c | 26 | ||||
| -rw-r--r-- | gtk/gtkfontsel.h | 72 | ||||
| -rw-r--r-- | gtk/gtkitemfactory.c | 24 | ||||
| -rw-r--r-- | gtk/gtkmain.c | 30 | ||||
| -rw-r--r-- | gtk/gtkpacker.c | 4 | ||||
| -rw-r--r-- | gtk/gtksignal.c | 24 | ||||
| -rw-r--r-- | gtk/gtktable.c | 2 | ||||
| -rw-r--r-- | gtk/gtkwidget.c | 22 | ||||
| -rw-r--r-- | gtk/gtkwindow.c | 3 |
28 files changed, 256 insertions, 159 deletions
@@ -1,3 +1,22 @@ +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. + Mon Aug 17 07:47:43 1998 Tim Janik <timj@gtk.org> * gtk/gtkmain.c (gtk_init): NULL terminate the arg list to g_strconcat() diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index f24feb843..10020f176 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,22 @@ +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. + Mon Aug 17 07:47:43 1998 Tim Janik <timj@gtk.org> * gtk/gtkmain.c (gtk_init): NULL terminate the arg list to g_strconcat() diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index f24feb843..10020f176 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,22 @@ +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. + Mon Aug 17 07:47:43 1998 Tim Janik <timj@gtk.org> * gtk/gtkmain.c (gtk_init): NULL terminate the arg list to g_strconcat() diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index f24feb843..10020f176 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,22 @@ +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. + Mon Aug 17 07:47:43 1998 Tim Janik <timj@gtk.org> * gtk/gtkmain.c (gtk_init): NULL terminate the arg list to g_strconcat() diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index f24feb843..10020f176 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,22 @@ +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. + Mon Aug 17 07:47:43 1998 Tim Janik <timj@gtk.org> * gtk/gtkmain.c (gtk_init): NULL terminate the arg list to g_strconcat() diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index f24feb843..10020f176 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,22 @@ +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. + Mon Aug 17 07:47:43 1998 Tim Janik <timj@gtk.org> * gtk/gtkmain.c (gtk_init): NULL terminate the arg list to g_strconcat() diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index f24feb843..10020f176 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,22 @@ +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. + Mon Aug 17 07:47:43 1998 Tim Janik <timj@gtk.org> * gtk/gtkmain.c (gtk_init): NULL terminate the arg list to g_strconcat() diff --git a/gdk/gdkcolor.c b/gdk/gdkcolor.c index a83a7400e..b17e26a1c 100644 --- a/gdk/gdkcolor.c +++ b/gdk/gdkcolor.c @@ -19,6 +19,7 @@ #include <X11/Xlib.h> #include "gdk.h" #include "gdkprivate.h" +#include "gdkx.h" static gint gdk_colormap_match_color (GdkColormap *cmap, diff --git a/gdk/gdkpixmap.c b/gdk/gdkpixmap.c index 799bd8d46..9fdef0ffc 100644 --- a/gdk/gdkpixmap.c +++ b/gdk/gdkpixmap.c @@ -175,7 +175,7 @@ gdk_pixmap_create_from_data (GdkWindow *window, return pixmap; } -gint +static gint gdk_pixmap_seek_string (FILE *infile, const gchar *str, gint skip_comments) @@ -199,7 +199,7 @@ gdk_pixmap_seek_string (FILE *infile, return FALSE; } -gint +static gint gdk_pixmap_seek_char (FILE *infile, gchar c) { @@ -231,7 +231,7 @@ gdk_pixmap_seek_char (FILE *infile, return FALSE; } -gint +static gint gdk_pixmap_read_string (FILE *infile, gchar **buffer, guint *buffer_size) @@ -286,7 +286,7 @@ gdk_pixmap_read_string (FILE *infile, return ret; } -gchar* +static gchar* gdk_pixmap_skip_whitespaces (gchar *buffer) { gint32 index = 0; @@ -297,7 +297,7 @@ gdk_pixmap_skip_whitespaces (gchar *buffer) return &buffer[index]; } -gchar* +static gchar* gdk_pixmap_skip_string (gchar *buffer) { gint32 index = 0; @@ -311,7 +311,7 @@ gdk_pixmap_skip_string (gchar *buffer) /* Xlib crashed ince at a color name lengths around 125 */ #define MAX_COLOR_LEN 120 -gchar* +static gchar* gdk_pixmap_extract_color (gchar *buffer) { gint counter, numnames; diff --git a/gdk/gdkvisual.c b/gdk/gdkvisual.c index 78d62fae9..e7bf1648c 100644 --- a/gdk/gdkvisual.c +++ b/gdk/gdkvisual.c @@ -20,6 +20,7 @@ #include <X11/Xutil.h> #include "gdk.h" #include "gdkprivate.h" +#include "gdkx.h" static void gdk_visual_add (GdkVisual *visual); diff --git a/gdk/x11/gdkcolor-x11.c b/gdk/x11/gdkcolor-x11.c index a83a7400e..b17e26a1c 100644 --- a/gdk/x11/gdkcolor-x11.c +++ b/gdk/x11/gdkcolor-x11.c @@ -19,6 +19,7 @@ #include <X11/Xlib.h> #include "gdk.h" #include "gdkprivate.h" +#include "gdkx.h" static gint gdk_colormap_match_color (GdkColormap *cmap, diff --git a/gdk/x11/gdkpixmap-x11.c b/gdk/x11/gdkpixmap-x11.c index 799bd8d46..9fdef0ffc 100644 --- a/gdk/x11/gdkpixmap-x11.c +++ b/gdk/x11/gdkpixmap-x11.c @@ -175,7 +175,7 @@ gdk_pixmap_create_from_data (GdkWindow *window, return pixmap; } -gint +static gint gdk_pixmap_seek_string (FILE *infile, const gchar *str, gint skip_comments) @@ -199,7 +199,7 @@ gdk_pixmap_seek_string (FILE *infile, return FALSE; } -gint +static gint gdk_pixmap_seek_char (FILE *infile, gchar c) { @@ -231,7 +231,7 @@ gdk_pixmap_seek_char (FILE *infile, return FALSE; } -gint +static gint gdk_pixmap_read_string (FILE *infile, gchar **buffer, guint *buffer_size) @@ -286,7 +286,7 @@ gdk_pixmap_read_string (FILE *infile, return ret; } -gchar* +static gchar* gdk_pixmap_skip_whitespaces (gchar *buffer) { gint32 index = 0; @@ -297,7 +297,7 @@ gdk_pixmap_skip_whitespaces (gchar *buffer) return &buffer[index]; } -gchar* +static gchar* gdk_pixmap_skip_string (gchar *buffer) { gint32 index = 0; @@ -311,7 +311,7 @@ gdk_pixmap_skip_string (gchar *buffer) /* Xlib crashed ince at a color name lengths around 125 */ #define MAX_COLOR_LEN 120 -gchar* +static gchar* gdk_pixmap_extract_color (gchar *buffer) { gint counter, numnames; diff --git a/gdk/x11/gdkvisual-x11.c b/gdk/x11/gdkvisual-x11.c index 78d62fae9..e7bf1648c 100644 --- a/gdk/x11/gdkvisual-x11.c +++ b/gdk/x11/gdkvisual-x11.c @@ -20,6 +20,7 @@ #include <X11/Xutil.h> #include "gdk.h" #include "gdkprivate.h" +#include "gdkx.h" static void gdk_visual_add (GdkVisual *visual); diff --git a/gtk/gtkaccelgroup.c b/gtk/gtkaccelgroup.c index f698e19aa..16895e79b 100644 --- a/gtk/gtkaccelgroup.c +++ b/gtk/gtkaccelgroup.c @@ -696,7 +696,7 @@ gtk_accel_group_entries_from_object (GtkObject *object) gboolean gtk_accelerator_valid (guint keyval, - guint modifiers) + GdkModifierType modifiers) { guint invalid_accelerator_vals[] = { GDK_BackSpace, GDK_Delete, GDK_KP_Delete, @@ -1016,7 +1016,7 @@ gtk_accelerator_name (guint accelerator_key, } void -gtk_accelerator_set_default_mod_mask (guint default_mod_mask) +gtk_accelerator_set_default_mod_mask (GdkModifierType default_mod_mask) { default_accel_mod_mask = default_mod_mask & GDK_MODIFIER_MASK; } diff --git a/gtk/gtkaccellabel.c b/gtk/gtkaccellabel.c index 53045f170..30214e2c9 100644 --- a/gtk/gtkaccellabel.c +++ b/gtk/gtkaccellabel.c @@ -28,7 +28,7 @@ enum { ARG_0, - ARG_ACCEL_WIDGET, + ARG_ACCEL_WIDGET }; static void gtk_accel_label_class_init (GtkAccelLabelClass *klass); diff --git a/gtk/gtkclist.c b/gtk/gtkclist.c index 03290d694..0ae9e0fbf 100644 --- a/gtk/gtkclist.c +++ b/gtk/gtkclist.c @@ -1916,19 +1916,19 @@ gtk_clist_swap_rows (GtkCList * clist, swap = link1->data; link1->data = link2->data; link2->data = swap; - + list = clist->selection; while (list) { if (GPOINTER_TO_INT (list->data) == row1) - GPOINTER_TO_INT (list->data) = row2; - - if (GPOINTER_TO_INT (list->data) == row2) - GPOINTER_TO_INT (list->data) = row1; - + list->data = GINT_TO_POINTER (row2); + + if (GPOINTER_TO_INT (list->data) == row2) + list->data = GINT_TO_POINTER (row1); + list = list->next; } - + if (!GTK_CLIST_FROZEN (clist)) { if (gtk_clist_row_is_visible (clist, row1) != GTK_VISIBILITY_NONE) @@ -2074,7 +2074,7 @@ gtk_clist_row_is_visible (GtkCList * clist, return GTK_VISIBILITY_FULL; } -GtkAdjustment * +static GtkAdjustment* gtk_clist_get_vadjustment (GtkCList * clist) { g_return_val_if_fail (clist != NULL, NULL); @@ -2083,7 +2083,7 @@ gtk_clist_get_vadjustment (GtkCList * clist) return gtk_range_get_adjustment (GTK_RANGE (clist->vscrollbar)); } -GtkAdjustment * +static GtkAdjustment* gtk_clist_get_hadjustment (GtkCList * clist) { g_return_val_if_fail (clist != NULL, NULL); diff --git a/gtk/gtkctree.c b/gtk/gtkctree.c index 8a11c67f6..e918d7690 100644 --- a/gtk/gtkctree.c +++ b/gtk/gtkctree.c @@ -2880,12 +2880,9 @@ real_tree_expand (GtkCTree *ctree, work = GTK_CTREE_ROW (node)->children; if (work) { - GtkCList *clist; gint tmp = 0; gint row; - clist = GTK_CLIST (ctree); - while (GTK_CTREE_NODE_NEXT (work)) { work = GTK_CTREE_NODE_NEXT (work); @@ -2948,12 +2945,9 @@ real_tree_collapse (GtkCTree *ctree, work = GTK_CTREE_ROW (node)->children; if (work) { - GtkCList *clist; gint tmp = 0; gint row; - clist = GTK_CLIST (ctree); - while (work && GTK_CTREE_ROW (work)->level > level) { work = GTK_CTREE_NODE_NEXT (work); diff --git a/gtk/gtkeditable.c b/gtk/gtkeditable.c index d2ff41437..09d28a9ab 100644 --- a/gtk/gtkeditable.c +++ b/gtk/gtkeditable.c @@ -522,8 +522,8 @@ gtk_editable_set_selection (GtkEditable *editable, } void -gtk_editable_set_position (GtkEditable *editable, - gint position) +gtk_editable_set_position (GtkEditable *editable, + gint position) { GtkEditableClass *klass; @@ -532,7 +532,7 @@ gtk_editable_set_position (GtkEditable *editable, klass = GTK_EDITABLE_CLASS (GTK_OBJECT (editable)->klass); - return klass->set_position (editable, position); + klass->set_position (editable, position); } gint @@ -794,7 +794,7 @@ gtk_editable_select_region (GtkEditable *editable, if (GTK_WIDGET_REALIZED (editable)) gtk_editable_claim_selection (editable, start != end, GDK_CURRENT_TIME); - + gtk_editable_set_selection (editable, start, end); } @@ -805,9 +805,9 @@ static guint32 gtk_editable_get_event_time (GtkEditable *editable) { GdkEvent *event; - + event = gtk_get_current_event(); - + if (event) switch (event->type) { @@ -834,8 +834,9 @@ gtk_editable_get_event_time (GtkEditable *editable) case GDK_PROXIMITY_OUT: return event->proximity.time; default: /* use current time */ + break; } - + return GDK_CURRENT_TIME; } diff --git a/gtk/gtkentry.c b/gtk/gtkentry.c index 8ca9a9e78..613d64239 100644 --- a/gtk/gtkentry.c +++ b/gtk/gtkentry.c @@ -36,7 +36,7 @@ enum { ARG_0, ARG_MAX_LENGTH, - ARG_VISIBILITY, + ARG_VISIBILITY }; 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"); diff --git a/gtk/gtkfontsel.h b/gtk/gtkfontsel.h index 01af04e03..a162c10b8 100644 --- a/gtk/gtkfontsel.h +++ b/gtk/gtkfontsel.h @@ -12,7 +12,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 @@ -35,13 +35,17 @@ extern "C" { #pragma } #endif /* __cplusplus */ -#define GTK_FONT_SELECTION(obj) GTK_CHECK_CAST(obj, gtk_font_selection_get_type(), GtkFontSelection) -#define GTK_FONT_SELECTION_CLASS(klass) GTK_CHECK_CLASS_CAST(klass, gtk_font_selection_get_type(), GtkFontSelectionClass) -#define GTK_IS_FONT_SELECTION(obj) GTK_CHECK_TYPE(obj, gtk_font_selection_get_type()) +#define GTK_TYPE_FONT_SELECTION (gtk_font_selection_get_type ()) +#define GTK_FONT_SELECTION(obj) (GTK_CHECK_CAST ((obj), GTK_TYPE_FONT_SELECTION, GtkFontSelection)) +#define GTK_FONT_SELECTION_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_FONT_SELECTION, GtkFontSelectionClass)) +#define GTK_IS_FONT_SELECTION(obj) (GTK_CHECK_TYPE ((obj), GTK_TYPE_FONT_SELECTION)) +#define GTK_IS_FONT_SELECTION_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_FONT_SELECTION)) -#define GTK_FONT_SELECTION_DIALOG(obj) GTK_CHECK_CAST (obj, gtk_font_selection_dialog_get_type (), GtkFontSelectionDialog) -#define GTK_FONT_SELECTION_DIALOG_CLASS(klass) GTK_CHECK_CLASS_CAST (klass, gtk_font_selection_dialog_get_type (), GtkFontSelectionDialogClass) -#define GTK_IS_FONT_SELECTION_DIALOG(obj) GTK_CHECK_TYPE (obj, gtk_font_selection_dialog_get_type ()) +#define GTK_TYPE_FONT_SELECTION_DIALOG (gtk_font_selection_dialog_get_type ()) +#define GTK_FONT_SELECTION_DIALOG(obj) (GTK_CHECK_CAST ((obj), GTK_TYPE_FONT_SELECTION_DIALOG, GtkFontSelectionDialog)) +#define GTK_FONT_SELECTION_DIALOG_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_FONT_SELECTION_DIALOG, GtkFontSelectionDialogClass)) +#define GTK_IS_FONT_SELECTION_DIALOG(obj) (GTK_CHECK_TYPE ((obj), GTK_TYPE_FONT_SELECTION_DIALOG)) +#define GTK_IS_FONT_SELECTION_DIALOG_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_FONT_SELECTION_DIALOG)) typedef struct _GtkFontSelection GtkFontSelection; typedef struct _GtkFontSelectionClass GtkFontSelectionClass; @@ -54,7 +58,7 @@ typedef struct _GtkFontSelectionDialogClass GtkFontSelectionDialogClass; /* This is the number of properties which we keep in the properties array, i.e. Weight, Slant, Set Width, Spacing, Charset & Foundry. */ -#define GTK_NUM_FONT_PROPERTIES 6 +#define GTK_NUM_FONT_PROPERTIES 6 /* This is the number of properties each style has i.e. Weight, Slant, Set Width, Spacing & Charset. Note that Foundry is not included, @@ -73,7 +77,7 @@ typedef enum struct _GtkFontSelection { GtkNotebook notebook; - + /* These are on the font page. */ GtkWidget *main_vbox; GtkWidget *font_label; @@ -89,41 +93,41 @@ struct _GtkFontSelection GtkWidget *scaled_bitmaps_button; GtkWidget *preview_entry; GtkWidget *message_label; - + /* These are on the font info page. */ GtkWidget *info_vbox; GtkWidget *info_clist; GtkWidget *requested_font_name; GtkWidget *actual_font_name; - + /* These are on the filter page. */ GtkWidget *filter_vbox; GtkWidget *filter_clists[GTK_NUM_FONT_PROPERTIES]; - + GdkFont *font; gint font_index; gint style; GtkFontMetricType metric; /* The size is either in pixels or deci-points, depending on the metric. */ gint size; - + /* This is the last size explicitly selected. When the user selects different fonts we try to find the nearest size to this. */ gint selected_size; - + /* This flag determines if scaled bitmapped fonts are acceptable. */ gboolean scale_bitmapped_fonts; - + /* These are the current property settings. They are indexes into the strings in the GtkFontSelInfo properties array. */ guint16 property_values[GTK_NUM_STYLE_PROPERTIES]; - + /* These hold the arrays of current filter settings for each property. If nfilters is 0 then all values of the property are OK. If not the filters array contains the indexes of the valid property values. */ guint16 *property_filters[GTK_NUM_FONT_PROPERTIES]; guint16 property_nfilters[GTK_NUM_FONT_PROPERTIES]; - + /* This flags is set to scroll the clist to the selected value as soon as it appears. There might be a better way of doing this. */ gboolean scroll_on_expose; @@ -139,16 +143,16 @@ struct _GtkFontSelectionClass struct _GtkFontSelectionDialog { GtkWindow window; - + GtkWidget *fontsel; - + GtkWidget *main_vbox; GtkWidget *action_area; GtkWidget *ok_button; /* The 'Apply' button is not shown by default but you can show/hide it. */ GtkWidget *apply_button; GtkWidget *cancel_button; - + /* If the user changes the width of the dialog, we turn auto-shrink off. */ gint dialog_width; gboolean auto_resize; @@ -163,7 +167,7 @@ struct _GtkFontSelectionDialogClass /* FontSelection */ -guint gtk_font_selection_get_type (void); +GtkType gtk_font_selection_get_type (void); GtkWidget* gtk_font_selection_new (void); /* This returns the X Logical Font Description fontname, or NULL if no font @@ -182,37 +186,33 @@ GdkFont* gtk_font_selection_get_font (GtkFontSelection *fontsel); Font Description font name (anything else will be ignored), e.g. "-adobe-courier-bold-o-normal--25-*-*-*-*-*-*-*" It returns TRUE on success. */ -gboolean gtk_font_selection_set_font_name (GtkFontSelection *fontsel, +gboolean gtk_font_selection_set_font_name (GtkFontSelection *fontsel, const gchar *fontname); /* This returns the text in the preview entry. You should copy the returned text if you need it. */ -gchar* gtk_font_selection_get_preview_text (GtkFontSelection *fontsel); +gchar* gtk_font_selection_get_preview_text (GtkFontSelection *fontsel); /* This sets the text in the preview entry. It will be copied by the entry, so there's no need to g_strdup() it first. */ -void gtk_font_selection_set_preview_text (GtkFontSelection *fontsel, +void gtk_font_selection_set_preview_text (GtkFontSelection *fontsel, const gchar *text); /* FontSelectionDialog */ -guint gtk_font_selection_dialog_get_type (void); +GtkType gtk_font_selection_dialog_get_type (void); GtkWidget* gtk_font_selection_dialog_new (const gchar *title); /* These simply call the corresponding FontSelection function. */ -gchar* gtk_font_selection_dialog_get_font_name - (GtkFontSelectionDialog *fsd); -GdkFont* gtk_font_selection_dialog_get_font (GtkFontSelectionDialog *fsd); -gboolean gtk_font_selection_dialog_set_font_name - (GtkFontSelectionDialog *fsd, - const gchar *fontname); -gchar* gtk_font_selection_dialog_get_preview_text - (GtkFontSelectionDialog *fsd); -void gtk_font_selection_dialog_set_preview_text - (GtkFontSelectionDialog *fsd, - const gchar *text); +gchar* gtk_font_selection_dialog_get_font_name (GtkFontSelectionDialog *fsd); +GdkFont* gtk_font_selection_dialog_get_font (GtkFontSelectionDialog *fsd); +gboolean gtk_font_selection_dialog_set_font_name (GtkFontSelectionDialog *fsd, + const gchar *fontname); +gchar* gtk_font_selection_dialog_get_preview_text (GtkFontSelectionDialog *fsd); +void gtk_font_selection_dialog_set_preview_text (GtkFontSelectionDialog *fsd, + const gchar *text); #ifdef __cplusplus diff --git a/gtk/gtkitemfactory.c b/gtk/gtkitemfactory.c index dd605d234..0aab1b097 100644 --- a/gtk/gtkitemfactory.c +++ b/gtk/gtkitemfactory.c @@ -319,15 +319,15 @@ gtk_item_factory_propagate_accelerator (GtkItemFactoryItem *item, GTK_ACCEL_VISIBLE); else { - GSList *slist; + GSList *work; - slist = gtk_accel_group_entries_from_object (GTK_OBJECT (widget)); - while (slist) + work = gtk_accel_group_entries_from_object (GTK_OBJECT (widget)); + while (work) { GtkAccelEntry *ac_entry; - ac_entry = slist->data; - slist = slist->next; + ac_entry = work->data; + work = work->next; if (ac_entry->accel_flags & GTK_ACCEL_VISIBLE && ac_entry->accel_group == ifactory->accel_group && ac_entry->signal_id == signal_id) @@ -636,7 +636,7 @@ gtk_item_factory_from_path (const gchar *path) } static void -gtk_item_factory_destroy (GtkObject *object) +gtk_item_factory_destroy (GtkObject *object) { GtkItemFactory *ifactory; GSList *slist; @@ -648,14 +648,14 @@ gtk_item_factory_destroy (GtkObject *object) if (ifactory->widget) { - GtkObject *object; + GtkObject *dobj; - object = GTK_OBJECT (ifactory->widget); + dobj = GTK_OBJECT (ifactory->widget); - gtk_object_ref (object); - gtk_object_sink (object); - gtk_object_destroy (object); - gtk_object_unref (object); + gtk_object_ref (dobj); + gtk_object_sink (dobj); + gtk_object_destroy (dobj); + gtk_object_unref (dobj); ifactory->widget = NULL; } diff --git a/gtk/gtkmain.c b/gtk/gtkmain.c index 9280eac81..2089d881d 100644 --- a/gtk/gtkmain.c +++ b/gtk/gtkmain.c @@ -142,7 +142,7 @@ const guint gtk_binary_age = GTK_BINARY_AGE; const guint gtk_interface_age = GTK_INTERFACE_AGE; static gboolean iteration_done = FALSE; -static guint main_level = 0; +static guint gtk_main_loop_level = 0; static gint gtk_initialized = FALSE; static GdkEvent *next_event = NULL; static GList *current_events = NULL; @@ -523,7 +523,7 @@ gtk_main (void) GtkInitFunction *init; int old_done; - main_level++; + gtk_main_loop_level++; tmp_list = functions = init_functions; init_functions = NULL; @@ -554,7 +554,7 @@ gtk_main (void) quit_functions = g_list_remove_link (quit_functions, quit_functions); - if ((quitf->main_level && quitf->main_level != main_level) || + if ((quitf->main_level && quitf->main_level != gtk_main_loop_level) || gtk_quit_invoke_function (quitf)) { reinvoke_list = g_list_prepend (reinvoke_list, quitf); @@ -567,23 +567,23 @@ gtk_main (void) } if (reinvoke_list) { - GList *tmp_list; + GList *work; - tmp_list = g_list_last (reinvoke_list); + work = g_list_last (reinvoke_list); if (quit_functions) - quit_functions->prev = tmp_list; - tmp_list->next = quit_functions; - quit_functions = tmp_list; + quit_functions->prev = work; + work->next = quit_functions; + quit_functions = work; } } - main_level--; + gtk_main_loop_level--; } guint gtk_main_level (void) { - return main_level; + return gtk_main_loop_level; } void @@ -1438,16 +1438,6 @@ gtk_input_add_full (gint source, return gdk_input_add_full (source, condition, function, data, destroy); } -guint -gtk_input_add_interp (gint source, - GdkInputCondition condition, - GtkCallbackMarshal callback, - gpointer data, - GtkDestroyNotify destroy) -{ - return gtk_input_add_full (source, condition, NULL, callback, data, destroy); -} - void gtk_input_remove (guint tag) { diff --git a/gtk/gtkpacker.c b/gtk/gtkpacker.c index 0be1c03c7..83f0eb2ac 100644 --- a/gtk/gtkpacker.c +++ b/gtk/gtkpacker.c @@ -508,7 +508,7 @@ gtk_packer_set_spacing (GtkPacker *packer, packer->spacing = spacing; gtk_widget_queue_resize (GTK_WIDGET (packer)); } -}; +} GtkWidget* gtk_packer_new (void) @@ -1102,7 +1102,7 @@ XExpansion (GList *children, gint cavityWidth) if (curExpand < minExpand) minExpand = curExpand; return (minExpand < 0) ? 0 : minExpand; -}; +} static void gtk_packer_size_allocate (GtkWidget *widget, GtkAllocation *allocation) diff --git a/gtk/gtksignal.c b/gtk/gtksignal.c index 35b50558d..1830c741b 100644 --- a/gtk/gtksignal.c +++ b/gtk/gtksignal.c @@ -1159,30 +1159,6 @@ gtk_signal_handlers_destroy (GtkObject *object) } } -/* Work around the - '#define gtk_signal_default_marshaller gtk_marshal_NONE__NONE' - in gtkmarshal.h - - This is here to provide some sort of basic backwards binary - compatibility. It is not listed in gtksignal.h in order to make - sure people recompiling things see warnings and make changes as needed. - -ECL -*/ -#undef gtk_signal_default_marshaller -void -gtk_signal_default_marshaller (GtkObject *object, - GtkSignalFunc func, - gpointer func_data, - GtkArg *params) -{ - GtkSignalMarshaller0 rfunc; - - rfunc = (GtkSignalMarshaller0) func; - - (* rfunc) (object, func_data); -} -#define gtk_signal_default_marshaller gtk_marshal_NONE__NONE - void gtk_signal_set_funcs (GtkSignalMarshal marshal_func, GtkSignalDestroy destroy_func) diff --git a/gtk/gtktable.c b/gtk/gtktable.c index b6884eeb1..dfc782c07 100644 --- a/gtk/gtktable.c +++ b/gtk/gtktable.c @@ -25,7 +25,7 @@ enum ARG_N_COLUMNS, ARG_COLUMN_SPACING, ARG_ROW_SPACING, - ARG_HOMOGENEOUS, + ARG_HOMOGENEOUS }; enum diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c index f22179a5a..829e38e64 100644 --- a/gtk/gtkwidget.c +++ b/gtk/gtkwidget.c @@ -173,7 +173,7 @@ static GMemChunk *aux_info_mem_chunk = NULL; static GdkColormap *default_colormap = NULL; static GdkVisual *default_visual = NULL; -static GtkStyle *default_style = NULL; +static GtkStyle *gtk_default_style = NULL; static GSList *colormap_stack = NULL; static GSList *visual_stack = NULL; @@ -2770,26 +2770,26 @@ gtk_widget_reset_rc_styles (GtkWidget *widget) void gtk_widget_set_default_style (GtkStyle *style) { - if (style != default_style) + if (style != gtk_default_style) { - if (default_style) - gtk_style_unref (default_style); - default_style = style; - if (default_style) - gtk_style_ref (default_style); + if (gtk_default_style) + gtk_style_unref (gtk_default_style); + gtk_default_style = style; + if (gtk_default_style) + gtk_style_ref (gtk_default_style); } } GtkStyle* gtk_widget_get_default_style (void) { - if (!default_style) + if (!gtk_default_style) { - default_style = gtk_style_new (); - gtk_style_ref (default_style); + gtk_default_style = gtk_style_new (); + gtk_style_ref (gtk_default_style); } - return default_style; + return gtk_default_style; } void diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c index bf2693209..d23367e94 100644 --- a/gtk/gtkwindow.c +++ b/gtk/gtkwindow.c @@ -932,8 +932,7 @@ gtk_window_read_rcfiles (GtkWidget *widget, toplevels = gdk_window_get_toplevels(); while (toplevels) { - GtkWidget *widget; - gdk_window_get_user_data (toplevels->data, (gpointer *)&widget); + gdk_window_get_user_data (toplevels->data, (gpointer*) &widget); if (widget) gtk_widget_reset_rc_styles (widget); |