From e7b18d2a61adfba6f92d95007ebb5655b5ecc609 Mon Sep 17 00:00:00 2001 From: Michael Natterer Date: Thu, 30 Oct 2008 15:58:06 +0000 Subject: [PATCH] no need to include in any widget header, it's included via 2008-10-30 Michael Natterer * gtk/*.h: no need to include in any widget header, it's included via gtkwidget.h anyway. svn path=/trunk/; revision=21732 --- ChangeLog | 5 +++++ gtk/gtkalignment.h | 1 - gtk/gtkarrow.h | 1 - gtk/gtkaspectframe.h | 2 +- gtk/gtkbin.h | 1 - gtk/gtkbox.h | 1 - gtk/gtkbutton.h | 1 - gtk/gtkcalendar.h | 2 +- gtk/gtkcheckbutton.h | 1 - gtk/gtkcheckmenuitem.h | 1 - gtk/gtkclist.h | 3 ++- gtk/gtkcontainer.h | 1 - gtk/gtkcurve.h | 2 +- gtk/gtkdialog.h | 1 - gtk/gtkdnd.h | 3 ++- gtk/gtkdrawingarea.h | 1 - gtk/gtkeditable.h | 2 +- gtk/gtkentry.h | 2 +- gtk/gtkeventbox.h | 1 - gtk/gtkfixed.h | 1 - gtk/gtkfontsel.h | 2 +- gtk/gtkframe.h | 1 - gtk/gtkgamma.h | 1 - gtk/gtkhandlebox.h | 1 - gtk/gtkhbox.h | 1 - gtk/gtkhruler.h | 1 - gtk/gtkhscale.h | 1 - gtk/gtkhscrollbar.h | 1 - gtk/gtkhseparator.h | 1 - gtk/gtkimage.h | 1 - gtk/gtkimagemenuitem.h | 2 +- gtk/gtkinputdialog.h | 1 - gtk/gtkitem.h | 1 - gtk/gtklabel.h | 2 +- gtk/gtklayout.h | 3 ++- gtk/gtkmenu.h | 1 - gtk/gtkmenubar.h | 1 - gtk/gtkmenuitem.h | 1 - gtk/gtkmenushell.h | 1 - gtk/gtkmisc.h | 5 ++--- gtk/gtknotebook.h | 2 +- gtk/gtkplug.h | 1 - gtk/gtkprogress.h | 3 +-- gtk/gtkprogressbar.h | 1 - gtk/gtkradiobutton.h | 1 - gtk/gtkradiomenuitem.h | 2 +- gtk/gtkrange.h | 1 - gtk/gtkruler.h | 1 - gtk/gtkscale.h | 1 - gtk/gtkscrollbar.h | 1 - gtk/gtkscrolledwindow.h | 1 - gtk/gtkseparator.h | 1 - gtk/gtkseparatormenuitem.h | 2 +- gtk/gtkspinbutton.h | 1 - gtk/gtktable.h | 1 - gtk/gtktearoffmenuitem.h | 2 +- gtk/gtktext.h | 3 +-- gtk/gtkthemes.h | 7 ++++--- gtk/gtktipsquery.h | 3 ++- gtk/gtktogglebutton.h | 2 +- gtk/gtktoolbar.h | 2 +- gtk/gtktree.h | 8 ++++---- gtk/gtktreeitem.h | 3 +-- gtk/gtkvbox.h | 1 - gtk/gtkviewport.h | 1 - gtk/gtkvruler.h | 1 - gtk/gtkvscale.h | 1 - gtk/gtkvscrollbar.h | 1 - gtk/gtkvseparator.h | 1 - gtk/gtkwin32embedwidget.h | 5 +++-- gtk/gtkwindow.h | 3 ++- 71 files changed, 45 insertions(+), 81 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6feff1c1a..a16d10dc3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2008-10-30 Michael Natterer + + * gtk/*.h: no need to include in any widget header, + it's included via gtkwidget.h anyway. + 2008-10-30 Sven Neumann * gtk/gtkwidget.c (gtk_widget_get_property): removed redundant diff --git a/gtk/gtkalignment.h b/gtk/gtkalignment.h index f37359334..4fad3027e 100644 --- a/gtk/gtkalignment.h +++ b/gtk/gtkalignment.h @@ -32,7 +32,6 @@ #define __GTK_ALIGNMENT_H__ -#include #include diff --git a/gtk/gtkarrow.h b/gtk/gtkarrow.h index fc5b8381c..010e3ef22 100644 --- a/gtk/gtkarrow.h +++ b/gtk/gtkarrow.h @@ -32,7 +32,6 @@ #define __GTK_ARROW_H__ -#include #include diff --git a/gtk/gtkaspectframe.h b/gtk/gtkaspectframe.h index 668c38400..d78ee87e3 100644 --- a/gtk/gtkaspectframe.h +++ b/gtk/gtkaspectframe.h @@ -32,9 +32,9 @@ #define __GTK_ASPECT_FRAME_H__ -#include #include + G_BEGIN_DECLS #define GTK_TYPE_ASPECT_FRAME (gtk_aspect_frame_get_type ()) diff --git a/gtk/gtkbin.h b/gtk/gtkbin.h index 6dd8c53e2..b80e11183 100644 --- a/gtk/gtkbin.h +++ b/gtk/gtkbin.h @@ -32,7 +32,6 @@ #define __GTK_BIN_H__ -#include #include diff --git a/gtk/gtkbox.h b/gtk/gtkbox.h index 8167aa937..914683b48 100644 --- a/gtk/gtkbox.h +++ b/gtk/gtkbox.h @@ -32,7 +32,6 @@ #define __GTK_BOX_H__ -#include #include diff --git a/gtk/gtkbutton.h b/gtk/gtkbutton.h index a8c1e8e4e..8d2dd4542 100644 --- a/gtk/gtkbutton.h +++ b/gtk/gtkbutton.h @@ -32,7 +32,6 @@ #define __GTK_BUTTON_H__ -#include #include #include #include diff --git a/gtk/gtkcalendar.h b/gtk/gtkcalendar.h index 76dd00272..9648d25be 100644 --- a/gtk/gtkcalendar.h +++ b/gtk/gtkcalendar.h @@ -33,7 +33,7 @@ #ifndef __GTK_CALENDAR_H__ #define __GTK_CALENDAR_H__ -#include + #include /* Not needed, retained for compatibility -Yosh */ diff --git a/gtk/gtkcheckbutton.h b/gtk/gtkcheckbutton.h index 1b50086ab..54c6dcfa3 100644 --- a/gtk/gtkcheckbutton.h +++ b/gtk/gtkcheckbutton.h @@ -32,7 +32,6 @@ #define __GTK_CHECK_BUTTON_H__ -#include #include diff --git a/gtk/gtkcheckmenuitem.h b/gtk/gtkcheckmenuitem.h index 0098b79b6..b6f2e9adf 100644 --- a/gtk/gtkcheckmenuitem.h +++ b/gtk/gtkcheckmenuitem.h @@ -32,7 +32,6 @@ #define __GTK_CHECK_MENU_ITEM_H__ -#include #include diff --git a/gtk/gtkclist.h b/gtk/gtkclist.h index bca7401c8..e167c530e 100644 --- a/gtk/gtkclist.h +++ b/gtk/gtkclist.h @@ -30,7 +30,7 @@ #ifndef __GTK_CLIST_H__ #define __GTK_CLIST_H__ -#include + #include #include #include @@ -39,6 +39,7 @@ #include #include + G_BEGIN_DECLS diff --git a/gtk/gtkcontainer.h b/gtk/gtkcontainer.h index f56dbe89b..0e88f1a4e 100644 --- a/gtk/gtkcontainer.h +++ b/gtk/gtkcontainer.h @@ -32,7 +32,6 @@ #define __GTK_CONTAINER_H__ -#include #include #include #include diff --git a/gtk/gtkcurve.h b/gtk/gtkcurve.h index d97b4f5bb..5edd59db0 100644 --- a/gtk/gtkcurve.h +++ b/gtk/gtkcurve.h @@ -42,9 +42,9 @@ #define __GTK_CURVE_H__ -#include #include + G_BEGIN_DECLS #define GTK_TYPE_CURVE (gtk_curve_get_type ()) diff --git a/gtk/gtkdialog.h b/gtk/gtkdialog.h index 5cc1841b8..69d2c0049 100644 --- a/gtk/gtkdialog.h +++ b/gtk/gtkdialog.h @@ -32,7 +32,6 @@ #define __GTK_DIALOG_H__ -#include #include diff --git a/gtk/gtkdnd.h b/gtk/gtkdnd.h index 0fabdeca1..0239168d6 100644 --- a/gtk/gtkdnd.h +++ b/gtk/gtkdnd.h @@ -32,11 +32,12 @@ #ifndef __GTK_DND_H__ #define __GTK_DND_H__ -#include + #include #include #include + G_BEGIN_DECLS typedef enum { diff --git a/gtk/gtkdrawingarea.h b/gtk/gtkdrawingarea.h index 2ad71fc5a..398494014 100644 --- a/gtk/gtkdrawingarea.h +++ b/gtk/gtkdrawingarea.h @@ -32,7 +32,6 @@ #define __GTK_DRAWING_AREA_H__ -#include #include diff --git a/gtk/gtkeditable.h b/gtk/gtkeditable.h index ec57b16be..5dffd37ae 100644 --- a/gtk/gtkeditable.h +++ b/gtk/gtkeditable.h @@ -32,9 +32,9 @@ #define __GTK_EDITABLE_H__ -#include #include + G_BEGIN_DECLS #define GTK_TYPE_EDITABLE (gtk_editable_get_type ()) diff --git a/gtk/gtkentry.h b/gtk/gtkentry.h index ca9282831..0f6ba3d98 100644 --- a/gtk/gtkentry.h +++ b/gtk/gtkentry.h @@ -32,13 +32,13 @@ #define __GTK_ENTRY_H__ -#include #include #include #include #include #include + G_BEGIN_DECLS #define GTK_TYPE_ENTRY (gtk_entry_get_type ()) diff --git a/gtk/gtkeventbox.h b/gtk/gtkeventbox.h index 78b63e394..c8e9d9cd5 100644 --- a/gtk/gtkeventbox.h +++ b/gtk/gtkeventbox.h @@ -32,7 +32,6 @@ #define __GTK_EVENT_BOX_H__ -#include #include diff --git a/gtk/gtkfixed.h b/gtk/gtkfixed.h index 645a272e6..7c782473c 100644 --- a/gtk/gtkfixed.h +++ b/gtk/gtkfixed.h @@ -32,7 +32,6 @@ #define __GTK_FIXED_H__ -#include #include diff --git a/gtk/gtkfontsel.h b/gtk/gtkfontsel.h index 07cba45eb..d475dc6b9 100644 --- a/gtk/gtkfontsel.h +++ b/gtk/gtkfontsel.h @@ -36,10 +36,10 @@ #define __GTK_FONTSEL_H__ -#include #include #include + G_BEGIN_DECLS #define GTK_TYPE_FONT_SELECTION (gtk_font_selection_get_type ()) diff --git a/gtk/gtkframe.h b/gtk/gtkframe.h index b9d3785ce..2b1e926cd 100644 --- a/gtk/gtkframe.h +++ b/gtk/gtkframe.h @@ -32,7 +32,6 @@ #define __GTK_FRAME_H__ -#include #include diff --git a/gtk/gtkgamma.h b/gtk/gtkgamma.h index 207732843..bde3d88df 100644 --- a/gtk/gtkgamma.h +++ b/gtk/gtkgamma.h @@ -42,7 +42,6 @@ #define __GTK_GAMMA_CURVE_H__ -#include #include diff --git a/gtk/gtkhandlebox.h b/gtk/gtkhandlebox.h index 9ee0fccfd..47fb39053 100644 --- a/gtk/gtkhandlebox.h +++ b/gtk/gtkhandlebox.h @@ -37,7 +37,6 @@ #define __GTK_HANDLE_BOX_H__ -#include #include diff --git a/gtk/gtkhbox.h b/gtk/gtkhbox.h index 7e309a0a6..02b74acbe 100644 --- a/gtk/gtkhbox.h +++ b/gtk/gtkhbox.h @@ -32,7 +32,6 @@ #define __GTK_HBOX_H__ -#include #include diff --git a/gtk/gtkhruler.h b/gtk/gtkhruler.h index 1e167e1c9..3c30917ce 100644 --- a/gtk/gtkhruler.h +++ b/gtk/gtkhruler.h @@ -42,7 +42,6 @@ #define __GTK_HRULER_H__ -#include #include diff --git a/gtk/gtkhscale.h b/gtk/gtkhscale.h index e1818bdab..6b13a09c4 100644 --- a/gtk/gtkhscale.h +++ b/gtk/gtkhscale.h @@ -32,7 +32,6 @@ #define __GTK_HSCALE_H__ -#include #include diff --git a/gtk/gtkhscrollbar.h b/gtk/gtkhscrollbar.h index f170a10f6..f3300a7cc 100644 --- a/gtk/gtkhscrollbar.h +++ b/gtk/gtkhscrollbar.h @@ -32,7 +32,6 @@ #define __GTK_HSCROLLBAR_H__ -#include #include diff --git a/gtk/gtkhseparator.h b/gtk/gtkhseparator.h index 7ea9a545d..a4d9f1172 100644 --- a/gtk/gtkhseparator.h +++ b/gtk/gtkhseparator.h @@ -32,7 +32,6 @@ #define __GTK_HSEPARATOR_H__ -#include #include diff --git a/gtk/gtkimage.h b/gtk/gtkimage.h index 42b0475a0..8c5e77b21 100644 --- a/gtk/gtkimage.h +++ b/gtk/gtkimage.h @@ -32,7 +32,6 @@ #define __GTK_IMAGE_H__ -#include #include #include diff --git a/gtk/gtkimagemenuitem.h b/gtk/gtkimagemenuitem.h index 1b8990032..121042719 100644 --- a/gtk/gtkimagemenuitem.h +++ b/gtk/gtkimagemenuitem.h @@ -32,9 +32,9 @@ #define __GTK_IMAGE_MENU_ITEM_H__ -#include #include + G_BEGIN_DECLS #define GTK_TYPE_IMAGE_MENU_ITEM (gtk_image_menu_item_get_type ()) diff --git a/gtk/gtkinputdialog.h b/gtk/gtkinputdialog.h index e9609d7d5..4c1647b99 100644 --- a/gtk/gtkinputdialog.h +++ b/gtk/gtkinputdialog.h @@ -42,7 +42,6 @@ #define __GTK_INPUTDIALOG_H__ -#include #include diff --git a/gtk/gtkitem.h b/gtk/gtkitem.h index 9a6e407c9..4c3d3aee6 100644 --- a/gtk/gtkitem.h +++ b/gtk/gtkitem.h @@ -32,7 +32,6 @@ #define __GTK_ITEM_H__ -#include #include diff --git a/gtk/gtklabel.h b/gtk/gtklabel.h index 27e300dad..59778ef67 100644 --- a/gtk/gtklabel.h +++ b/gtk/gtklabel.h @@ -31,11 +31,11 @@ #define __GTK_LABEL_H__ -#include #include #include #include + G_BEGIN_DECLS #define GTK_TYPE_LABEL (gtk_label_get_type ()) diff --git a/gtk/gtklayout.h b/gtk/gtklayout.h index d9743c63e..0d2e6bcf5 100644 --- a/gtk/gtklayout.h +++ b/gtk/gtklayout.h @@ -35,10 +35,11 @@ #ifndef __GTK_LAYOUT_H__ #define __GTK_LAYOUT_H__ -#include + #include #include + G_BEGIN_DECLS #define GTK_TYPE_LAYOUT (gtk_layout_get_type ()) diff --git a/gtk/gtkmenu.h b/gtk/gtkmenu.h index 3521e5ded..6f988f003 100644 --- a/gtk/gtkmenu.h +++ b/gtk/gtkmenu.h @@ -32,7 +32,6 @@ #define __GTK_MENU_H__ -#include #include #include diff --git a/gtk/gtkmenubar.h b/gtk/gtkmenubar.h index bb32d1674..2acce0b17 100644 --- a/gtk/gtkmenubar.h +++ b/gtk/gtkmenubar.h @@ -32,7 +32,6 @@ #define __GTK_MENU_BAR_H__ -#include #include diff --git a/gtk/gtkmenuitem.h b/gtk/gtkmenuitem.h index 8bd3c7f9e..6c56409ad 100644 --- a/gtk/gtkmenuitem.h +++ b/gtk/gtkmenuitem.h @@ -32,7 +32,6 @@ #define __GTK_MENU_ITEM_H__ -#include #include diff --git a/gtk/gtkmenushell.h b/gtk/gtkmenushell.h index b38051e47..e8281bcbb 100644 --- a/gtk/gtkmenushell.h +++ b/gtk/gtkmenushell.h @@ -32,7 +32,6 @@ #define __GTK_MENU_SHELL_H__ -#include #include diff --git a/gtk/gtkmisc.h b/gtk/gtkmisc.h index 6e34f9ec3..477c73b60 100644 --- a/gtk/gtkmisc.h +++ b/gtk/gtkmisc.h @@ -32,7 +32,6 @@ #define __GTK_MISC_H__ -#include #include @@ -52,10 +51,10 @@ typedef struct _GtkMiscClass GtkMiscClass; struct _GtkMisc { GtkWidget widget; - + gfloat GSEAL (xalign); gfloat GSEAL (yalign); - + guint16 GSEAL (xpad); guint16 GSEAL (ypad); }; diff --git a/gtk/gtknotebook.h b/gtk/gtknotebook.h index 3e4ea32cc..0659cc92d 100644 --- a/gtk/gtknotebook.h +++ b/gtk/gtknotebook.h @@ -33,9 +33,9 @@ #define __GTK_NOTEBOOK_H__ -#include #include + G_BEGIN_DECLS #define GTK_TYPE_NOTEBOOK (gtk_notebook_get_type ()) diff --git a/gtk/gtkplug.h b/gtk/gtkplug.h index cb9040aff..3ea997196 100644 --- a/gtk/gtkplug.h +++ b/gtk/gtkplug.h @@ -31,7 +31,6 @@ #define __GTK_PLUG_H__ -#include #include #include diff --git a/gtk/gtkprogress.h b/gtk/gtkprogress.h index b47e8760f..0284add52 100644 --- a/gtk/gtkprogress.h +++ b/gtk/gtkprogress.h @@ -21,14 +21,13 @@ * 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_PROGRESS_H__ #define __GTK_PROGRESS_H__ -#include #include #include diff --git a/gtk/gtkprogressbar.h b/gtk/gtkprogressbar.h index a62b584ae..6f09b2ce8 100644 --- a/gtk/gtkprogressbar.h +++ b/gtk/gtkprogressbar.h @@ -32,7 +32,6 @@ #define __GTK_PROGRESS_BAR_H__ -#include #include diff --git a/gtk/gtkradiobutton.h b/gtk/gtkradiobutton.h index 3e7abf81d..c39e214db 100644 --- a/gtk/gtkradiobutton.h +++ b/gtk/gtkradiobutton.h @@ -32,7 +32,6 @@ #define __GTK_RADIO_BUTTON_H__ -#include #include diff --git a/gtk/gtkradiomenuitem.h b/gtk/gtkradiomenuitem.h index d7af6bbbf..46daa4dc5 100644 --- a/gtk/gtkradiomenuitem.h +++ b/gtk/gtkradiomenuitem.h @@ -32,9 +32,9 @@ #define __GTK_RADIO_MENU_ITEM_H__ -#include #include + G_BEGIN_DECLS #define GTK_TYPE_RADIO_MENU_ITEM (gtk_radio_menu_item_get_type ()) diff --git a/gtk/gtkrange.h b/gtk/gtkrange.h index 5efa7547a..7c6b46d01 100644 --- a/gtk/gtkrange.h +++ b/gtk/gtkrange.h @@ -32,7 +32,6 @@ #define __GTK_RANGE_H__ -#include #include #include diff --git a/gtk/gtkruler.h b/gtk/gtkruler.h index 308012a57..50c0539cd 100644 --- a/gtk/gtkruler.h +++ b/gtk/gtkruler.h @@ -42,7 +42,6 @@ #define __GTK_RULER_H__ -#include #include diff --git a/gtk/gtkscale.h b/gtk/gtkscale.h index 3addba6ea..3a86ee1ac 100644 --- a/gtk/gtkscale.h +++ b/gtk/gtkscale.h @@ -32,7 +32,6 @@ #define __GTK_SCALE_H__ -#include #include diff --git a/gtk/gtkscrollbar.h b/gtk/gtkscrollbar.h index 72d859500..b1d182e6a 100644 --- a/gtk/gtkscrollbar.h +++ b/gtk/gtkscrollbar.h @@ -32,7 +32,6 @@ #define __GTK_SCROLLBAR_H__ -#include #include diff --git a/gtk/gtkscrolledwindow.h b/gtk/gtkscrolledwindow.h index b36071ca9..a82b3b096 100644 --- a/gtk/gtkscrolledwindow.h +++ b/gtk/gtkscrolledwindow.h @@ -32,7 +32,6 @@ #define __GTK_SCROLLED_WINDOW_H__ -#include #include #include #include diff --git a/gtk/gtkseparator.h b/gtk/gtkseparator.h index ac0f9d894..2e41a9628 100644 --- a/gtk/gtkseparator.h +++ b/gtk/gtkseparator.h @@ -32,7 +32,6 @@ #define __GTK_SEPARATOR_H__ -#include #include diff --git a/gtk/gtkseparatormenuitem.h b/gtk/gtkseparatormenuitem.h index b8080ac5b..8b9bb5920 100644 --- a/gtk/gtkseparatormenuitem.h +++ b/gtk/gtkseparatormenuitem.h @@ -31,7 +31,7 @@ #ifndef __GTK_SEPARATOR_MENU_ITEM_H__ #define __GTK_SEPARATOR_MENU_ITEM_H__ -#include + #include diff --git a/gtk/gtkspinbutton.h b/gtk/gtkspinbutton.h index b513f9ae7..676795379 100644 --- a/gtk/gtkspinbutton.h +++ b/gtk/gtkspinbutton.h @@ -35,7 +35,6 @@ #define __GTK_SPIN_BUTTON_H__ -#include #include #include diff --git a/gtk/gtktable.h b/gtk/gtktable.h index 39fe9b996..9b3ebf9dd 100644 --- a/gtk/gtktable.h +++ b/gtk/gtktable.h @@ -32,7 +32,6 @@ #define __GTK_TABLE_H__ -#include #include diff --git a/gtk/gtktearoffmenuitem.h b/gtk/gtktearoffmenuitem.h index 2a5b7fed1..a30b0ec46 100644 --- a/gtk/gtktearoffmenuitem.h +++ b/gtk/gtktearoffmenuitem.h @@ -32,9 +32,9 @@ #define __GTK_TEAROFF_MENU_ITEM_H__ -#include #include + G_BEGIN_DECLS #define GTK_TYPE_TEAROFF_MENU_ITEM (gtk_tearoff_menu_item_get_type ()) diff --git a/gtk/gtktext.h b/gtk/gtktext.h index 32dc14a03..8bfa71aa2 100644 --- a/gtk/gtktext.h +++ b/gtk/gtktext.h @@ -30,10 +30,9 @@ #define __GTK_TEXT_H__ -#include -#include #include + G_BEGIN_DECLS #define GTK_TYPE_TEXT (gtk_text_get_type ()) diff --git a/gtk/gtkthemes.h b/gtk/gtkthemes.h index 0991f7d07..49d3e511d 100644 --- a/gtk/gtkthemes.h +++ b/gtk/gtkthemes.h @@ -2,7 +2,7 @@ * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald * * Themes added by The Rasterman - * + * * 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 @@ -22,16 +22,17 @@ * 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_THEMES_H__ #define __GTK_THEMES_H__ -#include + #include #include + G_BEGIN_DECLS #define GTK_TYPE_THEME_ENGINE (gtk_theme_engine_get_type ()) diff --git a/gtk/gtktipsquery.h b/gtk/gtktipsquery.h index 500ecf425..b792d8121 100644 --- a/gtk/gtktipsquery.h +++ b/gtk/gtktipsquery.h @@ -32,6 +32,7 @@ #ifndef __GTK_TIPS_QUERY_H__ #define __GTK_TIPS_QUERY_H__ + #include @@ -101,7 +102,7 @@ void gtk_tips_query_set_caller (GtkTipsQuery *tips_query, void gtk_tips_query_set_labels (GtkTipsQuery *tips_query, const gchar *label_inactive, const gchar *label_no_tip); - + G_END_DECLS #endif /* __GTK_TIPS_QUERY_H__ */ diff --git a/gtk/gtktogglebutton.h b/gtk/gtktogglebutton.h index 009688a7b..686dab861 100644 --- a/gtk/gtktogglebutton.h +++ b/gtk/gtktogglebutton.h @@ -32,9 +32,9 @@ #define __GTK_TOGGLE_BUTTON_H__ -#include #include + G_BEGIN_DECLS #define GTK_TYPE_TOGGLE_BUTTON (gtk_toggle_button_get_type ()) diff --git a/gtk/gtktoolbar.h b/gtk/gtktoolbar.h index 0c6b2b60d..4de8ce1f9 100644 --- a/gtk/gtktoolbar.h +++ b/gtk/gtktoolbar.h @@ -36,7 +36,7 @@ #ifndef __GTK_TOOLBAR_H__ #define __GTK_TOOLBAR_H__ -#include + #include #include #include diff --git a/gtk/gtktree.h b/gtk/gtktree.h index d0b8089f1..1d0e1f734 100644 --- a/gtk/gtktree.h +++ b/gtk/gtktree.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/. */ #ifdef GTK_ENABLE_BROKEN @@ -29,15 +29,15 @@ #ifndef __GTK_TREE_H__ #define __GTK_TREE_H__ -/* set this flag to enable tree debugging output */ -/* #define TREE_DEBUG */ -#include #include G_BEGIN_DECLS +/* set this flag to enable tree debugging output */ +/* #define TREE_DEBUG */ + #define GTK_TYPE_TREE (gtk_tree_get_type ()) #define GTK_TREE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_TREE, GtkTree)) #define GTK_TREE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_TREE, GtkTreeClass)) diff --git a/gtk/gtktreeitem.h b/gtk/gtktreeitem.h index c7ba07a7f..0e8dbaf1d 100644 --- a/gtk/gtktreeitem.h +++ b/gtk/gtktreeitem.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/. */ #ifdef GTK_ENABLE_BROKEN @@ -30,7 +30,6 @@ #define __GTK_TREE_ITEM_H__ -#include #include diff --git a/gtk/gtkvbox.h b/gtk/gtkvbox.h index a0ca325b3..68b549a74 100644 --- a/gtk/gtkvbox.h +++ b/gtk/gtkvbox.h @@ -32,7 +32,6 @@ #define __GTK_VBOX_H__ -#include #include diff --git a/gtk/gtkviewport.h b/gtk/gtkviewport.h index cc496f4be..a9300da5b 100644 --- a/gtk/gtkviewport.h +++ b/gtk/gtkviewport.h @@ -32,7 +32,6 @@ #define __GTK_VIEWPORT_H__ -#include #include #include diff --git a/gtk/gtkvruler.h b/gtk/gtkvruler.h index 8126c3232..4cade7ba6 100644 --- a/gtk/gtkvruler.h +++ b/gtk/gtkvruler.h @@ -42,7 +42,6 @@ #define __GTK_VRULER_H__ -#include #include diff --git a/gtk/gtkvscale.h b/gtk/gtkvscale.h index ac9bf5f44..8409912fa 100644 --- a/gtk/gtkvscale.h +++ b/gtk/gtkvscale.h @@ -32,7 +32,6 @@ #define __GTK_VSCALE_H__ -#include #include diff --git a/gtk/gtkvscrollbar.h b/gtk/gtkvscrollbar.h index 184be409b..2a8e85e8a 100644 --- a/gtk/gtkvscrollbar.h +++ b/gtk/gtkvscrollbar.h @@ -32,7 +32,6 @@ #define __GTK_VSCROLLBAR_H__ -#include #include diff --git a/gtk/gtkvseparator.h b/gtk/gtkvseparator.h index 8d57eef39..ee97ee069 100644 --- a/gtk/gtkvseparator.h +++ b/gtk/gtkvseparator.h @@ -32,7 +32,6 @@ #define __GTK_VSEPARATOR_H__ -#include #include diff --git a/gtk/gtkwin32embedwidget.h b/gtk/gtkwin32embedwidget.h index 87d6d233e..92515cfb8 100644 --- a/gtk/gtkwin32embedwidget.h +++ b/gtk/gtkwin32embedwidget.h @@ -20,16 +20,17 @@ * Modified by the GTK+ Team and others 1997-2006. 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_WIN32_EMBED_WIDGET_H__ #define __GTK_WIN32_EMBED_WIDGET_H__ -#include + #include #include "win32/gdkwin32.h" + G_BEGIN_DECLS #define GTK_TYPE_WIN32_EMBED_WIDGET (gtk_win32_embed_widget_get_type ()) diff --git a/gtk/gtkwindow.h b/gtk/gtkwindow.h index 20829eca4..dc1b5c59c 100644 --- a/gtk/gtkwindow.h +++ b/gtk/gtkwindow.h @@ -31,11 +31,12 @@ #ifndef __GTK_WINDOW_H__ #define __GTK_WINDOW_H__ -#include + #include #include #include + G_BEGIN_DECLS #define GTK_TYPE_WINDOW (gtk_window_get_type ())