diff options
| author | Michael Natterer <mitch@imendio.com> | 2008-05-28 15:35:43 +0000 |
|---|---|---|
| committer | Michael Natterer <mitch@src.gnome.org> | 2008-05-28 15:35:43 +0000 |
| commit | 2c5f8a5c2baf4409e01139eadf2589ca46fe29cc (patch) | |
| tree | dc564a9d2ed48218754a19aefc9f154f16928ac9 /gtk | |
| parent | 0bf59ed22e22dd10e16e862eb3a1bf3801af3046 (diff) | |
| download | gtk+-2c5f8a5c2baf4409e01139eadf2589ca46fe29cc.tar.gz | |
whitespace cleanup: remove trailing whitespace and excess newlines and
2008-05-28 Michael Natterer <mitch@imendio.com>
* gtk/gtk*.h: whitespace cleanup: remove trailing whitespace and
excess newlines and sprinkled some newlines where needed. Zero
code or formatting changes included.
svn path=/trunk/; revision=20225
Diffstat (limited to 'gtk')
133 files changed, 305 insertions, 328 deletions
diff --git a/gtk/gtkaccelgroup.h b/gtk/gtkaccelgroup.h index d5ade0b32b..c620a9e8b9 100644 --- a/gtk/gtkaccelgroup.h +++ b/gtk/gtkaccelgroup.h @@ -21,7 +21,7 @@ * Modified by the GTK+ Team and others 1997-2000. See the AUTHORS * file for a list of people on the GTK+ Team. See the ChangeLog * files for a list of changes. These files are distributed with - * GTK+ at ftp://ftp.gtk.org/pub/gtk/. + * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) diff --git a/gtk/gtkaccellabel.h b/gtk/gtkaccellabel.h index d831f553c5..cc8790ab95 100644 --- a/gtk/gtkaccellabel.h +++ b/gtk/gtkaccellabel.h @@ -24,7 +24,7 @@ * Modified by the GTK+ Team and others 1997-2001. See the AUTHORS * file for a list of people on the GTK+ Team. See the ChangeLog * files for a list of changes. These files are distributed with - * GTK+ at ftp://ftp.gtk.org/pub/gtk/. + * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) diff --git a/gtk/gtkaction.h b/gtk/gtkaction.h index 02b77b39f2..4cc5d93b1b 100644 --- a/gtk/gtkaction.h +++ b/gtk/gtkaction.h @@ -25,7 +25,7 @@ * Modified by the GTK+ Team and others 2003. See the AUTHORS * file for a list of people on the GTK+ Team. See the ChangeLog * files for a list of changes. These files are distributed with - * GTK+ at ftp://ftp.gtk.org/pub/gtk/. + * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) diff --git a/gtk/gtkactiongroup.h b/gtk/gtkactiongroup.h index 2618e91a1d..17067b939d 100644 --- a/gtk/gtkactiongroup.h +++ b/gtk/gtkactiongroup.h @@ -19,13 +19,13 @@ * Boston, MA 02111-1307, USA. */ -/* +/* * Author: James Henstridge <james@daa.com.au> * * Modified by the GTK+ Team and others 2003. See the AUTHORS * file for a list of people on the GTK+ Team. See the ChangeLog * files for a list of changes. These files are distributed with - * GTK+ at ftp://ftp.gtk.org/pub/gtk/. + * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) diff --git a/gtk/gtkadjustment.h b/gtk/gtkadjustment.h index ea37a9a420..10e33c42b8 100644 --- a/gtk/gtkadjustment.h +++ b/gtk/gtkadjustment.h @@ -21,7 +21,7 @@ * Modified by the GTK+ Team and others 1997-2000. See the AUTHORS * file for a list of people on the GTK+ Team. See the ChangeLog * files for a list of changes. These files are distributed with - * GTK+ at ftp://ftp.gtk.org/pub/gtk/. + * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) diff --git a/gtk/gtkalignment.h b/gtk/gtkalignment.h index 5946c74f07..d595c4319a 100644 --- a/gtk/gtkalignment.h +++ b/gtk/gtkalignment.h @@ -21,7 +21,7 @@ * Modified by the GTK+ Team and others 1997-2000. See the AUTHORS * file for a list of people on the GTK+ Team. See the ChangeLog * files for a list of changes. These files are distributed with - * GTK+ at ftp://ftp.gtk.org/pub/gtk/. + * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) diff --git a/gtk/gtkarrow.h b/gtk/gtkarrow.h index 1911749ac7..cdb5d50768 100644 --- a/gtk/gtkarrow.h +++ b/gtk/gtkarrow.h @@ -21,7 +21,7 @@ * Modified by the GTK+ Team and others 1997-2001. See the AUTHORS * file for a list of people on the GTK+ Team. See the ChangeLog * files for a list of changes. These files are distributed with - * GTK+ at ftp://ftp.gtk.org/pub/gtk/. + * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) diff --git a/gtk/gtkaspectframe.h b/gtk/gtkaspectframe.h index 3de843b47a..59fdc9eca4 100644 --- a/gtk/gtkaspectframe.h +++ b/gtk/gtkaspectframe.h @@ -21,7 +21,7 @@ * Modified by the GTK+ Team and others 1997-2001. See the AUTHORS * file for a list of people on the GTK+ Team. See the ChangeLog * files for a list of changes. These files are distributed with - * GTK+ at ftp://ftp.gtk.org/pub/gtk/. + * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) diff --git a/gtk/gtkbbox.h b/gtk/gtkbbox.h index 4c4f58b280..ecd91d78b2 100644 --- a/gtk/gtkbbox.h +++ b/gtk/gtkbbox.h @@ -21,7 +21,7 @@ * Modified by the GTK+ Team and others 1997-2000. See the AUTHORS * file for a list of people on the GTK+ Team. See the ChangeLog * files for a list of changes. These files are distributed with - * GTK+ at ftp://ftp.gtk.org/pub/gtk/. + * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) @@ -103,5 +103,3 @@ void _gtk_button_box_child_requisition (GtkWidget *widget, G_END_DECLS #endif /* __GTK_BUTTON_BOX_H__ */ - - diff --git a/gtk/gtkbin.h b/gtk/gtkbin.h index 4e55bf21ce..fb67728f55 100644 --- a/gtk/gtkbin.h +++ b/gtk/gtkbin.h @@ -21,7 +21,7 @@ * Modified by the GTK+ Team and others 1997-2000. See the AUTHORS * file for a list of people on the GTK+ Team. See the ChangeLog * files for a list of changes. These files are distributed with - * GTK+ at ftp://ftp.gtk.org/pub/gtk/. + * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) diff --git a/gtk/gtkbindings.h b/gtk/gtkbindings.h index 73615adef7..8d679cd80f 100644 --- a/gtk/gtkbindings.h +++ b/gtk/gtkbindings.h @@ -24,7 +24,7 @@ * Modified by the GTK+ Team and others 1997-2000. See the AUTHORS * file for a list of people on the GTK+ Team. See the ChangeLog * files for a list of changes. These files are distributed with - * GTK+ at ftp://ftp.gtk.org/pub/gtk/. + * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) diff --git a/gtk/gtkbox.h b/gtk/gtkbox.h index abd6fdbc4f..9e70836620 100644 --- a/gtk/gtkbox.h +++ b/gtk/gtkbox.h @@ -21,7 +21,7 @@ * Modified by the GTK+ Team and others 1997-2000. See the AUTHORS * file for a list of people on the GTK+ Team. See the ChangeLog * files for a list of changes. These files are distributed with - * GTK+ at ftp://ftp.gtk.org/pub/gtk/. + * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) diff --git a/gtk/gtkbutton.h b/gtk/gtkbutton.h index aaac546878..499615da98 100644 --- a/gtk/gtkbutton.h +++ b/gtk/gtkbutton.h @@ -21,7 +21,7 @@ * Modified by the GTK+ Team and others 1997-2001. See the AUTHORS * file for a list of people on the GTK+ Team. See the ChangeLog * files for a list of changes. These files are distributed with - * GTK+ at ftp://ftp.gtk.org/pub/gtk/. + * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) diff --git a/gtk/gtkcalendar.h b/gtk/gtkcalendar.h index 7071091574..3d2154c326 100644 --- a/gtk/gtkcalendar.h +++ b/gtk/gtkcalendar.h @@ -23,7 +23,7 @@ * Modified by the GTK+ Team and others 1997-2000. See the AUTHORS * file for a list of people on the GTK+ Team. See the ChangeLog * files for a list of changes. These files are distributed with - * GTK+ at ftp://ftp.gtk.org/pub/gtk/. + * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) diff --git a/gtk/gtkcellrendererprogress.h b/gtk/gtkcellrendererprogress.h index 4bb4134c4b..9d1741e91d 100644 --- a/gtk/gtkcellrendererprogress.h +++ b/gtk/gtkcellrendererprogress.h @@ -17,11 +17,12 @@ * Free Software Foundation, Inc., 59 Temple Place - Suite 330, * Boston, MA 02111-1307, USA. */ + /* * Modified by the GTK+ Team and others 1997-2004. See the AUTHORS * file for a list of people on the GTK+ Team. See the ChangeLog * files for a list of changes. These files are distributed with - * GTK+ at ftp://ftp.gtk.org/pub/gtk/. + * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) @@ -49,7 +50,7 @@ typedef struct _GtkCellRendererProgressPrivate GtkCellRendererProgressPrivate; struct _GtkCellRendererProgress { GtkCellRenderer parent_instance; - + /*< private >*/ GtkCellRendererProgressPrivate *priv; }; diff --git a/gtk/gtkcellrenderertext.h b/gtk/gtkcellrenderertext.h index b6df6a084f..b5a34ba1fb 100644 --- a/gtk/gtkcellrenderertext.h +++ b/gtk/gtkcellrenderertext.h @@ -51,7 +51,7 @@ struct _GtkCellRendererText gdouble font_scale; PangoColor foreground; PangoColor background; - + PangoAttrList *extra_attrs; PangoUnderline underline_style; @@ -64,14 +64,14 @@ struct _GtkCellRendererText guint editable : 1; guint scale_set : 1; - + guint foreground_set : 1; guint background_set : 1; - + guint underline_set : 1; guint rise_set : 1; - + guint strikethrough_set : 1; guint editable_set : 1; diff --git a/gtk/gtkcellrenderertoggle.h b/gtk/gtkcellrenderertoggle.h index 500ea53a70..19ff6599b2 100644 --- a/gtk/gtkcellrenderertoggle.h +++ b/gtk/gtkcellrenderertoggle.h @@ -78,5 +78,4 @@ void gtk_cell_renderer_toggle_set_active (GtkCellRendererToggle *togg G_END_DECLS - #endif /* __GTK_CELL_RENDERER_TOGGLE_H__ */ diff --git a/gtk/gtkcheckbutton.h b/gtk/gtkcheckbutton.h index 2e0a47f359..1b50086abe 100644 --- a/gtk/gtkcheckbutton.h +++ b/gtk/gtkcheckbutton.h @@ -21,7 +21,7 @@ * Modified by the GTK+ Team and others 1997-2000. See the AUTHORS * file for a list of people on the GTK+ Team. See the ChangeLog * files for a list of changes. These files are distributed with - * GTK+ at ftp://ftp.gtk.org/pub/gtk/. + * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) diff --git a/gtk/gtkcheckmenuitem.h b/gtk/gtkcheckmenuitem.h index c8dae31cd9..e4ba3781b3 100644 --- a/gtk/gtkcheckmenuitem.h +++ b/gtk/gtkcheckmenuitem.h @@ -21,7 +21,7 @@ * Modified by the GTK+ Team and others 1997-2001. See the AUTHORS * file for a list of people on the GTK+ Team. See the ChangeLog * files for a list of changes. These files are distributed with - * GTK+ at ftp://ftp.gtk.org/pub/gtk/. + * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) @@ -52,7 +52,7 @@ typedef struct _GtkCheckMenuItemClass GtkCheckMenuItemClass; struct _GtkCheckMenuItem { GtkMenuItem menu_item; - + guint active : 1; guint always_show_toggle : 1; guint inconsistent : 1; @@ -62,7 +62,7 @@ struct _GtkCheckMenuItem struct _GtkCheckMenuItemClass { GtkMenuItemClass parent_class; - + void (* toggled) (GtkCheckMenuItem *check_menu_item); void (* draw_indicator) (GtkCheckMenuItem *check_menu_item, GdkRectangle *area); @@ -90,7 +90,7 @@ gboolean gtk_check_menu_item_get_inconsistent (GtkCheckMenuItem *check_menu_i void gtk_check_menu_item_set_draw_as_radio (GtkCheckMenuItem *check_menu_item, gboolean draw_as_radio); gboolean gtk_check_menu_item_get_draw_as_radio (GtkCheckMenuItem *check_menu_item); - + #ifndef GTK_DISABLE_DEPRECATED void gtk_check_menu_item_set_show_toggle (GtkCheckMenuItem *menu_item, diff --git a/gtk/gtkclipboard.h b/gtk/gtkclipboard.h index 5de4152793..3132a5c798 100644 --- a/gtk/gtkclipboard.h +++ b/gtk/gtkclipboard.h @@ -16,7 +16,7 @@ * Free Software Foundation, Inc., 59 Temple Place - Suite 330, * Boston, MA 02111-1307, USA. * - * Global clipboard abstraction. + * Global clipboard abstraction. */ #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) @@ -138,12 +138,12 @@ void gtk_clipboard_set_can_store (GtkClipboard *clipboard, gint n_targets); void gtk_clipboard_store (GtkClipboard *clipboard); - + /* private */ void _gtk_clipboard_handle_event (GdkEventOwnerChange *event); void _gtk_clipboard_store_all (void); - + G_END_DECLS #endif /* __GTK_CLIPBOARD_H__ */ diff --git a/gtk/gtkcolorsel.h b/gtk/gtkcolorsel.h index 34a271ce69..4d2fa855ca 100644 --- a/gtk/gtkcolorsel.h +++ b/gtk/gtkcolorsel.h @@ -1,5 +1,5 @@ /* GTK - The GIMP Toolkit - * Copyright (C) 2000 Red Hat, Inc. + * Copyright (C) 2000 Red Hat, Inc. * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald * * This library is free software; you can redistribute it and/or @@ -22,7 +22,7 @@ * Modified by the GTK+ Team and others 1997-2000. See the AUTHORS * file for a list of people on the GTK+ Team. See the ChangeLog * files for a list of changes. These files are distributed with - * GTK+ at ftp://ftp.gtk.org/pub/gtk/. + * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) diff --git a/gtk/gtkcolorseldialog.h b/gtk/gtkcolorseldialog.h index 3b9ad69f60..38ee923332 100644 --- a/gtk/gtkcolorseldialog.h +++ b/gtk/gtkcolorseldialog.h @@ -21,7 +21,7 @@ * Modified by the GTK+ Team and others 1997-2000. See the AUTHORS * file for a list of people on the GTK+ Team. See the ChangeLog * files for a list of changes. These files are distributed with - * GTK+ at ftp://ftp.gtk.org/pub/gtk/. + * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) @@ -71,9 +71,9 @@ struct _GtkColorSelectionDialogClass }; -/* ColorSelectionDialog */ +/* ColorSelectionDialog */ GType gtk_color_selection_dialog_get_type (void) G_GNUC_CONST; -GtkWidget* gtk_color_selection_dialog_new (const gchar *title); +GtkWidget* gtk_color_selection_dialog_new (const gchar *title); G_END_DECLS diff --git a/gtk/gtkcontainer.h b/gtk/gtkcontainer.h index 04ba4f9146..2154160895 100644 --- a/gtk/gtkcontainer.h +++ b/gtk/gtkcontainer.h @@ -21,7 +21,7 @@ * Modified by the GTK+ Team and others 1997-2000. See the AUTHORS * file for a list of people on the GTK+ Team. See the ChangeLog * files for a list of changes. These files are distributed with - * GTK+ at ftp://ftp.gtk.org/pub/gtk/. + * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) @@ -56,9 +56,9 @@ typedef struct _GtkContainerClass GtkContainerClass; struct _GtkContainer { GtkWidget widget; - + GtkWidget *focus_child; - + guint border_width : 16; /*< private >*/ diff --git a/gtk/gtkcurve.h b/gtk/gtkcurve.h index 09028fe13f..d97b4f5bb2 100644 --- a/gtk/gtkcurve.h +++ b/gtk/gtkcurve.h @@ -21,7 +21,7 @@ * Modified by the GTK+ Team and others 1997-2000. See the AUTHORS * file for a list of people on the GTK+ Team. See the ChangeLog * files for a list of changes. These files are distributed with - * GTK+ at ftp://ftp.gtk.org/pub/gtk/. + * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ /* diff --git a/gtk/gtkdebug.h b/gtk/gtkdebug.h index c4d9d55ec3..2190973239 100644 --- a/gtk/gtkdebug.h +++ b/gtk/gtkdebug.h @@ -21,7 +21,7 @@ * Modified by the GTK+ Team and others 1997-2000. See the AUTHORS * file for a list of people on the GTK+ Team. See the ChangeLog * files for a list of changes. These files are distributed with - * GTK+ at ftp://ftp.gtk.org/pub/gtk/. + * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) @@ -59,7 +59,7 @@ typedef enum { #else /* !G_ENABLE_DEBUG */ #define GTK_NOTE(type, action) - + #endif /* G_ENABLE_DEBUG */ #ifdef G_OS_WIN32 diff --git a/gtk/gtkdialog.h b/gtk/gtkdialog.h index 4115f9a855..24252bb5a8 100644 --- a/gtk/gtkdialog.h +++ b/gtk/gtkdialog.h @@ -21,7 +21,7 @@ * Modified by the GTK+ Team and others 1997-2000. See the AUTHORS * file for a list of people on the GTK+ Team. See the ChangeLog * files for a list of changes. These files are distributed with - * GTK+ at ftp://ftp.gtk.org/pub/gtk/. + * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) diff --git a/gtk/gtkdnd.h b/gtk/gtkdnd.h index 740a2e459c..0fabdeca1d 100644 --- a/gtk/gtkdnd.h +++ b/gtk/gtkdnd.h @@ -22,7 +22,7 @@ * Modified by the GTK+ Team and others 1997-2000. See the AUTHORS * file for a list of people on the GTK+ Team. See the ChangeLog * files for a list of changes. These files are distributed with - * GTK+ at ftp://ftp.gtk.org/pub/gtk/. + * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) @@ -46,7 +46,7 @@ typedef enum { GTK_DEST_DEFAULT_ALL = 0x07 } GtkDestDefaults; -/* Flags for the GtkTargetEntry on the destination side +/* Flags for the GtkTargetEntry on the destination side */ typedef enum { GTK_TARGET_SAME_APP = 1 << 0, /*< nick=same-app >*/ @@ -186,6 +186,3 @@ void gtk_drag_set_default_icon (GdkColormap *colormap, G_END_DECLS #endif /* __GTK_DND_H__ */ - - - diff --git a/gtk/gtkdrawingarea.h b/gtk/gtkdrawingarea.h index 61c2a5333a..aefb850d52 100644 --- a/gtk/gtkdrawingarea.h +++ b/gtk/gtkdrawingarea.h @@ -21,7 +21,7 @@ * Modified by the GTK+ Team and others 1997-2000. See the AUTHORS * file for a list of people on the GTK+ Team. See the ChangeLog * files for a list of changes. These files are distributed with - * GTK+ at ftp://ftp.gtk.org/pub/gtk/. + * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) diff --git a/gtk/gtkeditable.h b/gtk/gtkeditable.h index e3cab269e1..ec57b16be7 100644 --- a/gtk/gtkeditable.h +++ b/gtk/gtkeditable.h @@ -21,7 +21,7 @@ * Modified by the GTK+ Team and others 1997-2000. See the AUTHORS * file for a list of people on the GTK+ Team. See the ChangeLog * files for a list of changes. These files are distributed with - * GTK+ at ftp://ftp.gtk.org/pub/gtk/. + * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) @@ -50,7 +50,7 @@ typedef struct _GtkEditableClass GtkEditableClass; struct _GtkEditableClass { GTypeInterface base_iface; - + /* signals */ void (* insert_text) (GtkEditable *editable, const gchar *text, diff --git a/gtk/gtkentry.h b/gtk/gtkentry.h index b08c56e395..56a2b4016d 100644 --- a/gtk/gtkentry.h +++ b/gtk/gtkentry.h @@ -21,7 +21,7 @@ * Modified by the GTK+ Team and others 1997-2000. See the AUTHORS * file for a list of people on the GTK+ Team. See the ChangeLog * files for a list of changes. These files are distributed with - * GTK+ at ftp://ftp.gtk.org/pub/gtk/. + * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) @@ -70,10 +70,10 @@ struct _GtkEntry GdkWindow *text_area; GtkIMContext *im_context; GtkWidget *popup_menu; - + gint current_pos; gint selection_bound; - + PangoLayout *cached_layout; guint cache_includes_preedit : 1; @@ -96,7 +96,7 @@ struct _GtkEntry gint scroll_offset; gint ascent; /* font ascent, in pango units */ gint descent; /* font descent, in pango units */ - + guint16 text_size; /* allocated size, in bytes */ guint16 n_bytes; /* length in use, in bytes */ @@ -107,7 +107,7 @@ struct _GtkEntry gint drag_start_x; gint drag_start_y; - + gunichar invisible_char; gint width_chars; @@ -120,7 +120,7 @@ struct _GtkEntryClass /* Hook to customize right-click popup */ void (* populate_popup) (GtkEntry *entry, GtkMenu *menu); - + /* Action signals */ void (* activate) (GtkEntry *entry); @@ -201,7 +201,7 @@ gint gtk_entry_layout_index_to_text_index (GtkEntry *entry, gint gtk_entry_text_index_to_layout_index (GtkEntry *entry, gint text_index); -/* For scrolling cursor appropriately +/* For scrolling cursor appropriately */ void gtk_entry_set_cursor_hadjustment (GtkEntry *entry, GtkAdjustment *adjustment); diff --git a/gtk/gtkentrycompletion.h b/gtk/gtkentrycompletion.h index 0086ce568f..b9ad7ce2e8 100644 --- a/gtk/gtkentrycompletion.h +++ b/gtk/gtkentrycompletion.h @@ -68,7 +68,7 @@ struct _GtkEntryCompletionClass void (* action_activated) (GtkEntryCompletion *completion, gint index_); gboolean (* insert_prefix) (GtkEntryCompletion *completion, - const gchar *prefix); + const gchar *prefix); gboolean (* cursor_on_match) (GtkEntryCompletion *completion, GtkTreeModel *model, GtkTreeIter *iter); diff --git a/gtk/gtkeventbox.h b/gtk/gtkeventbox.h index b5c7e54737..78b63e394d 100644 --- a/gtk/gtkeventbox.h +++ b/gtk/gtkeventbox.h @@ -21,7 +21,7 @@ * Modified by the GTK+ Team and others 1997-2000. See the AUTHORS * file for a list of people on the GTK+ Team. See the ChangeLog * files for a list of changes. These files are distributed with - * GTK+ at ftp://ftp.gtk.org/pub/gtk/. + * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) diff --git a/gtk/gtkfilefilter.h b/gtk/gtkfilefilter.h index 737ad5857f..dde1fa931a 100644 --- a/gtk/gtkfilefilter.h +++ b/gtk/gtkfilefilter.h @@ -49,7 +49,7 @@ typedef gboolean (*GtkFileFilterFunc) (const GtkFileFilterInfo *filter_info, struct _GtkFileFilterInfo { GtkFileFilterFlags contains; - + const gchar *filename; const gchar *uri; const gchar *display_name; diff --git a/gtk/gtkfixed.h b/gtk/gtkfixed.h index cfe3c5e8af..cea5adaa5e 100644 --- a/gtk/gtkfixed.h +++ b/gtk/gtkfixed.h @@ -21,7 +21,7 @@ * Modified by the GTK+ Team and others 1997-2000. See the AUTHORS * file for a list of people on the GTK+ Team. See the ChangeLog * files for a list of changes. These files are distributed with - * GTK+ at ftp://ftp.gtk.org/pub/gtk/. + * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) diff --git a/gtk/gtkfontbutton.h b/gtk/gtkfontbutton.h index f7bd19fe80..59fb5aaf54 100644 --- a/gtk/gtkfontbutton.h +++ b/gtk/gtkfontbutton.h @@ -2,7 +2,7 @@ * Copyright (C) 1998 David Abilleira Freijeiro <odaf@nexo.es> * All rights reserved * Based on gnome-color-picker by Federico Mena <federico@nuclecu.unam.mx> - * + * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public * License as published by the Free Software Foundation; either @@ -21,7 +21,7 @@ * Modified by the GTK+ Team and others 2003. See the AUTHORS * file for a list of people on the GTK+ Team. See the ChangeLog * files for a list of changes. These files are distributed with - * GTK+ at ftp://ftp.gtk.org/pub/gtk/. + * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) @@ -96,9 +96,5 @@ void gtk_font_button_set_show_size (GtkFontButton *font_button G_END_DECLS - -#endif /* __GTK_FONT_BUTTON_H__ */ - - - +#endif /* __GTK_FONT_BUTTON_H__ */ diff --git a/gtk/gtkfontsel.h b/gtk/gtkfontsel.h index 8469033786..08d120749d 100644 --- a/gtk/gtkfontsel.h +++ b/gtk/gtkfontsel.h @@ -25,7 +25,7 @@ * Modified by the GTK+ Team and others 1997-2000. See the AUTHORS * file for a list of people on the GTK+ Team. See the ChangeLog * files for a list of changes. These files are distributed with - * GTK+ at ftp://ftp.gtk.org/pub/gtk/. + * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) diff --git a/gtk/gtkframe.h b/gtk/gtkframe.h index dc24cf5c5c..13d70d143a 100644 --- a/gtk/gtkframe.h +++ b/gtk/gtkframe.h @@ -21,7 +21,7 @@ * Modified by the GTK+ Team and others 1997-2000. See the AUTHORS * file for a list of people on the GTK+ Team. See the ChangeLog * files for a list of changes. These files are distributed with - * GTK+ at ftp://ftp.gtk.org/pub/gtk/. + * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) diff --git a/gtk/gtkgamma.h b/gtk/gtkgamma.h index 328b6f9342..a926e614f1 100644 --- a/gtk/gtkgamma.h +++ b/gtk/gtkgamma.h @@ -21,7 +21,7 @@ * Modified by the GTK+ Team and others 1997-2000. See the AUTHORS * file for a list of people on the GTK+ Team. See the ChangeLog * files for a list of changes. These files are distributed with - * GTK+ at ftp://ftp.gtk.org/pub/gtk/. + * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ /* diff --git a/gtk/gtkgc.h b/gtk/gtkgc.h index 4d5f6ffb04..5fcb1a2cf0 100644 --- a/gtk/gtkgc.h +++ b/gtk/gtkgc.h @@ -21,7 +21,7 @@ * Modified by the GTK+ Team and others 1997-2000. See the AUTHORS * file for a list of people on the GTK+ Team. See the ChangeLog * files for a list of changes. These files are distributed with - * GTK+ at ftp://ftp.gtk.org/pub/gtk/. + * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) diff --git a/gtk/gtkhandlebox.h b/gtk/gtkhandlebox.h index 8409f44f0b..1d7367c40f 100644 --- a/gtk/gtkhandlebox.h +++ b/gtk/gtkhandlebox.h @@ -22,7 +22,7 @@ * Modified by the GTK+ Team and others 1997-2000. See the AUTHORS * file for a list of people on the GTK+ Team. See the ChangeLog * files for a list of changes. These files are distributed with - * GTK+ at ftp://ftp.gtk.org/pub/gtk/. + * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ /* The GtkHandleBox is to allow widgets to be dragged in and out of diff --git a/gtk/gtkhbbox.h b/gtk/gtkhbbox.h index 04bf6c753c..65d6df975a 100644 --- a/gtk/gtkhbbox.h +++ b/gtk/gtkhbbox.h @@ -21,7 +21,7 @@ * Modified by the GTK+ Team and others 1997-2000. See the AUTHORS * file for a list of people on the GTK+ Team. See the ChangeLog * files for a list of changes. These files are distributed with - * GTK+ at ftp://ftp.gtk.org/pub/gtk/. + * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) diff --git a/gtk/gtkhbox.h b/gtk/gtkhbox.h index 41a5dff8ad..4283999a08 100644 --- a/gtk/gtkhbox.h +++ b/gtk/gtkhbox.h @@ -21,7 +21,7 @@ * Modified by the GTK+ Team and others 1997-2000. See the AUTHORS * file for a list of people on the GTK+ Team. See the ChangeLog * files for a list of changes. These files are distributed with - * GTK+ at ftp://ftp.gtk.org/pub/gtk/. + * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) diff --git a/gtk/gtkhpaned.h b/gtk/gtkhpaned.h index 54fdcdb3d8..f2c8ad581d 100644 --- a/gtk/gtkhpaned.h +++ b/gtk/gtkhpaned.h @@ -21,7 +21,7 @@ * Modified by the GTK+ Team and others 1997-2000. See the AUTHORS * file for a list of people on the GTK+ Team. See the ChangeLog * files for a list of changes. These files are distributed with - * GTK+ at ftp://ftp.gtk.org/pub/gtk/. + * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) diff --git a/gtk/gtkhruler.h b/gtk/gtkhruler.h index b13867c3b7..1e167e1c9b 100644 --- a/gtk/gtkhruler.h +++ b/gtk/gtkhruler.h @@ -21,7 +21,7 @@ * Modified by the GTK+ Team and others 1997-2000. See the AUTHORS * file for a list of people on the GTK+ Team. See the ChangeLog * files for a list of changes. These files are distributed with - * GTK+ at ftp://ftp.gtk.org/pub/gtk/. + * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ /* diff --git a/gtk/gtkhscale.h b/gtk/gtkhscale.h index d2e243d9f8..e1818bdab1 100644 --- a/gtk/gtkhscale.h +++ b/gtk/gtkhscale.h @@ -21,7 +21,7 @@ * Modified by the GTK+ Team and others 1997-2000. See the AUTHORS * file for a list of people on the GTK+ Team. See the ChangeLog * files for a list of changes. These files are distributed with - * GTK+ at ftp://ftp.gtk.org/pub/gtk/. + * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) diff --git a/gtk/gtkhscrollbar.h b/gtk/gtkhscrollbar.h index 3aff419e9f..f170a10f6d 100644 --- a/gtk/gtkhscrollbar.h +++ b/gtk/gtkhscrollbar.h @@ -21,7 +21,7 @@ * Modified by the GTK+ Team and others 1997-2000. See the AUTHORS * file for a list of people on the GTK+ Team. See the ChangeLog * files for a list of changes. These files are distributed with - * GTK+ at ftp://ftp.gtk.org/pub/gtk/. + * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) diff --git a/gtk/gtkhseparator.h b/gtk/gtkhseparator.h index 2f3abefa63..7ea9a545da 100644 --- a/gtk/gtkhseparator.h +++ b/gtk/gtkhseparator.h @@ -21,7 +21,7 @@ * Modified by the GTK+ Team and others 1997-2000. See the AUTHORS * file for a list of people on the GTK+ Team. See the ChangeLog * files for a list of changes. These files are distributed with - * GTK+ at ftp://ftp.gtk.org/pub/gtk/. + * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) diff --git a/gtk/gtkiconfactory.h b/gtk/gtkiconfactory.h index 381ac7e6ce..db76b95d01 100644 --- a/gtk/gtkiconfactory.h +++ b/gtk/gtkiconfactory.h @@ -21,7 +21,7 @@ * Modified by the GTK+ Team and others 1997-2000. See the AUTHORS * file for a list of people on the GTK+ Team. See the ChangeLog * files for a list of changes. These files are distributed with - * GTK+ at ftp://ftp.gtk.org/pub/gtk/. + * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) diff --git a/gtk/gtkimage.h b/gtk/gtkimage.h index 695d39f08b..2fb0f61bd3 100644 --- a/gtk/gtkimage.h +++ b/gtk/gtkimage.h @@ -21,7 +21,7 @@ * Modified by the GTK+ Team and others 1997-2000. See the AUTHORS * file for a list of people on the GTK+ Team. See the ChangeLog * files for a list of changes. These files are distributed with - * GTK+ at ftp://ftp.gtk.org/pub/gtk/. + * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) diff --git a/gtk/gtkimagemenuitem.h b/gtk/gtkimagemenuitem.h index 0485657e6c..69af1a5adc 100644 --- a/gtk/gtkimagemenuitem.h +++ b/gtk/gtkimagemenuitem.h @@ -21,7 +21,7 @@ * Modified by the GTK+ Team and others 1997-2000. See the AUTHORS * file for a list of people on the GTK+ Team. See the ChangeLog * files for a list of changes. These files are distributed with - * GTK+ at ftp://ftp.gtk.org/pub/gtk/. + * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) diff --git a/gtk/gtkimcontextsimple.h b/gtk/gtkimcontextsimple.h index fb0eadf913..b596877f5e 100644 --- a/gtk/gtkimcontextsimple.h +++ b/gtk/gtkimcontextsimple.h @@ -42,13 +42,13 @@ typedef struct _GtkIMContextSimple GtkIMContextSimple; typedef struct _GtkIMContextSimpleClass GtkIMContextSimpleClass; #define GTK_MAX_COMPOSE_LEN 7 - + struct _GtkIMContextSimple { GtkIMContext object; GSList *tables; - + guint compose_buffer[GTK_MAX_COMPOSE_LEN + 1]; gunichar tentative_match; gint tentative_match_len; diff --git a/gtk/gtkinputdialog.h b/gtk/gtkinputdialog.h index f24d75514a..3e2c7b2fb6 100644 --- a/gtk/gtkinputdialog.h +++ b/gtk/gtkinputdialog.h @@ -21,7 +21,7 @@ * Modified by the GTK+ Team and others 1997-2000. See the AUTHORS * file for a list of people on the GTK+ Team. See the ChangeLog * files for a list of changes. These files are distributed with - * GTK+ at ftp://ftp.gtk.org/pub/gtk/. + * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ /* @@ -69,7 +69,7 @@ struct _GtkInputDialog GtkWidget *close_button; GtkWidget *save_button; - + GtkWidget *axis_items[GDK_AXIS_LAST]; GdkDevice *current_device; diff --git a/gtk/gtkinvisible.h b/gtk/gtkinvisible.h index be12be0a6a..d1edb6ba5d 100644 --- a/gtk/gtkinvisible.h +++ b/gtk/gtkinvisible.h @@ -21,7 +21,7 @@ * Modified by the GTK+ Team and others 1997-2000. See the AUTHORS * file for a list of people on the GTK+ Team. See the ChangeLog * files for a list of changes. These files are distributed with - * GTK+ at ftp://ftp.gtk.org/pub/gtk/. + * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) diff --git a/gtk/gtkitem.h b/gtk/gtkitem.h index 1f78b26d3e..9a6e407c97 100644 --- a/gtk/gtkitem.h +++ b/gtk/gtkitem.h @@ -21,7 +21,7 @@ * Modified by the GTK+ Team and others 1997-2000. See the AUTHORS * file for a list of people on the GTK+ Team. See the ChangeLog * files for a list of changes. These files are distributed with - * GTK+ at ftp://ftp.gtk.org/pub/gtk/. + * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) diff --git a/gtk/gtkitemfactory.h b/gtk/gtkitemfactory.h index d78483f1d2..bd9332f523 100644 --- a/gtk/gtkitemfactory.h +++ b/gtk/gtkitemfactory.h @@ -24,7 +24,7 @@ * Modified by the GTK+ Team and others 1997-2000. See the AUTHORS * file for a list of people on the GTK+ Team. See the ChangeLog * files for a list of changes. These files are distributed with - * GTK+ at ftp://ftp.gtk.org/pub/gtk/. + * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ #ifndef GTK_DISABLE_DEPRECATED diff --git a/gtk/gtklabel.h b/gtk/gtklabel.h index 5d0d124737..d684b48544 100644 --- a/gtk/gtklabel.h +++ b/gtk/gtklabel.h @@ -20,7 +20,7 @@ * Modified by the GTK+ Team and others 1997-2000. See the AUTHORS * file for a list of people on the GTK+ Team. See the ChangeLog * files for a list of changes. These files are distributed with - * GTK+ at ftp://ftp.gtk.org/pub/gtk/. + * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) @@ -44,7 +44,7 @@ G_BEGIN_DECLS #define GTK_IS_LABEL(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_LABEL)) #define GTK_IS_LABEL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_LABEL)) #define GTK_LABEL_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_LABEL, GtkLabelClass)) - + typedef struct _GtkLabel GtkLabel; typedef struct _GtkLabelClass GtkLabelClass; @@ -69,16 +69,16 @@ struct _GtkLabel guint pattern_set : 1; guint mnemonic_keyval; - - gchar *text; + + gchar *text; PangoAttrList *attrs; PangoAttrList *effective_attrs; - + PangoLayout *layout; GtkWidget *mnemonic_widget; GtkWindow *mnemonic_window; - + GtkLabelSelectionInfo *select_info; }; @@ -91,7 +91,7 @@ struct _GtkLabelClass gint count, gboolean extend_selection); void (* copy_clipboard) (GtkLabel *label); - + /* Hook to customize right-click popup for selectable labels */ void (* populate_popup) (GtkLabel *label, GtkMenu *menu); diff --git a/gtk/gtklayout.h b/gtk/gtklayout.h index a38ade2559..d3e42889b2 100644 --- a/gtk/gtklayout.h +++ b/gtk/gtklayout.h @@ -25,7 +25,7 @@ * Modified by the GTK+ Team and others 1997-2000. See the AUTHORS * file for a list of people on the GTK+ Team. See the ChangeLog * files for a list of changes. These files are distributed with - * GTK+ at ftp://ftp.gtk.org/pub/gtk/. + * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) @@ -93,17 +93,17 @@ struct _GtkLayoutClass GType gtk_layout_get_type (void) G_GNUC_CONST; GtkWidget* gtk_layout_new (GtkAdjustment *hadjustment, GtkAdjustment *vadjustment); -void gtk_layout_put (GtkLayout *layout, - GtkWidget *child_widget, - gint x, +void gtk_layout_put (GtkLayout *layout, + GtkWidget *child_widget, + gint x, gint y); - -void gtk_layout_move (GtkLayout *layout, - GtkWidget *child_widget, - gint x, + +void gtk_layout_move (GtkLayout *layout, + GtkWidget *child_widget, + gint x, gint y); - -void gtk_layout_set_size (GtkLayout *layout, + +void gtk_layout_set_size (GtkLayout *layout, guint width, guint height); void gtk_layout_get_size (GtkLayout *layout, diff --git a/gtk/gtklinkbutton.h b/gtk/gtklinkbutton.h index be3328de81..9b58b1e60a 100644 --- a/gtk/gtklinkbutton.h +++ b/gtk/gtklinkbutton.h @@ -1,12 +1,12 @@ /* GTK - The GIMP Toolkit * gtklinkbutton.h - an hyperlink-enabled button - * + * * Copyright (C) 2005 Emmanuele Bassi <ebassi@gmail.com> * All rights reserved. * * Based on gnome-href code by: * James Henstridge <james@daa.com.au> - * + * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public * License as published by the Free Software Foundation; either @@ -52,14 +52,14 @@ typedef void (*GtkLinkButtonUriFunc) (GtkLinkButton *button, struct _GtkLinkButton { GtkButton parent_instance; - + GtkLinkButtonPrivate *priv; }; struct _GtkLinkButtonClass { GtkButtonClass parent_class; - + void (*_gtk_padding1) (void); void (*_gtk_padding2) (void); void (*_gtk_padding3) (void); diff --git a/gtk/gtkliststore.h b/gtk/gtkliststore.h index 8e3ece76ab..656805a99a 100644 --- a/gtk/gtkliststore.h +++ b/gtk/gtkliststore.h @@ -49,7 +49,7 @@ struct _GtkListStore gint stamp; gpointer seq; /* head of the list */ gpointer _gtk_reserved1; - GList *sort_list; + GList *sort_list; gint n_columns; gint sort_column_id; GtkSortType order; @@ -93,7 +93,7 @@ void gtk_list_store_set (GtkListStore *list_store, ...); void gtk_list_store_set_valuesv (GtkListStore *list_store, GtkTreeIter *iter, - gint *columns, + gint *columns, GValue *values, gint n_values); void gtk_list_store_set_valist (GtkListStore *list_store, @@ -117,7 +117,7 @@ void gtk_list_store_insert_with_values (GtkListStore *list_store, void gtk_list_store_insert_with_valuesv (GtkListStore *list_store, GtkTreeIter *iter, gint position, - gint *columns, + gint *columns, GValue *values, gint n_values); void gtk_list_store_prepend (GtkListStore *list_store, diff --git a/gtk/gtkmain.h b/gtk/gtkmain.h index 6356624c17..5529d7696f 100644 --- a/gtk/gtkmain.h +++ b/gtk/gtkmain.h @@ -21,7 +21,7 @@ * Modified by the GTK+ Team and others 1997-2000. See the AUTHORS * file for a list of people on the GTK+ Team. See the ChangeLog * files for a list of changes. These files are distributed with - * GTK+ at ftp://ftp.gtk.org/pub/gtk/. + * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) diff --git a/gtk/gtkmenu.h b/gtk/gtkmenu.h index 1bea241953..3174bd420d 100644 --- a/gtk/gtkmenu.h +++ b/gtk/gtkmenu.h @@ -21,7 +21,7 @@ * Modified by the GTK+ Team and others 1997-2000. See the AUTHORS * file for a list of people on the GTK+ Team. See the ChangeLog * files for a list of changes. These files are distributed with - * GTK+ at ftp://ftp.gtk.org/pub/gtk/. + * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) diff --git a/gtk/gtkmenubar.h b/gtk/gtkmenubar.h index 2c3810c161..bb32d16745 100644 --- a/gtk/gtkmenubar.h +++ b/gtk/gtkmenubar.h @@ -21,7 +21,7 @@ * Modified by the GTK+ Team and others 1997-2000. See the AUTHORS * file for a list of people on the GTK+ Team. See the ChangeLog * files for a list of changes. These files are distributed with - * GTK+ at ftp://ftp.gtk.org/pub/gtk/. + * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) diff --git a/gtk/gtkmenuitem.h b/gtk/gtkmenuitem.h index bda03f2967..1c51fc45c3 100644 --- a/gtk/gtkmenuitem.h +++ b/gtk/gtkmenuitem.h @@ -21,7 +21,7 @@ * Modified by the GTK+ Team and others 1997-2000. See the AUTHORS * file for a list of people on the GTK+ Team. See the ChangeLog * files for a list of changes. These files are distributed with - * GTK+ at ftp://ftp.gtk.org/pub/gtk/. + * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) diff --git a/gtk/gtkmenushell.h b/gtk/gtkmenushell.h index 742788293c..0aca2f94a0 100644 --- a/gtk/gtkmenushell.h +++ b/gtk/gtkmenushell.h @@ -21,7 +21,7 @@ * Modified by the GTK+ Team and others 1997-2000. See the AUTHORS * file for a list of people on the GTK+ Team. See the ChangeLog * files for a list of changes. These files are distributed with - * GTK+ at ftp://ftp.gtk.org/pub/gtk/. + * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) diff --git a/gtk/gtkmessagedialog.h b/gtk/gtkmessagedialog.h index 48f428ff37..5a60e813ea 100644 --- a/gtk/gtkmessagedialog.h +++ b/gtk/gtkmessagedialog.h @@ -21,7 +21,7 @@ * Modified by the GTK+ Team and others 1997-2003. See the AUTHORS * file for a list of people on the GTK+ Team. See the ChangeLog * files for a list of changes. These files are distributed with - * GTK+ at ftp://ftp.gtk.org/pub/gtk/. + * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) diff --git a/gtk/gtkmisc.h b/gtk/gtkmisc.h index 20a53786ff..94451135ab 100644 --- a/gtk/gtkmisc.h +++ b/gtk/gtkmisc.h @@ -21,7 +21,7 @@ * Modified by the GTK+ Team and others 1997-2000. See the AUTHORS * file for a list of people on the GTK+ Team. See the ChangeLog * files for a list of changes. These files are distributed with - * GTK+ at ftp://ftp.gtk.org/pub/gtk/. + * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) diff --git a/gtk/gtkmodules.h b/gtk/gtkmodules.h index 2ea4d8b4b4..84bc86ca63 100644 --- a/gtk/gtkmodules.h +++ b/gtk/gtkmodules.h @@ -40,7 +40,7 @@ gchar **_gtk_get_module_path (const gchar *type); void _gtk_modules_init (gint *argc, gchar ***argv, const gchar *gtk_modules_args); -void _gtk_modules_settings_changed (GtkSettings *settings, +void _gtk_modules_settings_changed (GtkSettings *settings, const gchar *modules); typedef void (*GtkModuleInitFunc) (gint *argc, diff --git a/gtk/gtknotebook.h b/gtk/gtknotebook.h index 489918a71b..ac28efacb3 100644 --- a/gtk/gtknotebook.h +++ b/gtk/gtknotebook.h @@ -22,7 +22,7 @@ * Modified by the GTK+ Team and others 1997-2000. See the AUTHORS * file for a list of people on the GTK+ Team. See the ChangeLog * files for a list of changes. These files are distributed with - * GTK+ at ftp://ftp.gtk.org/pub/gtk/. + * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) @@ -59,20 +59,20 @@ typedef struct _GtkNotebookPage GtkNotebookPage; struct _GtkNotebook { GtkContainer container; - + GtkNotebookPage *cur_page; GList *children; GList *first_tab; /* The first tab visible (for scrolling notebooks) */ GList *focus_tab; - + GtkWidget *menu; GdkWindow *event_window; - + guint32 timer; - + guint16 tab_hborder; guint16 tab_vborder; - + guint show_tabs : 1; guint homogeneous : 1; guint show_border : 1; @@ -95,7 +95,7 @@ struct _GtkNotebook struct _GtkNotebookClass { GtkContainerClass parent_class; - + void (* switch_page) (GtkNotebook *notebook, GtkNotebookPage *page, guint page_num); diff --git a/gtk/gtkobject.h b/gtk/gtkobject.h index 64b1ee781f..ba6252071b 100644 --- a/gtk/gtkobject.h +++ b/gtk/gtkobject.h @@ -21,7 +21,7 @@ * Modified by the GTK+ Team and others 1997-2000. See the AUTHORS * file for a list of people on the GTK+ Team. See the ChangeLog * files for a list of changes. These files are distributed with - * GTK+ at ftp://ftp.gtk.org/pub/gtk/. + * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) @@ -87,7 +87,7 @@ typedef struct _GtkObjectClass GtkObjectClass; struct _GtkObject { GInitiallyUnowned parent_instance; - + /* 32 bits of flags. GtkObject only uses 4 of these bits and * GtkWidget uses the rest. This is done because structs are * aligned on 4 or 8 byte boundaries. If a new bitfield were @@ -99,7 +99,7 @@ struct _GtkObject struct _GtkObjectClass { GInitiallyUnownedClass parent_class; - + /* Non overridable class methods to set and get per class arguments */ void (*set_arg) (GtkObject *object, GtkArg *arg, @@ -107,7 +107,7 @@ struct _GtkObjectClass void (*get_arg) (GtkObject *object, GtkArg *arg, guint arg_id); - + /* Default signal handler for the ::destroy signal, which is * invoked to request that references to the widget be dropped. * If an object class overrides destroy() in order to perform class @@ -132,7 +132,7 @@ void gtk_object_destroy (GtkObject *object); /****************************************************************/ -#ifndef GTK_DISABLE_DEPRECATED +#ifndef GTK_DISABLE_DEPRECATED GtkObject* gtk_object_new (GtkType type, const gchar *first_property_name, diff --git a/gtk/gtkpagesetupunixdialog.h b/gtk/gtkpagesetupunixdialog.h index 949357201c..6590899a2d 100644 --- a/gtk/gtkpagesetupunixdialog.h +++ b/gtk/gtkpagesetupunixdialog.h @@ -1,4 +1,4 @@ -/* GtkPageSetupUnixDialog +/* GtkPageSetupUnixDialog * Copyright (C) 2006 Alexander Larsson <alexl@redhat.com> * * This library is free software; you can redistribute it and/or diff --git a/gtk/gtkpaned.h b/gtk/gtkpaned.h index dd40220f8b..7ca40e2530 100644 --- a/gtk/gtkpaned.h +++ b/gtk/gtkpaned.h @@ -22,7 +22,7 @@ * Modified by the GTK+ Team and others 1997-2000. See the AUTHORS * file for a list of people on the GTK+ Team. See the ChangeLog * files for a list of changes. These files are distributed with - * GTK+ at ftp://ftp.gtk.org/pub/gtk/. + * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) @@ -47,18 +47,18 @@ G_BEGIN_DECLS typedef struct _GtkPaned GtkPaned; typedef struct _GtkPanedClass GtkPanedClass; typedef struct _GtkPanedPrivate GtkPanedPrivate; - + struct _GtkPaned { GtkContainer container; - + GtkWidget *child1; GtkWidget *child2; - + GdkWindow *handle; GdkGC *xor_gc; GdkCursorType cursor_type; - + /*< private >*/ GdkRectangle handle_pos; @@ -84,13 +84,13 @@ struct _GtkPaned gint drag_pos; gint original_position; }; - + struct _GtkPanedClass { GtkContainerClass parent_class; - + gboolean (* cycle_child_focus) (GtkPaned *paned, - gboolean reverse); + gboolean reverse); gboolean (* toggle_handle_focus) (GtkPaned *paned); gboolean (* move_handle) (GtkPaned *paned, GtkScrollType scroll); diff --git a/gtk/gtkplug.h b/gtk/gtkplug.h index bb4302c653..81532757c5 100644 --- a/gtk/gtkplug.h +++ b/gtk/gtkplug.h @@ -20,7 +20,7 @@ * Modified by the GTK+ Team and others 1997-2000. See the AUTHORS * file for a list of people on the GTK+ Team. See the ChangeLog * files for a list of changes. These files are distributed with - * GTK+ at ftp://ftp.gtk.org/pub/gtk/. + * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) diff --git a/gtk/gtkprintjob.h b/gtk/gtkprintjob.h index bf192a5f70..86ad47a2cc 100644 --- a/gtk/gtkprintjob.h +++ b/gtk/gtkprintjob.h @@ -1,5 +1,5 @@ -/* GtkPrintJob - * Copyright (C) 2006 Red Hat,Inc. +/* GtkPrintJob + * Copyright (C) 2006 Red Hat,Inc. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -39,7 +39,7 @@ typedef struct _GtkPrintJobClass GtkPrintJobClass; typedef struct _GtkPrintJobPrivate GtkPrintJobPrivate; typedef void (*GtkPrintJobCompleteFunc) (GtkPrintJob *print_job, - gpointer user_data, + gpointer user_data, GError *error); struct _GtkPrinter; diff --git a/gtk/gtkprintoperation.h b/gtk/gtkprintoperation.h index a1e24726e9..acbbaec83d 100644 --- a/gtk/gtkprintoperation.h +++ b/gtk/gtkprintoperation.h @@ -78,19 +78,19 @@ typedef enum { struct _GtkPrintOperation { GObject parent_instance; - + GtkPrintOperationPrivate *priv; }; struct _GtkPrintOperationClass { GObjectClass parent_class; - + void (*done) (GtkPrintOperation *operation, GtkPrintOperationResult result); - void (*begin_print) (GtkPrintOperation *operation, + void (*begin_print) (GtkPrintOperation *operation, GtkPrintContext *context); - gboolean (*paginate) (GtkPrintOperation *operation, + gboolean (*paginate) (GtkPrintOperation *operation, GtkPrintContext *context); void (*request_page_setup) (GtkPrintOperation *operation, GtkPrintContext *context, @@ -107,11 +107,10 @@ struct _GtkPrintOperationClass void (*custom_widget_apply) (GtkPrintOperation *operation, GtkWidget *widget); - gboolean (*preview) (GtkPrintOperation *operation, - GtkPrintOperationPreview *preview, + GtkPrintOperationPreview *preview, GtkPrintContext *context, - GtkWindow *parent); + GtkWindow *parent); /* Padding for future expansion */ void (*_gtk_reserved1) (void); @@ -178,7 +177,7 @@ GtkPageSetup *gtk_print_run_page_setup_dialog (GtkWindow GtkPageSetup *page_setup, GtkPrintSettings *settings); -typedef void (* GtkPageSetupDoneFunc) (GtkPageSetup *page_setup, +typedef void (* GtkPageSetupDoneFunc) (GtkPageSetup *page_setup, gpointer data); void gtk_print_run_page_setup_dialog_async (GtkWindow *parent, diff --git a/gtk/gtkprintoperationpreview.h b/gtk/gtkprintoperationpreview.h index 603dea39c5..ae0b3975be 100644 --- a/gtk/gtkprintoperationpreview.h +++ b/gtk/gtkprintoperationpreview.h @@ -28,7 +28,7 @@ #include <glib-object.h> #include <cairo.h> -#include "gtkprintcontext.h" +#include "gtkprintcontext.h" G_BEGIN_DECLS @@ -46,20 +46,18 @@ struct _GtkPrintOperationPreviewIface GTypeInterface g_iface; /* signals */ - void (*ready) (GtkPrintOperationPreview *preview, + void (*ready) (GtkPrintOperationPreview *preview, GtkPrintContext *context); - void (*got_page_size) (GtkPrintOperationPreview *preview, + void (*got_page_size) (GtkPrintOperationPreview *preview, GtkPrintContext *context, GtkPageSetup *page_setup); - - + /* methods */ void (*render_page) (GtkPrintOperationPreview *preview, gint page_nr); gboolean (*is_selected) (GtkPrintOperationPreview *preview, gint page_nr); void (*end_preview) (GtkPrintOperationPreview *preview); - /* Padding for future expansion */ void (*_gtk_reserved1) (void); diff --git a/gtk/gtkprintunixdialog.h b/gtk/gtkprintunixdialog.h index d4fd6a2d57..55c714bce0 100644 --- a/gtk/gtkprintunixdialog.h +++ b/gtk/gtkprintunixdialog.h @@ -1,4 +1,4 @@ -/* GtkPrintUnixDialog +/* GtkPrintUnixDialog * Copyright (C) 2006 John (J5) Palmieri <johnp@redhat.com> * * This library is free software; you can redistribute it and/or diff --git a/gtk/gtkprogressbar.h b/gtk/gtkprogressbar.h index 6a374ae118..837252f2d5 100644 --- a/gtk/gtkprogressbar.h +++ b/gtk/gtkprogressbar.h @@ -21,7 +21,7 @@ * Modified by the GTK+ Team and others 1997-2000. See the AUTHORS * file for a list of people on the GTK+ Team. See the ChangeLog * files for a list of changes. These files are distributed with - * GTK+ at ftp://ftp.gtk.org/pub/gtk/. + * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) @@ -78,7 +78,7 @@ struct _GtkProgressBar guint activity_blocks; gdouble pulse_fraction; - + guint activity_dir : 1; guint ellipsize : 3; guint dirty : 1; @@ -101,30 +101,30 @@ GtkWidget* gtk_progress_bar_new (void); /* * GtkProgress/GtkProgressBar had serious problems in GTK 1.2. - * - * - Only 3 or 4 functions are really needed for 95% of progress - * interfaces; GtkProgress[Bar] had about 25 functions, and + * + * - Only 3 or 4 functions are really needed for 95% of progress + * interfaces; GtkProgress[Bar] had about 25 functions, and * didn't even include these 3 or 4. - * - In activity mode, the API involves setting the adjustment - * to any random value, just to have the side effect of + * - In activity mode, the API involves setting the adjustment + * to any random value, just to have the side effect of * calling the progress bar update function - the adjustment * is totally ignored in activity mode - * - You set the activity step as a pixel value, which means to - * set the activity step you basically need to connect to + * - You set the activity step as a pixel value, which means to + * set the activity step you basically need to connect to * size_allocate - * - There are ctree_set_expander_style()-functions, to randomly + * - There are ctree_set_expander_style()-functions, to randomly * change look-and-feel for no good reason - * - The split between GtkProgress and GtkProgressBar makes no sense + * - The split between GtkProgress and GtkProgressBar makes no sense * to me whatsoever. - * + * * This was a big wart on GTK and made people waste lots of time, * both learning and using the interface. - * + * * So, I have added what I feel is the correct API, and marked all the * rest deprecated. However, the changes are 100% backward-compatible and * should break no existing code. * - * The following 9 functions are the new programming interface. + * The following 9 functions are the new programming interface. */ void gtk_progress_bar_pulse (GtkProgressBar *pbar); void gtk_progress_bar_set_text (GtkProgressBar *pbar, diff --git a/gtk/gtkradioaction.h b/gtk/gtkradioaction.h index 89692851a9..d07733000c 100644 --- a/gtk/gtkradioaction.h +++ b/gtk/gtkradioaction.h @@ -25,7 +25,7 @@ * Modified by the GTK+ Team and others 2003. See the AUTHORS * file for a list of people on the GTK+ Team. See the ChangeLog * files for a list of changes. These files are distributed with - * GTK+ at ftp://ftp.gtk.org/pub/gtk/. + * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) diff --git a/gtk/gtkradiobutton.h b/gtk/gtkradiobutton.h index 378f8c9c3f..237a604273 100644 --- a/gtk/gtkradiobutton.h +++ b/gtk/gtkradiobutton.h @@ -21,7 +21,7 @@ * Modified by the GTK+ Team and others 1997-2000. See the AUTHORS * file for a list of people on the GTK+ Team. See the ChangeLog * files for a list of changes. These files are distributed with - * GTK+ at ftp://ftp.gtk.org/pub/gtk/. + * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) @@ -52,7 +52,7 @@ typedef struct _GtkRadioButtonClass GtkRadioButtonClass; struct _GtkRadioButton { GtkCheckButton check_button; - + GSList *group; }; diff --git a/gtk/gtkradiomenuitem.h b/gtk/gtkradiomenuitem.h index b5095ec6d3..5a46a594b1 100644 --- a/gtk/gtkradiomenuitem.h +++ b/gtk/gtkradiomenuitem.h @@ -21,7 +21,7 @@ * Modified by the GTK+ Team and others 1997-2000. See the AUTHORS * file for a list of people on the GTK+ Team. See the ChangeLog * files for a list of changes. These files are distributed with - * GTK+ at ftp://ftp.gtk.org/pub/gtk/. + * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) @@ -51,14 +51,14 @@ typedef struct _GtkRadioMenuItemClass GtkRadioMenuItemClass; struct _GtkRadioMenuItem { GtkCheckMenuItem check_menu_item; - + GSList *group; }; struct _GtkRadioMenuItemClass { GtkCheckMenuItemClass parent_class; - + /* Signals */ void (*group_changed) (GtkRadioMenuItem *radio_menu_item); @@ -70,7 +70,7 @@ struct _GtkRadioMenuItemClass GType gtk_radio_menu_item_get_type (void) G_GNUC_CONST; - + GtkWidget* gtk_radio_menu_item_new (GSList *group); GtkWidget* gtk_radio_menu_item_new_with_label (GSList *group, const gchar *label); diff --git a/gtk/gtkrange.h b/gtk/gtkrange.h index efdff78533..c7142d31e4 100644 --- a/gtk/gtkrange.h +++ b/gtk/gtkrange.h @@ -21,7 +21,7 @@ * Modified by the GTK+ Team and others 1997-2000. See the AUTHORS * file for a list of people on the GTK+ Team. See the ChangeLog * files for a list of changes. These files are distributed with - * GTK+ at ftp://ftp.gtk.org/pub/gtk/. + * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) @@ -63,13 +63,13 @@ struct _GtkRange guint inverted : 1; /*< protected >*/ - + guint flippable : 1; - + /* Steppers are: < > ---- < > * a b c d */ - + guint has_stepper_a : 1; guint has_stepper_b : 1; guint has_stepper_c : 1; @@ -78,7 +78,7 @@ struct _GtkRange guint need_recalc : 1; guint slider_size_fixed : 1; - + gint min_slider_size; GtkOrientation orientation; @@ -90,7 +90,7 @@ struct _GtkRange /* Round off value to this many digits, -1 for no rounding */ gint round_digits; - + /*< private >*/ guint trough_click_forward : 1; /* trough click was on the forward side of slider */ guint update_pending : 1; /* need to emit value_changed */ @@ -113,7 +113,7 @@ struct _GtkRangeClass void (* value_changed) (GtkRange *range); void (* adjust_bounds) (GtkRange *range, gdouble new_value); - + /* action signals for keybindings */ void (* move_slider) (GtkRange *range, GtkScrollType scroll); diff --git a/gtk/gtkrc.h b/gtk/gtkrc.h index d3b3b9974f..1ca2d33138 100644 --- a/gtk/gtkrc.h +++ b/gtk/gtkrc.h @@ -21,7 +21,7 @@ * Modified by the GTK+ Team and others 1997-2000. See the AUTHORS * file for a list of people on the GTK+ Team. See the ChangeLog * files for a list of changes. These files are distributed with - * GTK+ at ftp://ftp.gtk.org/pub/gtk/. + * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) @@ -62,7 +62,7 @@ struct _GtkRcStyle GObject parent_instance; /*< public >*/ - + gchar *name; gchar *bg_pixmap_name[5]; PangoFontDescription *font_desc; @@ -78,7 +78,7 @@ struct _GtkRcStyle /*< private >*/ GArray *rc_properties; - + /* list of RC style lists including this RC style */ GSList *rc_style_lists; @@ -105,7 +105,7 @@ struct _GtkRcStyleClass guint (*parse) (GtkRcStyle *rc_style, GtkSettings *settings, GScanner *scanner); - + /* Combine RC style data from src into dest. If overridden, this * function should chain to the parent. */ diff --git a/gtk/gtkrecentaction.h b/gtk/gtkrecentaction.h index a2a41b0a38..4e6a35c74e 100644 --- a/gtk/gtkrecentaction.h +++ b/gtk/gtkrecentaction.h @@ -2,7 +2,7 @@ * Recent chooser action for GtkUIManager * * Copyright (C) 2007, Emmanuele Bassi - * + * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either @@ -45,7 +45,7 @@ typedef struct _GtkRecentActionClass GtkRecentActionClass; struct _GtkRecentAction { GtkAction parent_instance; - + /*< private >*/ GtkRecentActionPrivate *priv; }; diff --git a/gtk/gtkrecentchooser.h b/gtk/gtkrecentchooser.h index a30b78f69e..fe58d15727 100644 --- a/gtk/gtkrecentchooser.h +++ b/gtk/gtkrecentchooser.h @@ -2,7 +2,7 @@ * gtkrecentchooser.h - Abstract interface for recent file selectors GUIs * * Copyright (C) 2006, Emmanuele Bassi - * + * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either @@ -82,7 +82,7 @@ GQuark gtk_recent_chooser_error_quark (void); struct _GtkRecentChooserIface { GTypeInterface base_iface; - + /* * Methods */ @@ -108,7 +108,7 @@ struct _GtkRecentChooserIface GtkRecentSortFunc sort_func, gpointer data, GDestroyNotify destroy); - + /* * Signals */ diff --git a/gtk/gtkrecentchooserdialog.h b/gtk/gtkrecentchooserdialog.h index e522de35b8..7ccdef1de9 100644 --- a/gtk/gtkrecentchooserdialog.h +++ b/gtk/gtkrecentchooserdialog.h @@ -1,7 +1,7 @@ /* GTK - The GIMP Toolkit * gtkrecentchooserdialog.h: Recent files selector dialog * Copyright (C) 2006 Emmanuele Bassi - * + * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either @@ -47,7 +47,7 @@ struct _GtkRecentChooserDialog { /*< private >*/ GtkDialog parent_instance; - + GtkRecentChooserDialogPrivate *priv; }; diff --git a/gtk/gtkrecentchoosermenu.h b/gtk/gtkrecentchoosermenu.h index 5438ed4798..513ef44007 100644 --- a/gtk/gtkrecentchoosermenu.h +++ b/gtk/gtkrecentchoosermenu.h @@ -1,7 +1,7 @@ /* GTK - The GIMP Toolkit * gtkrecentchoosermenu.h - Recently used items menu widget * Copyright (C) 2006, Emmanuele Bassi - * + * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either @@ -52,7 +52,7 @@ struct _GtkRecentChooserMenu struct _GtkRecentChooserMenuClass { GtkMenuClass parent_class; - + /* padding for future expansion */ void (* gtk_recent1) (void); void (* gtk_recent2) (void); diff --git a/gtk/gtkrecentchooserwidget.h b/gtk/gtkrecentchooserwidget.h index 04be3e5020..77a8f0d461 100644 --- a/gtk/gtkrecentchooserwidget.h +++ b/gtk/gtkrecentchooserwidget.h @@ -1,7 +1,7 @@ /* GTK - The GIMP Toolkit * gtkrecentchooserwidget.h: embeddable recently used resources chooser widget * Copyright (C) 2006 Emmanuele Bassi - * + * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either @@ -46,7 +46,7 @@ struct _GtkRecentChooserWidget { /*< private >*/ GtkVBox parent_instance; - + GtkRecentChooserWidgetPrivate *priv; }; diff --git a/gtk/gtkrecentfilter.h b/gtk/gtkrecentfilter.h index 3f868e4042..3be8e5e979 100644 --- a/gtk/gtkrecentfilter.h +++ b/gtk/gtkrecentfilter.h @@ -1,7 +1,7 @@ /* GTK - The GIMP Toolkit * gtkrecentfilter.h - Filter object for recently used resources * Copyright (C) 2006, Emmanuele Bassi - * + * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either @@ -57,7 +57,7 @@ struct _GtkRecentFilterInfo const gchar *mime_type; const gchar **applications; const gchar **groups; - + gint age; }; diff --git a/gtk/gtkrecentmanager.h b/gtk/gtkrecentmanager.h index 5b89774407..b97c09bd5d 100644 --- a/gtk/gtkrecentmanager.h +++ b/gtk/gtkrecentmanager.h @@ -57,8 +57,8 @@ typedef struct _GtkRecentManagerPrivate GtkRecentManagerPrivate; * @app_name: the name of the application that is registering this recently * used resource; * @app_exec: command line used to launch this resource; may contain the - * "%f" and "%u" escape characters which will be expanded - * to the resource file path and URI respectively when the command line + * "%f" and "%u" escape characters which will be expanded + * to the resource file path and URI respectively when the command line * is retrieved; * @groups: a vector of strings containing groups names; * @is_private: whether this resource should be displayed only by the @@ -71,14 +71,14 @@ struct _GtkRecentData { gchar *display_name; gchar *description; - + gchar *mime_type; - + gchar *app_name; gchar *app_exec; - + gchar **groups; - + gboolean is_private; }; @@ -86,7 +86,7 @@ struct _GtkRecentManager { /*< private >*/ GObject parent_instance; - + GtkRecentManagerPrivate *priv; }; @@ -94,9 +94,9 @@ struct _GtkRecentManagerClass { /*< private >*/ GObjectClass parent_class; - + void (*changed) (GtkRecentManager *manager); - + /* padding for future expansion */ void (*_gtk_recent1) (void); void (*_gtk_recent2) (void); diff --git a/gtk/gtkruler.h b/gtk/gtkruler.h index efb30c6316..f116f96920 100644 --- a/gtk/gtkruler.h +++ b/gtk/gtkruler.h @@ -21,7 +21,7 @@ * Modified by the GTK+ Team and others 1997-2000. See the AUTHORS * file for a list of people on the GTK+ Team. See the ChangeLog * files for a list of changes. These files are distributed with - * GTK+ at ftp://ftp.gtk.org/pub/gtk/. + * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ /* diff --git a/gtk/gtkscale.h b/gtk/gtkscale.h index f61d42c1c1..c0a9aec30a 100644 --- a/gtk/gtkscale.h +++ b/gtk/gtkscale.h @@ -21,7 +21,7 @@ * Modified by the GTK+ Team and others 1997-2000. See the AUTHORS * file for a list of people on the GTK+ Team. See the ChangeLog * files for a list of changes. These files are distributed with - * GTK+ at ftp://ftp.gtk.org/pub/gtk/. + * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) @@ -63,8 +63,8 @@ struct _GtkScaleClass GtkRangeClass parent_class; gchar* (* format_value) (GtkScale *scale, - gdouble value); - + gdouble value); + void (* draw_value) (GtkScale *scale); void (* get_layout_offsets) (GtkScale *scale, diff --git a/gtk/gtkscrollbar.h b/gtk/gtkscrollbar.h index 2c7b3f7a90..72d859500f 100644 --- a/gtk/gtkscrollbar.h +++ b/gtk/gtkscrollbar.h @@ -21,7 +21,7 @@ * Modified by the GTK+ Team and others 1997-2000. See the AUTHORS * file for a list of people on the GTK+ Team. See the ChangeLog * files for a list of changes. These files are distributed with - * GTK+ at ftp://ftp.gtk.org/pub/gtk/. + * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) diff --git a/gtk/gtkscrolledwindow.h b/gtk/gtkscrolledwindow.h index 6a3831e901..324b826de1 100644 --- a/gtk/gtkscrolledwindow.h +++ b/gtk/gtkscrolledwindow.h @@ -21,7 +21,7 @@ * Modified by the GTK+ Team and others 1997-2000. See the AUTHORS * file for a list of people on the GTK+ Team. See the ChangeLog * files for a list of changes. These files are distributed with - * GTK+ at ftp://ftp.gtk.org/pub/gtk/. + * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) @@ -75,7 +75,7 @@ struct _GtkScrolledWindow struct _GtkScrolledWindowClass { GtkBinClass parent_class; - + gint scrollbar_spacing; /* Action signals for keybindings. Do not connect to these signals diff --git a/gtk/gtkselection.h b/gtk/gtkselection.h index 6fe4dd7ca5..7db71ecbb4 100644 --- a/gtk/gtkselection.h +++ b/gtk/gtkselection.h @@ -21,7 +21,7 @@ * Modified by the GTK+ Team and others 1997-2000. See the AUTHORS * file for a list of people on the GTK+ Team. See the ChangeLog * files for a list of changes. These files are distributed with - * GTK+ at ftp://ftp.gtk.org/pub/gtk/. + * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) @@ -62,7 +62,7 @@ struct _GtkSelectionData GdkAtom target; GdkAtom type; gint format; - guchar *data; + guchar *data; gint length; GdkDisplay *display; }; @@ -74,7 +74,7 @@ struct _GtkTargetEntry { }; /* These structures not public, and are here only for the convenience of - * gtkdnd.c + * gtkdnd.c */ typedef struct _GtkTargetPair GtkTargetPair; diff --git a/gtk/gtkseparator.h b/gtk/gtkseparator.h index 24af13fa04..b6400f9a40 100644 --- a/gtk/gtkseparator.h +++ b/gtk/gtkseparator.h @@ -21,7 +21,7 @@ * Modified by the GTK+ Team and others 1997-2000. See the AUTHORS * file for a list of people on the GTK+ Team. See the ChangeLog * files for a list of changes. These files are distributed with - * GTK+ at ftp://ftp.gtk.org/pub/gtk/. + * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) diff --git a/gtk/gtkseparatormenuitem.h b/gtk/gtkseparatormenuitem.h index 2bf61ab68b..b8080ac5bf 100644 --- a/gtk/gtkseparatormenuitem.h +++ b/gtk/gtkseparatormenuitem.h @@ -21,7 +21,7 @@ * Modified by the GTK+ Team and others 1997-2000. See the AUTHORS * file for a list of people on the GTK+ Team. See the ChangeLog * files for a list of changes. These files are distributed with - * GTK+ at ftp://ftp.gtk.org/pub/gtk/. + * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) diff --git a/gtk/gtkseparatortoolitem.h b/gtk/gtkseparatortoolitem.h index 6f7788b5a0..79075ee503 100644 --- a/gtk/gtkseparatortoolitem.h +++ b/gtk/gtkseparatortoolitem.h @@ -44,7 +44,7 @@ typedef struct _GtkSeparatorToolItemPrivate GtkSeparatorToolItemPrivate; struct _GtkSeparatorToolItem { GtkToolItem parent; - + /*< private >*/ GtkSeparatorToolItemPrivate *priv; }; diff --git a/gtk/gtksettings.h b/gtk/gtksettings.h index ffab06c31e..fa0387e839 100644 --- a/gtk/gtksettings.h +++ b/gtk/gtksettings.h @@ -23,7 +23,7 @@ #ifndef __GTK_SETTINGS_H__ #define __GTK_SETTINGS_H__ -#include <gtk/gtkrc.h> +#include <gtk/gtkrc.h> G_BEGIN_DECLS @@ -54,11 +54,12 @@ struct _GtkSettings GtkRcContext *rc_context; GdkScreen *screen; }; + struct _GtkSettingsClass { GObjectClass parent_class; - }; + struct _GtkSettingsValue { /* origin should be something like "filename:linenumber" for rc files, @@ -79,7 +80,7 @@ GType gtk_settings_get_type (void) G_GNUC_CONST; GtkSettings* gtk_settings_get_default (void); #endif GtkSettings* gtk_settings_get_for_screen (GdkScreen *screen); - + void gtk_settings_install_property (GParamSpec *pspec); void gtk_settings_install_property_parser (GParamSpec *pspec, GtkRcPropertyParser parser); diff --git a/gtk/gtksizegroup.h b/gtk/gtksizegroup.h index 404fe20845..63e3a6e3ce 100644 --- a/gtk/gtksizegroup.h +++ b/gtk/gtksizegroup.h @@ -1,5 +1,5 @@ /* GTK - The GIMP Toolkit - * gtksizegroup.h: + * gtksizegroup.h: * Copyright (C) 2000 Red Hat Software * * This library is free software; you can redistribute it and/or @@ -48,7 +48,7 @@ struct _GtkSizeGroup GSList *widgets; guint8 mode; - + guint have_width : 1; guint have_height : 1; guint ignore_hidden : 1; @@ -69,11 +69,11 @@ struct _GtkSizeGroupClass /** * GtkSizeGroupMode: - * @GTK_SIZE_GROUP_NONE: group has no effect + * @GTK_SIZE_GROUP_NONE: group has no effect * @GTK_SIZE_GROUP_HORIZONTAL: group affects horizontal requisition * @GTK_SIZE_GROUP_VERTICAL: group affects vertical requisition * @GTK_SIZE_GROUP_BOTH: group affects both horizontal and vertical requisition - * + * * The mode of the size group determines the directions in which the size * group affects the requested sizes of its component widgets. **/ diff --git a/gtk/gtksocket.h b/gtk/gtksocket.h index 04c977eea0..6e6e2aa66e 100644 --- a/gtk/gtksocket.h +++ b/gtk/gtksocket.h @@ -20,7 +20,7 @@ * Modified by the GTK+ Team and others 1997-2000. See the AUTHORS * file for a list of people on the GTK+ Team. See the ChangeLog * files for a list of changes. These files are distributed with - * GTK+ at ftp://ftp.gtk.org/pub/gtk/. + * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) @@ -53,7 +53,7 @@ struct _GtkSocket guint16 request_height; guint16 current_width; guint16 current_height; - + GdkWindow *plug_window; GtkWidget *plug_widget; @@ -64,7 +64,7 @@ struct _GtkSocket guint need_map : 1; guint is_mapped : 1; guint active : 1; - + GtkAccelGroup *accel_group; GtkWidget *toplevel; }; diff --git a/gtk/gtkspinbutton.h b/gtk/gtkspinbutton.h index cef9a53a4c..f692d5d9ea 100644 --- a/gtk/gtkspinbutton.h +++ b/gtk/gtkspinbutton.h @@ -24,7 +24,7 @@ * Modified by the GTK+ Team and others 1997-2000. See the AUTHORS * file for a list of people on the GTK+ Team. See the ChangeLog * files for a list of changes. These files are distributed with - * GTK+ at ftp://ftp.gtk.org/pub/gtk/. + * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) @@ -76,18 +76,18 @@ typedef struct _GtkSpinButtonClass GtkSpinButtonClass; struct _GtkSpinButton { GtkEntry entry; - + GtkAdjustment *adjustment; - + GdkWindow *panel; - + guint32 timer; - + gdouble climb_rate; gdouble timer_step; - + GtkSpinButtonUpdatePolicy update_policy; - + guint in_child : 2; guint click_child : 2; /* valid: GTK_ARROW_UP=0, GTK_ARROW_DOWN=1 or 2=NONE/BOTH */ guint button : 2; @@ -163,7 +163,7 @@ gdouble gtk_spin_button_get_value (GtkSpinButton *spin_button); gint gtk_spin_button_get_value_as_int (GtkSpinButton *spin_button); -void gtk_spin_button_set_value (GtkSpinButton *spin_button, +void gtk_spin_button_set_value (GtkSpinButton *spin_button, gdouble value); void gtk_spin_button_set_update_policy (GtkSpinButton *spin_button, diff --git a/gtk/gtkstatusbar.h b/gtk/gtkstatusbar.h index 9f419ca8c1..9a1ba4ef93 100644 --- a/gtk/gtkstatusbar.h +++ b/gtk/gtkstatusbar.h @@ -22,7 +22,7 @@ * Modified by the GTK+ Team and others 1997-2000. See the AUTHORS * file for a list of people on the GTK+ Team. See the ChangeLog * files for a list of changes. These files are distributed with - * GTK+ at ftp://ftp.gtk.org/pub/gtk/. + * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) @@ -61,7 +61,7 @@ struct _GtkStatusbar guint seq_message_id; GdkWindow *grip_window; - + guint has_resize_grip : 1; }; diff --git a/gtk/gtkstatusicon.h b/gtk/gtkstatusicon.h index d372509a33..ed51a2745c 100755 --- a/gtk/gtkstatusicon.h +++ b/gtk/gtkstatusicon.h @@ -67,7 +67,7 @@ struct _GtkStatusIconClass void (*__gtk_reserved3); void (*__gtk_reserved4); void (*__gtk_reserved5); - void (*__gtk_reserved6); + void (*__gtk_reserved6); }; GType gtk_status_icon_get_type (void) G_GNUC_CONST; diff --git a/gtk/gtkstock.h b/gtk/gtkstock.h index f250a0c404..80ec1ec9d7 100644 --- a/gtk/gtkstock.h +++ b/gtk/gtkstock.h @@ -21,7 +21,7 @@ * Modified by the GTK+ Team and others 1997-2000. See the AUTHORS * file for a list of people on the GTK+ Team. See the ChangeLog * files for a list of changes. These files are distributed with - * GTK+ at ftp://ftp.gtk.org/pub/gtk/. + * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) diff --git a/gtk/gtkstyle.h b/gtk/gtkstyle.h index e9b9008905..781f2d59bd 100644 --- a/gtk/gtkstyle.h +++ b/gtk/gtkstyle.h @@ -21,7 +21,7 @@ * Modified by the GTK+ Team and others 1997-2000. See the AUTHORS * file for a list of people on the GTK+ Team. See the ChangeLog * files for a list of changes. These files are distributed with - * GTK+ at ftp://ftp.gtk.org/pub/gtk/. + * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) @@ -75,7 +75,7 @@ struct _GtkStyle GObject parent_instance; /*< public >*/ - + GdkColor fg[5]; GdkColor bg[5]; GdkColor light[5]; @@ -84,14 +84,14 @@ struct _GtkStyle GdkColor text[5]; GdkColor base[5]; GdkColor text_aa[5]; /* Halfway between text/base */ - + GdkColor black; GdkColor white; PangoFontDescription *font_desc; - + gint xthickness; gint ythickness; - + GdkGC *fg_gc[5]; GdkGC *bg_gc[5]; GdkGC *light_gc[5]; @@ -102,18 +102,18 @@ struct _GtkStyle GdkGC *text_aa_gc[5]; GdkGC *black_gc; GdkGC *white_gc; - + GdkPixmap *bg_pixmap[5]; /*< private >*/ - + gint attach_count; - + gint depth; GdkColormap *colormap; GdkFont *private_font; PangoFontDescription *private_font_desc; /* Font description for style->private_font or %NULL */ - + /* the RcStyle from which this style was created */ GtkRcStyle *rc_style; @@ -167,10 +167,10 @@ struct _GtkStyleClass GtkIconSize size, GtkWidget *widget, const gchar *detail); - + /* Drawing functions */ - + void (*draw_hline) (GtkStyle *style, GdkWindow *window, GtkStateType state_type, @@ -297,7 +297,7 @@ struct _GtkStyleClass gint x, gint y, gint width, - gint height); + gint height); void (*draw_shadow_gap) (GtkStyle *style, GdkWindow *window, GtkStateType state_type, @@ -449,11 +449,11 @@ void gtk_style_set_background (GtkStyle *style, void gtk_style_apply_default_background (GtkStyle *style, GdkWindow *window, gboolean set_bg, - GtkStateType state_type, + GtkStateType state_type, const GdkRectangle *area, - gint x, - gint y, - gint width, + gint x, + gint y, + gint width, gint height); GtkIconSet* gtk_style_lookup_icon_set (GtkStyle *style, diff --git a/gtk/gtktable.h b/gtk/gtktable.h index a7cd31d477..e7ff9b01d2 100644 --- a/gtk/gtktable.h +++ b/gtk/gtktable.h @@ -21,7 +21,7 @@ * Modified by the GTK+ Team and others 1997-2000. See the AUTHORS * file for a list of people on the GTK+ Team. See the ChangeLog * files for a list of changes. These files are distributed with - * GTK+ at ftp://ftp.gtk.org/pub/gtk/. + * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) @@ -54,7 +54,7 @@ typedef struct _GtkTableRowCol GtkTableRowCol; struct _GtkTable { GtkContainer container; - + GList *children; GtkTableRowCol *rows; GtkTableRowCol *cols; diff --git a/gtk/gtktearoffmenuitem.h b/gtk/gtktearoffmenuitem.h index 88d28da271..30fcc95808 100644 --- a/gtk/gtktearoffmenuitem.h +++ b/gtk/gtktearoffmenuitem.h @@ -21,7 +21,7 @@ * Modified by the GTK+ Team and others 1997-2000. See the AUTHORS * file for a list of people on the GTK+ Team. See the ChangeLog * files for a list of changes. These files are distributed with - * GTK+ at ftp://ftp.gtk.org/pub/gtk/. + * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) diff --git a/gtk/gtktextbuffer.h b/gtk/gtktextbuffer.h index 34d2918ab5..2fb294e05d 100644 --- a/gtk/gtktextbuffer.h +++ b/gtk/gtktextbuffer.h @@ -84,7 +84,7 @@ struct _GtkTextBuffer GtkTextLogAttrCache *log_attr_cache; guint user_action_count; - + /* Whether the buffer has been modified since last save */ guint modified : 1; @@ -107,7 +107,7 @@ struct _GtkTextBufferClass void (* insert_child_anchor) (GtkTextBuffer *buffer, GtkTextIter *pos, GtkTextChildAnchor *anchor); - + void (* delete_range) (GtkTextBuffer *buffer, GtkTextIter *start, GtkTextIter *end); @@ -381,7 +381,7 @@ gboolean gtk_text_buffer_get_selection_bounds (GtkTextBuffer *buffer, GtkTextIter *end); gboolean gtk_text_buffer_delete_selection (GtkTextBuffer *buffer, gboolean interactive, - gboolean default_editable); + gboolean default_editable); /* Called to specify atomic user actions, used to implement undo */ void gtk_text_buffer_begin_user_action (GtkTextBuffer *buffer); diff --git a/gtk/gtktexttagtable.h b/gtk/gtktexttagtable.h index fe780dcdd8..8370eeb4f1 100644 --- a/gtk/gtktexttagtable.h +++ b/gtk/gtktexttagtable.h @@ -21,7 +21,7 @@ * Modified by the GTK+ Team and others 1997-2000. See the AUTHORS * file for a list of people on the GTK+ Team. See the ChangeLog * files for a list of changes. These files are distributed with - * GTK+ at ftp://ftp.gtk.org/pub/gtk/. + * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) diff --git a/gtk/gtktextview.h b/gtk/gtktextview.h index d7089da956..c71b7bb8d1 100644 --- a/gtk/gtktextview.h +++ b/gtk/gtktextview.h @@ -79,7 +79,7 @@ struct _GtkTextView gint pixels_above_lines; gint pixels_below_lines; gint pixels_inside_wrap; - GtkWrapMode wrap_mode; + GtkWrapMode wrap_mode; GtkJustification justify; gint left_margin; gint right_margin; @@ -87,18 +87,16 @@ struct _GtkTextView PangoTabArray *tabs; guint editable : 1; - - guint overwrite_mode : 1; guint cursor_visible : 1; - /* if we have reset the IM since the last character entered */ - guint need_im_reset : 1; + /* if we have reset the IM since the last character entered */ + guint need_im_reset : 1; guint accepts_tab : 1; - + guint width_changed : 1; - + /* debug flag - means that we've validated onscreen since the * last "invalidate" signal from the layout */ @@ -164,7 +162,7 @@ struct _GtkTextViewClass void (* populate_popup) (GtkTextView *text_view, GtkMenu *menu); - + /* These are all RUN_ACTION signals for keybindings */ /* move insertion point */ @@ -180,7 +178,7 @@ struct _GtkTextViewClass void (* page_horizontally) (GtkTextView *text_view, gint count, gboolean extend_selection); - + /* move the "anchor" (what Emacs calls the mark) to the cursor position */ void (* set_anchor) (GtkTextView *text_view); diff --git a/gtk/gtktipsquery.h b/gtk/gtktipsquery.h index 824480ce5f..4973a986ee 100644 --- a/gtk/gtktipsquery.h +++ b/gtk/gtktipsquery.h @@ -24,7 +24,7 @@ * Modified by the GTK+ Team and others 1997-2000. See the AUTHORS * file for a list of people on the GTK+ Team. See the ChangeLog * files for a list of changes. These files are distributed with - * GTK+ at ftp://ftp.gtk.org/pub/gtk/. + * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ #ifndef GTK_DISABLE_DEPRECATED diff --git a/gtk/gtktoggleaction.h b/gtk/gtktoggleaction.h index 369eba84d4..df72534d72 100644 --- a/gtk/gtktoggleaction.h +++ b/gtk/gtktoggleaction.h @@ -25,7 +25,7 @@ * Modified by the GTK+ Team and others 2003. See the AUTHORS * file for a list of people on the GTK+ Team. See the ChangeLog * files for a list of changes. These files are distributed with - * GTK+ at ftp://ftp.gtk.org/pub/gtk/. + * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) diff --git a/gtk/gtktogglebutton.h b/gtk/gtktogglebutton.h index 433ba92c48..5f71653873 100644 --- a/gtk/gtktogglebutton.h +++ b/gtk/gtktogglebutton.h @@ -21,7 +21,7 @@ * Modified by the GTK+ Team and others 1997-2000. See the AUTHORS * file for a list of people on the GTK+ Team. See the ChangeLog * files for a list of changes. These files are distributed with - * GTK+ at ftp://ftp.gtk.org/pub/gtk/. + * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) diff --git a/gtk/gtktoolbar.h b/gtk/gtktoolbar.h index 3ce3b827d8..95ae84b933 100644 --- a/gtk/gtktoolbar.h +++ b/gtk/gtktoolbar.h @@ -5,7 +5,7 @@ * Copyright (C) 2002 Anders Carlsson <andersca@gnome.org> * Copyright (C) 2002 James Henstridge <james@daa.com.au> * Copyright (C) 2003 Soeren Sandmann <sandmann@daimi.au.dk> - * + * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either @@ -26,7 +26,7 @@ * Modified by the GTK+ Team and others 1997-2000. See the AUTHORS * file for a list of people on the GTK+ Team. See the ChangeLog * files for a list of changes. These files are distributed with - * GTK+ at ftp://ftp.gtk.org/pub/gtk/. + * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) @@ -102,13 +102,13 @@ struct _GtkToolbar GtkOrientation orientation; GtkToolbarStyle style; GtkIconSize icon_size; - + #ifndef GTK_DISABLE_DEPRECATED GtkTooltips *tooltips; #else gpointer _tooltips; #endif - + /*< private >*/ gint button_maxw; /* maximum width of homogeneous children */ gint button_maxh; /* maximum height of homogeneous children */ @@ -123,7 +123,7 @@ struct _GtkToolbar struct _GtkToolbarClass { GtkContainerClass parent_class; - + /* signals */ void (* orientation_changed) (GtkToolbar *toolbar, GtkOrientation orientation); @@ -133,7 +133,7 @@ struct _GtkToolbarClass gint x, gint y, gint button_number); - + /* Padding for future expansion */ void (*_gtk_reserved1) (void); void (*_gtk_reserved2) (void); diff --git a/gtk/gtktoolbutton.h b/gtk/gtktoolbutton.h index 6b031d63b5..a44ae0dd78 100644 --- a/gtk/gtktoolbutton.h +++ b/gtk/gtktoolbutton.h @@ -53,7 +53,7 @@ struct _GtkToolButton struct _GtkToolButtonClass { GtkToolItemClass parent_class; - + GType button_type; /* signal */ @@ -90,7 +90,7 @@ void gtk_tool_button_set_label_widget (GtkToolButton *button, GtkWidget *label_widget); GtkWidget * gtk_tool_button_get_label_widget (GtkToolButton *button); - + /* internal function */ GtkWidget *_gtk_tool_button_get_button (GtkToolButton *button); diff --git a/gtk/gtktreemodel.h b/gtk/gtktreemodel.h index 74185abb67..b48e87b642 100644 --- a/gtk/gtktreemodel.h +++ b/gtk/gtktreemodel.h @@ -84,7 +84,7 @@ struct _GtkTreeModelIface gint *new_order); /* Virtual Table */ - GtkTreeModelFlags (* get_flags) (GtkTreeModel *tree_model); + GtkTreeModelFlags (* get_flags) (GtkTreeModel *tree_model); gint (* get_n_columns) (GtkTreeModel *tree_model); GType (* get_column_type) (GtkTreeModel *tree_model, @@ -179,7 +179,7 @@ void gtk_tree_row_reference_reordered (GObject *proxy, GtkTreePath *path, GtkTreeIter *iter, gint *new_order); - + /* GtkTreeIter operations */ GtkTreeIter * gtk_tree_iter_copy (GtkTreeIter *iter); void gtk_tree_iter_free (GtkTreeIter *iter); @@ -263,9 +263,6 @@ void gtk_tree_model_rows_reordered (GtkTreeModel *tree_model, GtkTreeIter *iter, gint *new_order); - - - G_END_DECLS #endif /* __GTK_TREE_MODEL_H__ */ diff --git a/gtk/gtktreeselection.h b/gtk/gtktreeselection.h index 6c68ba473b..eb19aa5383 100644 --- a/gtk/gtktreeselection.h +++ b/gtk/gtktreeselection.h @@ -53,7 +53,7 @@ struct _GtkTreeSelection GObject parent; /*< private >*/ - + GtkTreeView *tree_view; GtkSelectionMode type; GtkTreeSelectionFunc user_func; @@ -124,4 +124,3 @@ G_END_DECLS #endif /* __GTK_TREE_SELECTION_H__ */ - diff --git a/gtk/gtktreeview.h b/gtk/gtktreeview.h index d5ff9a68f8..9a39299ce1 100644 --- a/gtk/gtktreeview.h +++ b/gtk/gtktreeview.h @@ -431,4 +431,3 @@ G_END_DECLS #endif /* __GTK_TREE_VIEW_H__ */ - diff --git a/gtk/gtktreeviewcolumn.h b/gtk/gtktreeviewcolumn.h index 2d45ce5836..6419558950 100644 --- a/gtk/gtktreeviewcolumn.h +++ b/gtk/gtktreeviewcolumn.h @@ -59,14 +59,14 @@ typedef void (* GtkTreeCellDataFunc) (GtkTreeViewColumn *tree_column, GtkTreeIter *iter, gpointer data); - + struct _GtkTreeViewColumn { GtkObject parent; GtkWidget *tree_view; GtkWidget *button; - GtkWidget *child; + GtkWidget *child; GtkWidget *arrow; GtkWidget *alignment; GdkWindow *window; @@ -242,4 +242,3 @@ G_END_DECLS #endif /* __GTK_TREE_VIEW_COLUMN_H__ */ - diff --git a/gtk/gtktypeutils.h b/gtk/gtktypeutils.h index 67e6dfaa6e..8802ed91ef 100644 --- a/gtk/gtktypeutils.h +++ b/gtk/gtktypeutils.h @@ -21,7 +21,7 @@ * Modified by the GTK+ Team and others 1997-2000. See the AUTHORS * file for a list of people on the GTK+ Team. See the ChangeLog * files for a list of changes. These files are distributed with - * GTK+ at ftp://ftp.gtk.org/pub/gtk/. + * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) @@ -148,7 +148,7 @@ struct _GtkArg { GtkType type; gchar *name; - + /* this union only defines the required storage types for * the possibile values, thus there is no gint enum_data field, * because that would just be a mere alias for gint int_data. @@ -169,7 +169,7 @@ struct _GtkArg gchar *string_data; GtkObject *object_data; gpointer pointer_data; - + /* structured values */ struct { GtkSignalFunc f; diff --git a/gtk/gtkuimanager.h b/gtk/gtkuimanager.h index 27fce6bcf3..62f544fb4c 100644 --- a/gtk/gtkuimanager.h +++ b/gtk/gtkuimanager.h @@ -25,7 +25,7 @@ * Modified by the GTK+ Team and others 2003. See the AUTHORS * file for a list of people on the GTK+ Team. See the ChangeLog * files for a list of changes. These files are distributed with - * GTK+ at ftp://ftp.gtk.org/pub/gtk/. + * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) @@ -69,7 +69,7 @@ struct _GtkUIManagerClass { GObjectClass parent_class; /* Signals */ - void (* add_widget) (GtkUIManager *merge, + void (* add_widget) (GtkUIManager *merge, GtkWidget *widget); void (* actions_changed) (GtkUIManager *merge); void (* connect_proxy) (GtkUIManager *merge, diff --git a/gtk/gtkvbbox.h b/gtk/gtkvbbox.h index fd1c05b8f4..901bc709a7 100644 --- a/gtk/gtkvbbox.h +++ b/gtk/gtkvbbox.h @@ -21,7 +21,7 @@ * Modified by the GTK+ Team and others 1997-2000. See the AUTHORS * file for a list of people on the GTK+ Team. See the ChangeLog * files for a list of changes. These files are distributed with - * GTK+ at ftp://ftp.gtk.org/pub/gtk/. + * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) diff --git a/gtk/gtkvbox.h b/gtk/gtkvbox.h index 63a82310d9..68286559d8 100644 --- a/gtk/gtkvbox.h +++ b/gtk/gtkvbox.h @@ -21,7 +21,7 @@ * Modified by the GTK+ Team and others 1997-2000. See the AUTHORS * file for a list of people on the GTK+ Team. See the ChangeLog * files for a list of changes. These files are distributed with - * GTK+ at ftp://ftp.gtk.org/pub/gtk/. + * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) diff --git a/gtk/gtkversion.h.in b/gtk/gtkversion.h.in index 172c688763..9db6268840 100644 --- a/gtk/gtkversion.h.in +++ b/gtk/gtkversion.h.in @@ -21,7 +21,7 @@ * Modified by the GTK+ Team and others 1997-1999. See the AUTHORS * file for a list of people on the GTK+ Team. See the ChangeLog * files for a list of changes. These files are distributed with - * GTK+ at ftp://ftp.gtk.org/pub/gtk/. + * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) @@ -48,6 +48,4 @@ (GTK_MAJOR_VERSION == (major) && GTK_MINOR_VERSION == (minor) && \ GTK_MICRO_VERSION >= (micro))) - #endif /* __GTK_VERSION_H__ */ - diff --git a/gtk/gtkviewport.h b/gtk/gtkviewport.h index d40fe6e4bb..9b55418130 100644 --- a/gtk/gtkviewport.h +++ b/gtk/gtkviewport.h @@ -21,7 +21,7 @@ * Modified by the GTK+ Team and others 1997-2000. See the AUTHORS * file for a list of people on the GTK+ Team. See the ChangeLog * files for a list of changes. These files are distributed with - * GTK+ at ftp://ftp.gtk.org/pub/gtk/. + * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) diff --git a/gtk/gtkvolumebutton.h b/gtk/gtkvolumebutton.h index f28a7134c1..c69724fe11 100644 --- a/gtk/gtkvolumebutton.h +++ b/gtk/gtkvolumebutton.h @@ -24,7 +24,7 @@ * Modified by the GTK+ Team and others 2007. See the AUTHORS * file for a list of people on the GTK+ Team. See the ChangeLog * files for a list of changes. These files are distributed with - * GTK+ at ftp://ftp.gtk.org/pub/gtk/. + * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) @@ -65,4 +65,3 @@ GtkWidget* gtk_volume_button_new (void); G_END_DECLS #endif /* __GTK_VOLUME_BUTTON_H__ */ - diff --git a/gtk/gtkvpaned.h b/gtk/gtkvpaned.h index 187ad5c487..37bc52a082 100644 --- a/gtk/gtkvpaned.h +++ b/gtk/gtkvpaned.h @@ -21,7 +21,7 @@ * Modified by the GTK+ Team and others 1997-2000. See the AUTHORS * file for a list of people on the GTK+ Team. See the ChangeLog * files for a list of changes. These files are distributed with - * GTK+ at ftp://ftp.gtk.org/pub/gtk/. + * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) diff --git a/gtk/gtkvruler.h b/gtk/gtkvruler.h index 35bf444172..8126c32322 100644 --- a/gtk/gtkvruler.h +++ b/gtk/gtkvruler.h @@ -21,7 +21,7 @@ * Modified by the GTK+ Team and others 1997-2000. See the AUTHORS * file for a list of people on the GTK+ Team. See the ChangeLog * files for a list of changes. These files are distributed with - * GTK+ at ftp://ftp.gtk.org/pub/gtk/. + * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ /* @@ -79,4 +79,3 @@ G_END_DECLS #endif /* __GTK_VRULER_H__ */ - diff --git a/gtk/gtkvscale.h b/gtk/gtkvscale.h index 8fb305deae..ac9bf5f44f 100644 --- a/gtk/gtkvscale.h +++ b/gtk/gtkvscale.h @@ -21,7 +21,7 @@ * Modified by the GTK+ Team and others 1997-2000. See the AUTHORS * file for a list of people on the GTK+ Team. See the ChangeLog * files for a list of changes. These files are distributed with - * GTK+ at ftp://ftp.gtk.org/pub/gtk/. + * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) diff --git a/gtk/gtkvscrollbar.h b/gtk/gtkvscrollbar.h index 808b3e6b40..184be409b1 100644 --- a/gtk/gtkvscrollbar.h +++ b/gtk/gtkvscrollbar.h @@ -21,7 +21,7 @@ * Modified by the GTK+ Team and others 1997-2000. See the AUTHORS * file for a list of people on the GTK+ Team. See the ChangeLog * files for a list of changes. These files are distributed with - * GTK+ at ftp://ftp.gtk.org/pub/gtk/. + * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) diff --git a/gtk/gtkvseparator.h b/gtk/gtkvseparator.h index 41095f1d62..8d57eef399 100644 --- a/gtk/gtkvseparator.h +++ b/gtk/gtkvseparator.h @@ -21,7 +21,7 @@ * Modified by the GTK+ Team and others 1997-2000. See the AUTHORS * file for a list of people on the GTK+ Team. See the ChangeLog * files for a list of changes. These files are distributed with - * GTK+ at ftp://ftp.gtk.org/pub/gtk/. + * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) diff --git a/gtk/gtkwidget.h b/gtk/gtkwidget.h index 6d4b2a65ac..f81b5dbf47 100644 --- a/gtk/gtkwidget.h +++ b/gtk/gtkwidget.h @@ -21,7 +21,7 @@ * Modified by the GTK+ Team and others 1997-2000. See the AUTHORS * file for a list of people on the GTK+ Team. See the ChangeLog * files for a list of changes. These files are distributed with - * GTK+ at ftp://ftp.gtk.org/pub/gtk/. + * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) diff --git a/gtk/gtkwindow.h b/gtk/gtkwindow.h index d428da233f..15becae5d1 100644 --- a/gtk/gtkwindow.h +++ b/gtk/gtkwindow.h @@ -21,7 +21,7 @@ * Modified by the GTK+ Team and others 1997-2000. See the AUTHORS * file for a list of people on the GTK+ Team. See the ChangeLog * files for a list of changes. These files are distributed with - * GTK+ at ftp://ftp.gtk.org/pub/gtk/. + * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) |