gtkmm r1066 - in trunk: . demos/gtk-demo gdk/src gtk/gtkmm gtk/src tests/refcount_dialog tools/extra_defs_gen

From: murrayc svn gnome org
To: svn-commits-list gnome org
Subject: gtkmm r1066 - in trunk: . demos/gtk-demo gdk/src gtk/gtkmm gtk/src tests/refcount_dialog tools/extra_defs_gen
Date: Wed, 10 Dec 2008 19:45:14 +0000 (UTC)
Author: murrayc
Date: Wed Dec 10 19:45:14 2008
New Revision: 1066
URL: http://svn.gnome.org/viewvc/gtkmm?rev=1066&view=rev

Log:
2008-12-10 PrzemysÅaw Grzegorczyk  <pgrzegorczyk gmail com>

* Cleaned up gtk includes to use only toplevel headers
Bug #564006


Modified:
   trunk/ChangeLog
   trunk/demos/gtk-demo/example_buttonbox.cc
   trunk/demos/gtk-demo/example_dialog.cc
   trunk/demos/gtk-demo/example_textview.cc
   trunk/gdk/src/bitmap.ccg
   trunk/gdk/src/bitmap.hg
   trunk/gdk/src/color.ccg
   trunk/gdk/src/color.hg
   trunk/gdk/src/colormap.ccg
   trunk/gdk/src/cursor.ccg
   trunk/gdk/src/cursor.hg
   trunk/gdk/src/device.ccg
   trunk/gdk/src/device.hg
   trunk/gdk/src/display.ccg
   trunk/gdk/src/display.hg
   trunk/gdk/src/displaymanager.ccg
   trunk/gdk/src/dragcontext.ccg
   trunk/gdk/src/dragcontext.hg
   trunk/gdk/src/drawable.ccg
   trunk/gdk/src/drawable.hg
   trunk/gdk/src/event.hg
   trunk/gdk/src/gc.ccg
   trunk/gdk/src/gc.hg
   trunk/gdk/src/image.hg
   trunk/gdk/src/pixbuf.ccg
   trunk/gdk/src/pixbuf.hg
   trunk/gdk/src/pixbufanimation.ccg
   trunk/gdk/src/pixbufloader.ccg
   trunk/gdk/src/pixmap.ccg
   trunk/gdk/src/region.ccg
   trunk/gdk/src/region.hg
   trunk/gdk/src/rgbcmap.ccg
   trunk/gdk/src/screen.ccg
   trunk/gdk/src/types.hg
   trunk/gdk/src/visual.ccg
   trunk/gdk/src/visual.hg
   trunk/gdk/src/window.ccg
   trunk/gdk/src/window.hg
   trunk/gtk/gtkmm/accelmap.cc
   trunk/gtk/gtkmm/comboboxentrytext.cc
   trunk/gtk/gtkmm/comboboxtext.cc
   trunk/gtk/gtkmm/menu_elems.cc
   trunk/gtk/gtkmm/radiobuttongroup.cc
   trunk/gtk/gtkmm/stock.cc
   trunk/gtk/gtkmm/targetentry.h
   trunk/gtk/src/aboutdialog.ccg
   trunk/gtk/src/accelgroup.ccg
   trunk/gtk/src/accellabel.ccg
   trunk/gtk/src/action.ccg
   trunk/gtk/src/actiongroup.ccg
   trunk/gtk/src/adjustment.ccg
   trunk/gtk/src/alignment.ccg
   trunk/gtk/src/arrow.ccg
   trunk/gtk/src/aspectframe.ccg
   trunk/gtk/src/assistant.ccg
   trunk/gtk/src/bin.ccg
   trunk/gtk/src/box.ccg
   trunk/gtk/src/box.hg
   trunk/gtk/src/builder.ccg
   trunk/gtk/src/button.ccg
   trunk/gtk/src/buttonbox.ccg
   trunk/gtk/src/calendar.ccg
   trunk/gtk/src/calendar.hg
   trunk/gtk/src/celleditable.ccg
   trunk/gtk/src/celllayout.ccg
   trunk/gtk/src/cellrenderer.ccg
   trunk/gtk/src/cellrenderer.hg
   trunk/gtk/src/cellrendereraccel.ccg
   trunk/gtk/src/cellrenderercombo.ccg
   trunk/gtk/src/cellrendererpixbuf.ccg
   trunk/gtk/src/cellrendererprogress.ccg
   trunk/gtk/src/cellrendererspin.ccg
   trunk/gtk/src/cellrenderertext.ccg
   trunk/gtk/src/cellrenderertoggle.ccg
   trunk/gtk/src/cellview.ccg
   trunk/gtk/src/checkbutton.ccg
   trunk/gtk/src/checkmenuitem.ccg
   trunk/gtk/src/clipboard.ccg
   trunk/gtk/src/colorbutton.ccg
   trunk/gtk/src/colorselection.ccg
   trunk/gtk/src/combo.ccg
   trunk/gtk/src/combobox.ccg
   trunk/gtk/src/comboboxentry.ccg
   trunk/gtk/src/container.ccg
   trunk/gtk/src/curve.ccg
   trunk/gtk/src/dialog.ccg
   trunk/gtk/src/dialog.hg
   trunk/gtk/src/drawingarea.ccg
   trunk/gtk/src/editable.ccg
   trunk/gtk/src/editable.hg
   trunk/gtk/src/entry.ccg
   trunk/gtk/src/entrycompletion.ccg
   trunk/gtk/src/enums.hg
   trunk/gtk/src/eventbox.ccg
   trunk/gtk/src/expander.ccg
   trunk/gtk/src/filechooser.ccg
   trunk/gtk/src/filechooserbutton.ccg
   trunk/gtk/src/filechooserdialog.ccg
   trunk/gtk/src/filechooserwidget.ccg
   trunk/gtk/src/filefilter.ccg
   trunk/gtk/src/fileselection.ccg
   trunk/gtk/src/fixed.ccg
   trunk/gtk/src/fontbutton.ccg
   trunk/gtk/src/fontselection.ccg
   trunk/gtk/src/frame.ccg
   trunk/gtk/src/handlebox.ccg
   trunk/gtk/src/iconfactory.ccg
   trunk/gtk/src/iconinfo.ccg
   trunk/gtk/src/iconset.ccg
   trunk/gtk/src/iconsource.ccg
   trunk/gtk/src/icontheme.ccg
   trunk/gtk/src/iconview.ccg
   trunk/gtk/src/image.ccg
   trunk/gtk/src/image.hg
   trunk/gtk/src/imagemenuitem.ccg
   trunk/gtk/src/inputdialog.ccg
   trunk/gtk/src/invisible.ccg
   trunk/gtk/src/item.ccg
   trunk/gtk/src/label.ccg
   trunk/gtk/src/label.hg
   trunk/gtk/src/layout.ccg
   trunk/gtk/src/linkbutton.ccg
   trunk/gtk/src/liststore.ccg
   trunk/gtk/src/main.hg
   trunk/gtk/src/menu.ccg
   trunk/gtk/src/menubar.ccg
   trunk/gtk/src/menuitem.ccg
   trunk/gtk/src/menushell.ccg
   trunk/gtk/src/menutoolbutton.ccg
   trunk/gtk/src/messagedialog.ccg
   trunk/gtk/src/messagedialog.hg
   trunk/gtk/src/misc.ccg
   trunk/gtk/src/notebook.ccg
   trunk/gtk/src/notebook.hg
   trunk/gtk/src/object.ccg
   trunk/gtk/src/optionmenu.ccg
   trunk/gtk/src/pagesetup.ccg
   trunk/gtk/src/pagesetupunixdialog.ccg
   trunk/gtk/src/paned.ccg
   trunk/gtk/src/papersize.ccg
   trunk/gtk/src/plug.ccg
   trunk/gtk/src/printcontext.ccg
   trunk/gtk/src/printer.ccg
   trunk/gtk/src/printjob.ccg
   trunk/gtk/src/printoperation.ccg
   trunk/gtk/src/printoperation.hg
   trunk/gtk/src/printoperationpreview.ccg
   trunk/gtk/src/printoperationpreview.hg
   trunk/gtk/src/printsettings.ccg
   trunk/gtk/src/printunixdialog.ccg
   trunk/gtk/src/progress.ccg
   trunk/gtk/src/progressbar.ccg
   trunk/gtk/src/progressbar.hg
   trunk/gtk/src/radioaction.ccg
   trunk/gtk/src/radiobutton.ccg
   trunk/gtk/src/radiomenuitem.ccg
   trunk/gtk/src/radiotoolbutton.ccg
   trunk/gtk/src/range.ccg
   trunk/gtk/src/rc.ccg
   trunk/gtk/src/rc.hg
   trunk/gtk/src/recentaction.ccg
   trunk/gtk/src/recentchooser.ccg
   trunk/gtk/src/recentchooser.hg
   trunk/gtk/src/recentchooserdialog.ccg
   trunk/gtk/src/recentchoosermenu.ccg
   trunk/gtk/src/recentchooserwidget.ccg
   trunk/gtk/src/recentfilter.ccg
   trunk/gtk/src/recentinfo.ccg
   trunk/gtk/src/recentmanager.ccg
   trunk/gtk/src/ruler.ccg
   trunk/gtk/src/scale.ccg
   trunk/gtk/src/scalebutton.ccg
   trunk/gtk/src/scrollbar.ccg
   trunk/gtk/src/scrolledwindow.ccg
   trunk/gtk/src/selectiondata.ccg
   trunk/gtk/src/separator.ccg
   trunk/gtk/src/separatormenuitem.ccg
   trunk/gtk/src/separatortoolitem.ccg
   trunk/gtk/src/settings.ccg
   trunk/gtk/src/sizegroup.ccg
   trunk/gtk/src/sizegroup.hg
   trunk/gtk/src/socket.ccg
   trunk/gtk/src/spinbutton.ccg
   trunk/gtk/src/spinbutton.hg
   trunk/gtk/src/statusbar.ccg
   trunk/gtk/src/statusicon.ccg
   trunk/gtk/src/stockitem.ccg
   trunk/gtk/src/style.ccg
   trunk/gtk/src/style.hg
   trunk/gtk/src/table.ccg
   trunk/gtk/src/table.hg
   trunk/gtk/src/targetlist.hg
   trunk/gtk/src/tearoffmenuitem.ccg
   trunk/gtk/src/textattributes.ccg
   trunk/gtk/src/textbuffer.ccg
   trunk/gtk/src/textchildanchor.ccg
   trunk/gtk/src/textiter.hg
   trunk/gtk/src/textmark.ccg
   trunk/gtk/src/texttag.ccg
   trunk/gtk/src/texttag.hg
   trunk/gtk/src/texttagtable.ccg
   trunk/gtk/src/textview.ccg
   trunk/gtk/src/textview.hg
   trunk/gtk/src/toggleaction.ccg
   trunk/gtk/src/togglebutton.ccg
   trunk/gtk/src/toggletoolbutton.ccg
   trunk/gtk/src/toolbar.ccg
   trunk/gtk/src/toolbutton.ccg
   trunk/gtk/src/toolitem.ccg
   trunk/gtk/src/toolshell.ccg
   trunk/gtk/src/tooltip.ccg
   trunk/gtk/src/tooltips.ccg
   trunk/gtk/src/treedragdest.ccg
   trunk/gtk/src/treedragsource.ccg
   trunk/gtk/src/treeiter.hg
   trunk/gtk/src/treemodel.ccg
   trunk/gtk/src/treemodel.hg
   trunk/gtk/src/treemodelfilter.ccg
   trunk/gtk/src/treemodelsort.ccg
   trunk/gtk/src/treepath.ccg
   trunk/gtk/src/treerowreference.ccg
   trunk/gtk/src/treeselection.ccg
   trunk/gtk/src/treesortable.hg
   trunk/gtk/src/treestore.ccg
   trunk/gtk/src/treeview.ccg
   trunk/gtk/src/treeview.hg
   trunk/gtk/src/treeviewcolumn.ccg
   trunk/gtk/src/treeviewcolumn.hg
   trunk/gtk/src/uimanager.ccg
   trunk/gtk/src/viewport.ccg
   trunk/gtk/src/volumebutton.ccg
   trunk/gtk/src/widget.ccg
   trunk/gtk/src/widget.hg
   trunk/gtk/src/window.ccg
   trunk/tests/refcount_dialog/main.cc
   trunk/tools/extra_defs_gen/generate_defs_gtk.cc

Modified: trunk/demos/gtk-demo/example_buttonbox.cc
==============================================================================
--- trunk/demos/gtk-demo/example_buttonbox.cc	(original)
+++ trunk/demos/gtk-demo/example_buttonbox.cc	Wed Dec 10 19:45:14 2008
@@ -4,7 +4,7 @@
  */
 
 #include "gtkmm.h"
-#include "gtk/gtkstock.h"
+#include "gtk/gtk.h"
 
 class Example_ButtonBox : public Gtk::Window
 {

Modified: trunk/demos/gtk-demo/example_dialog.cc
==============================================================================
--- trunk/demos/gtk-demo/example_dialog.cc	(original)
+++ trunk/demos/gtk-demo/example_dialog.cc	Wed Dec 10 19:45:14 2008
@@ -4,7 +4,7 @@
  */
 
 #include "gtkmm.h"
-#include "gtk/gtkstock.h"
+#include "gtk/gtk.h"
 #include "stdio.h"
 
 class Example_Dialog : public Gtk::Window

Modified: trunk/demos/gtk-demo/example_textview.cc
==============================================================================
--- trunk/demos/gtk-demo/example_textview.cc	(original)
+++ trunk/demos/gtk-demo/example_textview.cc	Wed Dec 10 19:45:14 2008
@@ -9,7 +9,6 @@
 
 #include <cstdlib>
 #include <gtkmm.h>
-#include <gtk/gtkstock.h>
 #include <gtk/gtk.h>
 
 #include "demo-common.h"

Modified: trunk/gdk/src/bitmap.ccg
==============================================================================
--- trunk/gdk/src/bitmap.ccg	(original)
+++ trunk/gdk/src/bitmap.ccg	Wed Dec 10 19:45:14 2008
@@ -18,7 +18,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gdk/gdkpixmap.h>
+#include <gdk/gdk.h>
 #include <gdkmm/window.h>
 
 

Modified: trunk/gdk/src/bitmap.hg
==============================================================================
--- trunk/gdk/src/bitmap.hg	(original)
+++ trunk/gdk/src/bitmap.hg	Wed Dec 10 19:45:14 2008
@@ -18,7 +18,7 @@
  */
 
 #include <gdkmm/pixmap.h>
-#include <gdk/gdkpixmap.h>
+#include <gdk/gdk.h>
 
 _DEFS(gdkmm,gdk)
 _PINCLUDE(gdkmm/private/pixmap_p.h)

Modified: trunk/gdk/src/color.ccg
==============================================================================
--- trunk/gdk/src/color.ccg	(original)
+++ trunk/gdk/src/color.ccg	Wed Dec 10 19:45:14 2008
@@ -21,8 +21,7 @@
  */
 
 #include <gdkmm/colormap.h>
-#include <gdk/gdkcolor.h>
-#include <gdk/gdkrgb.h>
+#include <gdk/gdk.h>
 
 namespace Gdk
 {

Modified: trunk/gdk/src/color.hg
==============================================================================
--- trunk/gdk/src/color.hg	(original)
+++ trunk/gdk/src/color.hg	Wed Dec 10 19:45:14 2008
@@ -21,7 +21,7 @@
 // the #ifndef GDKMM_DISABLE_DEPRECATED in deprecated classes) is generated:
 _CONFIGINCLUDE(gdkmmconfig.h)
 
-#include <gdk/gdkcolor.h>
+#include <gdk/gdk.h>
 
 _DEFS(gdkmm,gdk)
 

Modified: trunk/gdk/src/colormap.ccg
==============================================================================
--- trunk/gdk/src/colormap.ccg	(original)
+++ trunk/gdk/src/colormap.ccg	Wed Dec 10 19:45:14 2008
@@ -20,7 +20,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gdk/gdkcolor.h>
+#include <gdk/gdk.h>
 
 namespace Gdk
 {

Modified: trunk/gdk/src/cursor.ccg
==============================================================================
--- trunk/gdk/src/cursor.ccg	(original)
+++ trunk/gdk/src/cursor.ccg	Wed Dec 10 19:45:14 2008
@@ -20,7 +20,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gdk/gdkcursor.h>
+#include <gdk/gdk.h>
 
 namespace Gdk
 {

Modified: trunk/gdk/src/cursor.hg
==============================================================================
--- trunk/gdk/src/cursor.hg	(original)
+++ trunk/gdk/src/cursor.hg	Wed Dec 10 19:45:14 2008
@@ -31,7 +31,6 @@
 namespace Gdk
 {
 
-_CC_INCLUDE(gdk/gdkenumtypes.h)
 _WRAP_ENUM(CursorType, GdkCursorType)
 
 /** This represents a cursor.

Modified: trunk/gdk/src/device.ccg
==============================================================================
--- trunk/gdk/src/device.ccg	(original)
+++ trunk/gdk/src/device.ccg	Wed Dec 10 19:45:14 2008
@@ -18,7 +18,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gdk/gdkinput.h>
+#include <gdk/gdk.h>
 
 namespace Gdk
 {

Modified: trunk/gdk/src/device.hg
==============================================================================
--- trunk/gdk/src/device.hg	(original)
+++ trunk/gdk/src/device.hg	Wed Dec 10 19:45:14 2008
@@ -19,7 +19,7 @@
 
 #include <gdkmm/window.h>
 #include <gdkmm/event.h>
-#include <gdk/gdkinput.h>
+#include <gdk/gdk.h>
 
 
 _DEFS(gdkmm,gdk)

Modified: trunk/gdk/src/display.ccg
==============================================================================
--- trunk/gdk/src/display.ccg	(original)
+++ trunk/gdk/src/display.ccg	Wed Dec 10 19:45:14 2008
@@ -21,7 +21,7 @@
  */
 
 #include <gdkmm/window.h>
-#include <gdk/gdkdisplay.h>
+#include <gdk/gdk.h>
 
 namespace Gdk
 {

Modified: trunk/gdk/src/display.hg
==============================================================================
--- trunk/gdk/src/display.hg	(original)
+++ trunk/gdk/src/display.hg	Wed Dec 10 19:45:14 2008
@@ -29,7 +29,7 @@
 namespace Gdk
 {
 
-_CC_INCLUDE(gdk/gdkenumtypes.h)
+_CC_INCLUDE(gdk/gdk.h)
 
 class Drawable;
 

Modified: trunk/gdk/src/displaymanager.ccg
==============================================================================
--- trunk/gdk/src/displaymanager.ccg	(original)
+++ trunk/gdk/src/displaymanager.ccg	Wed Dec 10 19:45:14 2008
@@ -20,7 +20,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gdk/gdkdisplaymanager.h>
+#include <gdk/gdk.h>
 namespace Gdk
 {
 

Modified: trunk/gdk/src/dragcontext.ccg
==============================================================================
--- trunk/gdk/src/dragcontext.ccg	(original)
+++ trunk/gdk/src/dragcontext.ccg	Wed Dec 10 19:45:14 2008
@@ -21,8 +21,8 @@
  */
 
 #include <gdkmm/window.h>
-#include <gtk/gtkdnd.h>
-#include <gdk/gdkwindow.h>
+#include <gtk/gtk.h>
+#include <gdk/gdk.h>
 #include <glibmm/utility.h> //For ScopedPtr<>.
 
 namespace Gdk

Modified: trunk/gdk/src/dragcontext.hg
==============================================================================
--- trunk/gdk/src/dragcontext.hg	(original)
+++ trunk/gdk/src/dragcontext.hg	Wed Dec 10 19:45:14 2008
@@ -23,7 +23,7 @@
 #include <gdkmm/pixbuf.h>
 #include <gdkmm/bitmap.h>
 #include <glibmm/object.h>
-#include <gdk/gdkdnd.h>
+#include <gdk/gdk.h>
 #include <glibmm/listhandle.h>
 #include <gtkmm/stockid.h>
 _DEFS(gdkmm,gdk)
@@ -39,7 +39,6 @@
 namespace Gdk
 {
 
-_CC_INCLUDE(gdk/gdkenumtypes.h)
 _WRAP_ENUM(DragAction, GdkDragAction)
 _WRAP_ENUM(DragProtocol, GdkDragProtocol)
 

Modified: trunk/gdk/src/drawable.ccg
==============================================================================
--- trunk/gdk/src/drawable.ccg	(original)
+++ trunk/gdk/src/drawable.ccg	Wed Dec 10 19:45:14 2008
@@ -21,7 +21,7 @@
 #include <gdkmm/gc.h>
 #include <gdkmm/display.h>
 #include <gdkmm/pixbuf.h>
-#include <gdk/gdkdrawable.h>
+#include <gdk/gdk.h>
 
 namespace Gdk
 {

Modified: trunk/gdk/src/drawable.hg
==============================================================================
--- trunk/gdk/src/drawable.hg	(original)
+++ trunk/gdk/src/drawable.hg	Wed Dec 10 19:45:14 2008
@@ -17,8 +17,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gdk/gdkdrawable.h>
-#include <gdk/gdkrgb.h>
+#include <gdk/gdk.h>
 #include <pangomm/font.h>
 #include <pangomm/layout.h>
 #include <pangomm/layoutline.h>
@@ -40,7 +39,6 @@
 namespace Gdk
 {
 
-_CC_INCLUDE(gdk/gdkenumtypes.h)
 _WRAP_ENUM(RgbDither, GdkRgbDither)
 
 class GC;

Modified: trunk/gdk/src/event.hg
==============================================================================
--- trunk/gdk/src/event.hg	(original)
+++ trunk/gdk/src/event.hg	Wed Dec 10 19:45:14 2008
@@ -18,7 +18,7 @@
  */
 
 _DEFS(gdkmm,gdk)
-_CC_INCLUDE(gdk/gdkenumtypes.h)
+_CC_INCLUDE(gdk/gdk.h)
 
 #include <gdkmm/window.h>
 #include <gdkmm/screen.h>

Modified: trunk/gdk/src/gc.ccg
==============================================================================
--- trunk/gdk/src/gc.ccg	(original)
+++ trunk/gdk/src/gc.ccg	Wed Dec 10 19:45:14 2008
@@ -20,7 +20,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gdk/gdkgc.h>
+#include <gdk/gdk.h>
 #include <gdkmm/color.h>
 //#include <gdkmm/font.h>
 //#include <gdkmm/pixmap.h>

Modified: trunk/gdk/src/gc.hg
==============================================================================
--- trunk/gdk/src/gc.hg	(original)
+++ trunk/gdk/src/gc.hg	Wed Dec 10 19:45:14 2008
@@ -25,7 +25,7 @@
 #include <gdkmm/rectangle.h>
 #include <gdkmm/region.h>
 #include <gdkmm/screen.h>
-#include <gdk/gdkgc.h>
+#include <gdk/gdk.h>
 _DEFS(gdkmm,gdk)
 _PINCLUDE(glibmm/private/object_p.h)
 
@@ -33,7 +33,6 @@
 namespace Gdk
 {
 
-_CC_INCLUDE(gdk/gdkenumtypes.h)
 _WRAP_ENUM(LineStyle, GdkLineStyle)
 _WRAP_ENUM(CapStyle, GdkCapStyle)
 _WRAP_ENUM(JoinStyle, GdkJoinStyle)

Modified: trunk/gdk/src/image.hg
==============================================================================
--- trunk/gdk/src/image.hg	(original)
+++ trunk/gdk/src/image.hg	Wed Dec 10 19:45:14 2008
@@ -23,7 +23,7 @@
 #include <gdkmm/visual.h>
 #include <gdkmm/colormap.h>
 #include <gdkmm/types.h> //For ByteOrder.
-#include <gdk/gdkimage.h>
+#include <gdk/gdk.h>
 
 _DEFS(gdkmm,gdk)
 _PINCLUDE(glibmm/private/object_p.h)
@@ -32,7 +32,6 @@
 namespace Gdk
 {
 
-_CC_INCLUDE(gdk/gdkenumtypes.h)
 _WRAP_ENUM(ImageType, GdkImageType)
 
 /** This represents an area for drawing graphics. It has now been superceded to a large extent by the much more flexible

Modified: trunk/gdk/src/pixbuf.ccg
==============================================================================
--- trunk/gdk/src/pixbuf.ccg	(original)
+++ trunk/gdk/src/pixbuf.ccg	Wed Dec 10 19:45:14 2008
@@ -18,8 +18,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gdk/gdkcolor.h>
-#include <gdk/gdkpixbuf.h>
+#include <gdk/gdk.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
 
 

Modified: trunk/gdk/src/pixbuf.hg
==============================================================================
--- trunk/gdk/src/pixbuf.hg	(original)
+++ trunk/gdk/src/pixbuf.hg	Wed Dec 10 19:45:14 2008
@@ -35,7 +35,7 @@
 namespace Gdk
 {
 
-_CC_INCLUDE(gdk-pixbuf/gdk-pixbuf-enum-types.h)
+_CC_INCLUDE(gdk-pixbuf/gdk-pixbuf.h)
 _WRAP_ENUM(Colorspace, GdkColorspace)
 _WRAP_ENUM(InterpType, GdkInterpType)
 _WRAP_ENUM(PixbufAlphaMode, GdkPixbufAlphaMode)

Modified: trunk/gdk/src/pixbufanimation.ccg
==============================================================================
--- trunk/gdk/src/pixbufanimation.ccg	(original)
+++ trunk/gdk/src/pixbufanimation.ccg	Wed Dec 10 19:45:14 2008
@@ -20,7 +20,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gdk/gdkcolor.h>
+#include <gdk/gdk.h>
 
 namespace Gdk
 {

Modified: trunk/gdk/src/pixbufloader.ccg
==============================================================================
--- trunk/gdk/src/pixbufloader.ccg	(original)
+++ trunk/gdk/src/pixbufloader.ccg	Wed Dec 10 19:45:14 2008
@@ -18,7 +18,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gdk/gdkcolor.h>
+#include <gdk/gdk.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
 
 

Modified: trunk/gdk/src/pixmap.ccg
==============================================================================
--- trunk/gdk/src/pixmap.ccg	(original)
+++ trunk/gdk/src/pixmap.ccg	Wed Dec 10 19:45:14 2008
@@ -20,7 +20,7 @@
 
 #include <gdkmm/window.h>
 #include <gdkmm/display.h>
-#include <gdk/gdkpixmap.h>
+#include <gdk/gdk.h>
 
 
 namespace Gdk

Modified: trunk/gdk/src/region.ccg
==============================================================================
--- trunk/gdk/src/region.ccg	(original)
+++ trunk/gdk/src/region.ccg	Wed Dec 10 19:45:14 2008
@@ -20,7 +20,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gdk/gdkregion.h>
+#include <gdk/gdk.h>
 
 namespace Gdk
 {

Modified: trunk/gdk/src/region.hg
==============================================================================
--- trunk/gdk/src/region.hg	(original)
+++ trunk/gdk/src/region.hg	Wed Dec 10 19:45:14 2008
@@ -30,7 +30,7 @@
 namespace Gdk
 {
 
-_CC_INCLUDE(gdk/gdkenumtypes.h)
+_CC_INCLUDE(gdk/gdk.h)
 _WRAP_ENUM(FillRule, GdkFillRule)
 _WRAP_ENUM(OverlapType, GdkOverlapType)
 

Modified: trunk/gdk/src/rgbcmap.ccg
==============================================================================
--- trunk/gdk/src/rgbcmap.ccg	(original)
+++ trunk/gdk/src/rgbcmap.ccg	Wed Dec 10 19:45:14 2008
@@ -19,7 +19,7 @@
  */
 
 #include <glibmm/utility.h>
-#include <gdk/gdkrgb.h>
+#include <gdk/gdk.h>
 
 namespace Gdk
 {

Modified: trunk/gdk/src/screen.ccg
==============================================================================
--- trunk/gdk/src/screen.ccg	(original)
+++ trunk/gdk/src/screen.ccg	Wed Dec 10 19:45:14 2008
@@ -24,7 +24,7 @@
 #include <gdkmm/visual.h>
 #include <gdkmm/window.h>
 #include <gdkmm/rectangle.h>
-#include <gdk/gdkscreen.h>
+#include <gdk/gdk.h>
 
 namespace Gdk
 {

Modified: trunk/gdk/src/types.hg
==============================================================================
--- trunk/gdk/src/types.hg	(original)
+++ trunk/gdk/src/types.hg	Wed Dec 10 19:45:14 2008
@@ -62,7 +62,6 @@
 class Color;
 class Image;
 
-_CC_INCLUDE(gdk/gdkenumtypes.h)
 _WRAP_ENUM(ByteOrder, GdkByteOrder)
 _WRAP_ENUM(ModifierType, GdkModifierType)
 _WRAP_ENUM(Status, GdkStatus)

Modified: trunk/gdk/src/visual.ccg
==============================================================================
--- trunk/gdk/src/visual.ccg	(original)
+++ trunk/gdk/src/visual.ccg	Wed Dec 10 19:45:14 2008
@@ -20,7 +20,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gdk/gdkvisual.h>
+#include <gdk/gdk.h>
 
 namespace Gdk
 {

Modified: trunk/gdk/src/visual.hg
==============================================================================
--- trunk/gdk/src/visual.hg	(original)
+++ trunk/gdk/src/visual.hg	Wed Dec 10 19:45:14 2008
@@ -21,7 +21,7 @@
 
 #include <glibmm/object.h>
 #include <gdkmm/screen.h>
-#include <gdk/gdkvisual.h>
+#include <gdk/gdk.h>
 
 _DEFS(gdkmm,gdk)
 _PINCLUDE(glibmm/private/object_p.h)
@@ -32,7 +32,6 @@
 
 class Screen;
 
-_CC_INCLUDE(gdk/gdkenumtypes.h)
 _WRAP_ENUM(VisualType, GdkVisualType)
 
 /** A Gdk::Visual describes a particular video hardware display format.

Modified: trunk/gdk/src/window.ccg
==============================================================================
--- trunk/gdk/src/window.ccg	(original)
+++ trunk/gdk/src/window.ccg	Wed Dec 10 19:45:14 2008
@@ -18,7 +18,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gdk/gdkwindow.h>
+#include <gdk/gdk.h>
 #include <gdkmm/pixmap.h>
 #include <gdkmm/cursor.h>
 #include <gdkmm/types.h>

Modified: trunk/gdk/src/window.hg
==============================================================================
--- trunk/gdk/src/window.hg	(original)
+++ trunk/gdk/src/window.hg	Wed Dec 10 19:45:14 2008
@@ -22,7 +22,7 @@
 //#include <gdkmm/cursor.h>
 #include <gdkmm/types.h>
 #include <gdkmm/region.h>
-#include <gdk/gdkwindow.h>
+#include <gdk/gdk.h>
 
 _DEFS(gdkmm,gdk)
 _PINCLUDE(gdkmm/private/drawable_p.h)
@@ -38,7 +38,6 @@
 namespace Gdk
 {
 
-_CC_INCLUDE(gdk/gdkenumtypes.h)
 _WRAP_ENUM(EventMask, GdkEventMask)
 _WRAP_ENUM(WindowState, GdkWindowState)
 _WRAP_ENUM(WindowType, GdkWindowType)

Modified: trunk/gtk/gtkmm/accelmap.cc
==============================================================================
--- trunk/gtk/gtkmm/accelmap.cc	(original)
+++ trunk/gtk/gtkmm/accelmap.cc	Wed Dec 10 19:45:14 2008
@@ -19,7 +19,7 @@
  */
 
 #include <gtkmm/accelmap.h>
-#include <gtk/gtkaccelmap.h>
+#include <gtk/gtk.h>
 
 namespace Gtk
 {

Modified: trunk/gtk/gtkmm/comboboxentrytext.cc
==============================================================================
--- trunk/gtk/gtkmm/comboboxentrytext.cc	(original)
+++ trunk/gtk/gtkmm/comboboxentrytext.cc	Wed Dec 10 19:45:14 2008
@@ -24,8 +24,7 @@
 
 #include <gtkmm/liststore.h>
 #include <gtkmm/cellrenderertext.h>
-#include <gtk/gtkcombobox.h>
-#include <gtk/gtkcelllayout.h>
+#include <gtk/gtk.h>
 
 namespace Gtk
 {

Modified: trunk/gtk/gtkmm/comboboxtext.cc
==============================================================================
--- trunk/gtk/gtkmm/comboboxtext.cc	(original)
+++ trunk/gtk/gtkmm/comboboxtext.cc	Wed Dec 10 19:45:14 2008
@@ -24,8 +24,7 @@
 
 #include <gtkmm/liststore.h>
 #include <gtkmm/cellrenderertext.h>
-#include <gtk/gtkcombobox.h>
-#include <gtk/gtkcelllayout.h>
+#include <gtk/gtk.h>
 
 namespace Gtk
 {

Modified: trunk/gtk/gtkmm/menu_elems.cc
==============================================================================
--- trunk/gtk/gtkmm/menu_elems.cc	(original)
+++ trunk/gtk/gtkmm/menu_elems.cc	Wed Dec 10 19:45:14 2008
@@ -20,7 +20,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtkimagemenuitem.h>
+#include <gtk/gtk.h>
 
 #include <gtkmm/menu_elems.h>
 #include <gtkmm/label.h>

Modified: trunk/gtk/gtkmm/radiobuttongroup.cc
==============================================================================
--- trunk/gtk/gtkmm/radiobuttongroup.cc	(original)
+++ trunk/gtk/gtkmm/radiobuttongroup.cc	Wed Dec 10 19:45:14 2008
@@ -23,10 +23,7 @@
 #include <gtkmm/radiomenuitem.h>
 #include <gtkmm/radioaction.h>
 #include <gtkmm/radiotoolbutton.h>
-#include <gtk/gtkradiobutton.h>
-#include <gtk/gtkradioaction.h>
-#include <gtk/gtkradiomenuitem.h>
-#include <gtk/gtkradiotoolbutton.h>
+#include <gtk/gtk.h>
 
 namespace Gtk
 {

Modified: trunk/gtk/gtkmm/stock.cc
==============================================================================
--- trunk/gtk/gtkmm/stock.cc	(original)
+++ trunk/gtk/gtkmm/stock.cc	Wed Dec 10 19:45:14 2008
@@ -20,7 +20,7 @@
 
 #include <gtkmm/stock.h>
 #include <gtkmm/stockitem.h>
-#include <gtk/gtkstock.h>
+#include <gtk/gtk.h>
 
 // Get rid of macro DELETE (from winnt.h).  We have some macro
 // shadowing magic in stock.h, but it's safer to get rid of it

Modified: trunk/gtk/gtkmm/targetentry.h
==============================================================================
--- trunk/gtk/gtkmm/targetentry.h	(original)
+++ trunk/gtk/gtkmm/targetentry.h	Wed Dec 10 19:45:14 2008
@@ -27,7 +27,7 @@
 #include <glibmm/ustring.h>
 #include <glibmm/arrayhandle.h>
 #include <gtkmm/enums.h>
-#include <gtk/gtkselection.h> //For GtkTargetEntry.
+#include <gtk/gtk.h> //For GtkTargetEntry.
 
 #ifndef DOXYGEN_SHOULD_SKIP_THIS
 extern "C"

Modified: trunk/gtk/src/aboutdialog.ccg
==============================================================================
--- trunk/gtk/src/aboutdialog.ccg	(original)
+++ trunk/gtk/src/aboutdialog.ccg	Wed Dec 10 19:45:14 2008
@@ -20,8 +20,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtkaboutdialog.h>
-#include <gtk/gtklabel.h>
+#include <gtk/gtk.h>
 
 
 //We use a function instead of a static method, so we can make it static, so it is not exported.

Modified: trunk/gtk/src/accelgroup.ccg
==============================================================================
--- trunk/gtk/src/accelgroup.ccg	(original)
+++ trunk/gtk/src/accelgroup.ccg	Wed Dec 10 19:45:14 2008
@@ -18,7 +18,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtkaccelgroup.h>
+#include <gtk/gtk.h>
 
 
 namespace Gtk

Modified: trunk/gtk/src/accellabel.ccg
==============================================================================
--- trunk/gtk/src/accellabel.ccg	(original)
+++ trunk/gtk/src/accellabel.ccg	Wed Dec 10 19:45:14 2008
@@ -20,7 +20,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtkaccellabel.h>
+#include <gtk/gtk.h>
 #include <glibmm/wrap.h>
 
 namespace Gtk

Modified: trunk/gtk/src/action.ccg
==============================================================================
--- trunk/gtk/src/action.ccg	(original)
+++ trunk/gtk/src/action.ccg	Wed Dec 10 19:45:14 2008
@@ -18,7 +18,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtkaction.h>
+#include <gtk/gtk.h>
 
 #include <gtkmm/menu.h>
 #include <gtkmm/menuitem.h>

Modified: trunk/gtk/src/actiongroup.ccg
==============================================================================
--- trunk/gtk/src/actiongroup.ccg	(original)
+++ trunk/gtk/src/actiongroup.ccg	Wed Dec 10 19:45:14 2008
@@ -18,7 +18,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtkactiongroup.h>
+#include <gtk/gtk.h>
 #include <gtkmm/accelmap.h>
 
 

Modified: trunk/gtk/src/adjustment.ccg
==============================================================================
--- trunk/gtk/src/adjustment.ccg	(original)
+++ trunk/gtk/src/adjustment.ccg	Wed Dec 10 19:45:14 2008
@@ -19,7 +19,7 @@
  * License along with this library; if not, write to the Free
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-#include <gtk/gtkadjustment.h>
+#include <gtk/gtk.h>
 
 namespace Gtk
 {

Modified: trunk/gtk/src/alignment.ccg
==============================================================================
--- trunk/gtk/src/alignment.ccg	(original)
+++ trunk/gtk/src/alignment.ccg	Wed Dec 10 19:45:14 2008
@@ -20,7 +20,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtkalignment.h>
+#include <gtk/gtk.h>
 
 namespace Gtk
 {

Modified: trunk/gtk/src/arrow.ccg
==============================================================================
--- trunk/gtk/src/arrow.ccg	(original)
+++ trunk/gtk/src/arrow.ccg	Wed Dec 10 19:45:14 2008
@@ -19,7 +19,7 @@
  * License along with this library; if not, write to the Free
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-#include <gtk/gtkarrow.h>
+#include <gtk/gtk.h>
 
 namespace Gtk
 {

Modified: trunk/gtk/src/aspectframe.ccg
==============================================================================
--- trunk/gtk/src/aspectframe.ccg	(original)
+++ trunk/gtk/src/aspectframe.ccg	Wed Dec 10 19:45:14 2008
@@ -20,4 +20,4 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtkaspectframe.h>
+#include <gtk/gtk.h>

Modified: trunk/gtk/src/assistant.ccg
==============================================================================
--- trunk/gtk/src/assistant.ccg	(original)
+++ trunk/gtk/src/assistant.ccg	Wed Dec 10 19:45:14 2008
@@ -20,8 +20,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtkassistant.h>
-#include <gtk/gtklabel.h>
+#include <gtk/gtk.h>
 
 
 

Modified: trunk/gtk/src/bin.ccg
==============================================================================
--- trunk/gtk/src/bin.ccg	(original)
+++ trunk/gtk/src/bin.ccg	Wed Dec 10 19:45:14 2008
@@ -20,7 +20,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtkbin.h>
+#include <gtk/gtk.h>
 #include <gtkmm/adjustment.h>
 #include <gtkmm/label.h>
 #include <gtkmm/box.h>

Modified: trunk/gtk/src/box.ccg
==============================================================================
--- trunk/gtk/src/box.ccg	(original)
+++ trunk/gtk/src/box.ccg	Wed Dec 10 19:45:14 2008
@@ -20,9 +20,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtkbox.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtkhbox.h>
+#include <gtk/gtk.h>
 #include <glibmm/wrap.h>
 
 namespace Gtk

Modified: trunk/gtk/src/box.hg
==============================================================================
--- trunk/gtk/src/box.hg	(original)
+++ trunk/gtk/src/box.hg	Wed Dec 10 19:45:14 2008
@@ -22,7 +22,7 @@
 
 #include <gtkmm/container.h>
 #include <glibmm/helperlist.h>
-#include <gtk/gtkbox.h>  /* For _GtkBoxChild */
+#include <gtk/gtk.h>  /* For _GtkBoxChild */
 
 
 namespace Gtk

Modified: trunk/gtk/src/builder.ccg
==============================================================================
--- trunk/gtk/src/builder.ccg	(original)
+++ trunk/gtk/src/builder.ccg	Wed Dec 10 19:45:14 2008
@@ -18,7 +18,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtkbuilder.h>
+#include <gtk/gtk.h>
 
 // Allow GtkBuilder to instantiate a gtkmm derived GType instead of the regular 
 // GTK+ GType, so we can, for instance, use our vfuncs and default signal handlers.

Modified: trunk/gtk/src/button.ccg
==============================================================================
--- trunk/gtk/src/button.ccg	(original)
+++ trunk/gtk/src/button.ccg	Wed Dec 10 19:45:14 2008
@@ -20,9 +20,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtklabel.h>
-#include <gtk/gtkmisc.h>
-#include <gtk/gtkbutton.h>
+#include <gtk/gtk.h>
 #include <gtkmm/stock.h>
 
 

Modified: trunk/gtk/src/buttonbox.ccg
==============================================================================
--- trunk/gtk/src/buttonbox.ccg	(original)
+++ trunk/gtk/src/buttonbox.ccg	Wed Dec 10 19:45:14 2008
@@ -20,8 +20,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtkhbbox.h>
-#include <gtk/gtkvbbox.h>
+#include <gtk/gtk.h>
 
 namespace Gtk
 {

Modified: trunk/gtk/src/calendar.ccg
==============================================================================
--- trunk/gtk/src/calendar.ccg	(original)
+++ trunk/gtk/src/calendar.ccg	Wed Dec 10 19:45:14 2008
@@ -20,7 +20,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtkcalendar.h>
+#include <gtk/gtk.h>
 
 
 static gchar* SignalProxy_Details_gtk_callback(GtkCalendar* model, guint year, guint month, guint day, gpointer user_data)

Modified: trunk/gtk/src/calendar.hg
==============================================================================
--- trunk/gtk/src/calendar.hg	(original)
+++ trunk/gtk/src/calendar.hg	Wed Dec 10 19:45:14 2008
@@ -28,7 +28,7 @@
 namespace Gtk
 {
 
-_CC_INCLUDE(gtk/gtktypebuiltins.h)
+_CC_INCLUDE(gtk/gtk.h)
 _WRAP_ENUM(CalendarDisplayOptions, GtkCalendarDisplayOptions)
 
 /** Display a calendar and/or allow the user to select a date.

Modified: trunk/gtk/src/celleditable.ccg
==============================================================================
--- trunk/gtk/src/celleditable.ccg	(original)
+++ trunk/gtk/src/celleditable.ccg	Wed Dec 10 19:45:14 2008
@@ -18,5 +18,5 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtkcelleditable.h>
+#include <gtk/gtk.h>
 

Modified: trunk/gtk/src/celllayout.ccg
==============================================================================
--- trunk/gtk/src/celllayout.ccg	(original)
+++ trunk/gtk/src/celllayout.ccg	Wed Dec 10 19:45:14 2008
@@ -18,7 +18,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtkcelllayout.h>
+#include <gtk/gtk.h>
 
 
 static void SignalProxy_CellData_gtk_callback(GtkCellLayout* /* cell_layout */, GtkCellRenderer* /* cell */, GtkTreeModel* tree_model, GtkTreeIter* iter, gpointer data)

Modified: trunk/gtk/src/cellrenderer.ccg
==============================================================================
--- trunk/gtk/src/cellrenderer.ccg	(original)
+++ trunk/gtk/src/cellrenderer.ccg	Wed Dec 10 19:45:14 2008
@@ -18,7 +18,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtkcellrenderer.h>
+#include <gtk/gtk.h>
 
 namespace Gtk
 {

Modified: trunk/gtk/src/cellrenderer.hg
==============================================================================
--- trunk/gtk/src/cellrenderer.hg	(original)
+++ trunk/gtk/src/cellrenderer.hg	Wed Dec 10 19:45:14 2008
@@ -23,14 +23,12 @@
 
 _DEFS(gtkmm,gtk)
 _PH_INCLUDE(gtkmm/private/object_p.h)
-_PH_INCLUDE(gtk/gtkcellrenderer.h)
+_PH_INCLUDE(gtk/gtk.h)
 
 
 namespace Gtk
 {
 
-_CC_INCLUDE(gtk/gtktypebuiltins.h)
-
 _WRAP_ENUM(CellRendererState, GtkCellRendererState)
 _WRAP_ENUM(CellRendererMode, GtkCellRendererMode)
 

Modified: trunk/gtk/src/cellrendereraccel.ccg
==============================================================================
--- trunk/gtk/src/cellrendereraccel.ccg	(original)
+++ trunk/gtk/src/cellrendereraccel.ccg	Wed Dec 10 19:45:14 2008
@@ -20,7 +20,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
  
-#include <gtk/gtkcellrendereraccel.h>
+#include <gtk/gtk.h>
 
 namespace Gtk
 {

Modified: trunk/gtk/src/cellrenderercombo.ccg
==============================================================================
--- trunk/gtk/src/cellrenderercombo.ccg	(original)
+++ trunk/gtk/src/cellrenderercombo.ccg	Wed Dec 10 19:45:14 2008
@@ -20,8 +20,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
  
-#include <gtk/gtkcellrenderercombo.h>
-#include <gtk/gtktreeview.h>
+#include <gtk/gtk.h>
 
 ///This is used only by signal_changed's generated implementation.
 static GtkTreeModel* _get_model(GtkCellRendererCombo* renderer)

Modified: trunk/gtk/src/cellrendererpixbuf.ccg
==============================================================================
--- trunk/gtk/src/cellrendererpixbuf.ccg	(original)
+++ trunk/gtk/src/cellrendererpixbuf.ccg	Wed Dec 10 19:45:14 2008
@@ -19,7 +19,7 @@
  * License along with this library; if not, write to the Free
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-#include <gtk/gtkcellrendererpixbuf.h>
+#include <gtk/gtk.h>
 
 namespace Gtk
 {

Modified: trunk/gtk/src/cellrendererprogress.ccg
==============================================================================
--- trunk/gtk/src/cellrendererprogress.ccg	(original)
+++ trunk/gtk/src/cellrendererprogress.ccg	Wed Dec 10 19:45:14 2008
@@ -20,7 +20,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
  
-#include <gtk/gtkcellrendererprogress.h>
+#include <gtk/gtk.h>
 
 namespace Gtk
 {

Modified: trunk/gtk/src/cellrendererspin.ccg
==============================================================================
--- trunk/gtk/src/cellrendererspin.ccg	(original)
+++ trunk/gtk/src/cellrendererspin.ccg	Wed Dec 10 19:45:14 2008
@@ -15,7 +15,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtkcellrendererspin.h>
+#include <gtk/gtk.h>
 
 namespace Gtk
 {

Modified: trunk/gtk/src/cellrenderertext.ccg
==============================================================================
--- trunk/gtk/src/cellrenderertext.ccg	(original)
+++ trunk/gtk/src/cellrenderertext.ccg	Wed Dec 10 19:45:14 2008
@@ -19,7 +19,7 @@
  * License along with this library; if not, write to the Free
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-#include <gtk/gtkcellrenderertext.h>
+#include <gtk/gtk.h>
 
 namespace Gtk
 {

Modified: trunk/gtk/src/cellrenderertoggle.ccg
==============================================================================
--- trunk/gtk/src/cellrenderertoggle.ccg	(original)
+++ trunk/gtk/src/cellrenderertoggle.ccg	Wed Dec 10 19:45:14 2008
@@ -20,7 +20,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtkcellrenderertoggle.h>
+#include <gtk/gtk.h>
 
 namespace Gtk
 {

Modified: trunk/gtk/src/cellview.ccg
==============================================================================
--- trunk/gtk/src/cellview.ccg	(original)
+++ trunk/gtk/src/cellview.ccg	Wed Dec 10 19:45:14 2008
@@ -22,7 +22,7 @@
 
 #include <gtkmm/cellrenderertext.h>
 #include <gtkmm/cellrendererpixbuf.h>
-#include <gtk/gtkcellview.h>
+#include <gtk/gtk.h>
 
 namespace Gtk
 {

Modified: trunk/gtk/src/checkbutton.ccg
==============================================================================
--- trunk/gtk/src/checkbutton.ccg	(original)
+++ trunk/gtk/src/checkbutton.ccg	Wed Dec 10 19:45:14 2008
@@ -20,7 +20,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtkcheckbutton.h>
+#include <gtk/gtk.h>
 
 namespace Gtk
 {

Modified: trunk/gtk/src/checkmenuitem.ccg
==============================================================================
--- trunk/gtk/src/checkmenuitem.ccg	(original)
+++ trunk/gtk/src/checkmenuitem.ccg	Wed Dec 10 19:45:14 2008
@@ -20,7 +20,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtkcheckmenuitem.h>
+#include <gtk/gtk.h>
 #include <gtkmm/misc.h>
 #include <gtkmm/label.h>
 

Modified: trunk/gtk/src/clipboard.ccg
==============================================================================
--- trunk/gtk/src/clipboard.ccg	(original)
+++ trunk/gtk/src/clipboard.ccg	Wed Dec 10 19:45:14 2008
@@ -23,7 +23,7 @@
 #include <gtkmm/textbuffer.h>
 #include <gtkmm/selectiondata_private.h>
 #include <glibmm/utility.h> //For ScopedPtr<>.
-#include <gtk/gtkclipboard.h>
+#include <gtk/gtk.h>
 
 namespace
 {

Modified: trunk/gtk/src/colorbutton.ccg
==============================================================================
--- trunk/gtk/src/colorbutton.ccg	(original)
+++ trunk/gtk/src/colorbutton.ccg	Wed Dec 10 19:45:14 2008
@@ -20,7 +20,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtkcolorbutton.h>
+#include <gtk/gtk.h>
 #include <gdkmm/color.h>
 
 namespace Gtk

Modified: trunk/gtk/src/colorselection.ccg
==============================================================================
--- trunk/gtk/src/colorselection.ccg	(original)
+++ trunk/gtk/src/colorselection.ccg	Wed Dec 10 19:45:14 2008
@@ -18,8 +18,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtkcolorsel.h>
-#include <gtk/gtkcolorseldialog.h>
+#include <gtk/gtk.h>
 
 
 namespace

Modified: trunk/gtk/src/combo.ccg
==============================================================================
--- trunk/gtk/src/combo.ccg	(original)
+++ trunk/gtk/src/combo.ccg	Wed Dec 10 19:45:14 2008
@@ -20,12 +20,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-//These were deprecated between 1.2 and 2.0:
-#include <gtk/gtklistitem.h>
-#include <gtk/gtklist.h>
-
-#include <gtk/gtkcombo.h>
-#include <gtk/gtklabel.h>
+#include <gtk/gtk.h>
 #include <gtkmm/entry.h>
 #include <gtkmm/button.h>
 #include <gtkmm/scrolledwindow.h>

Modified: trunk/gtk/src/combobox.ccg
==============================================================================
--- trunk/gtk/src/combobox.ccg	(original)
+++ trunk/gtk/src/combobox.ccg	Wed Dec 10 19:45:14 2008
@@ -23,8 +23,7 @@
 #include <gtkmm/liststore.h>
 #include <gtkmm/cellrenderertext.h>
 #include <gtkmm/treeview_private.h> //For SignalProxy_RowSeparator.
-#include <gtk/gtkcombobox.h>
-#include <gtk/gtkcelllayout.h>
+#include <gtk/gtk.h>
 
 namespace Gtk
 {

Modified: trunk/gtk/src/comboboxentry.ccg
==============================================================================
--- trunk/gtk/src/comboboxentry.ccg	(original)
+++ trunk/gtk/src/comboboxentry.ccg	Wed Dec 10 19:45:14 2008
@@ -20,7 +20,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtkcomboboxentry.h>
+#include <gtk/gtk.h>
 
 namespace Gtk
 {

Modified: trunk/gtk/src/container.ccg
==============================================================================
--- trunk/gtk/src/container.ccg	(original)
+++ trunk/gtk/src/container.ccg	Wed Dec 10 19:45:14 2008
@@ -19,7 +19,7 @@
  */
 
 #include <gtkmm/adjustment.h>
-#include <gtk/gtkcontainer.h>
+#include <gtk/gtk.h>
 
 
 namespace

Modified: trunk/gtk/src/curve.ccg
==============================================================================
--- trunk/gtk/src/curve.ccg	(original)
+++ trunk/gtk/src/curve.ccg	Wed Dec 10 19:45:14 2008
@@ -20,8 +20,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtkcurve.h>
-#include <gtk/gtkgamma.h>
+#include <gtk/gtk.h>
 
 namespace Gtk
 {

Modified: trunk/gtk/src/dialog.ccg
==============================================================================
--- trunk/gtk/src/dialog.ccg	(original)
+++ trunk/gtk/src/dialog.ccg	Wed Dec 10 19:45:14 2008
@@ -18,7 +18,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtkdialog.h>
+#include <gtk/gtk.h>
 
 namespace Gtk
 {

Modified: trunk/gtk/src/dialog.hg
==============================================================================
--- trunk/gtk/src/dialog.hg	(original)
+++ trunk/gtk/src/dialog.hg	Wed Dec 10 19:45:14 2008
@@ -33,7 +33,7 @@
 /** @defgroup Dialogs Dialogs
  */
 
-_CC_INCLUDE(gtk/gtktypebuiltins.h)
+_CC_INCLUDE(gtk/gtk.h)
 _WRAP_ENUM(ResponseType, GtkResponseType)
 
 /** Create popup windows.

Modified: trunk/gtk/src/drawingarea.ccg
==============================================================================
--- trunk/gtk/src/drawingarea.ccg	(original)
+++ trunk/gtk/src/drawingarea.ccg	Wed Dec 10 19:45:14 2008
@@ -20,5 +20,5 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtkdrawingarea.h>
+#include <gtk/gtk.h>
 

Modified: trunk/gtk/src/editable.ccg
==============================================================================
--- trunk/gtk/src/editable.ccg	(original)
+++ trunk/gtk/src/editable.ccg	Wed Dec 10 19:45:14 2008
@@ -18,5 +18,5 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtkeditable.h>
+#include <gtk/gtk.h>
 

Modified: trunk/gtk/src/editable.hg
==============================================================================
--- trunk/gtk/src/editable.hg	(original)
+++ trunk/gtk/src/editable.hg	Wed Dec 10 19:45:14 2008
@@ -18,7 +18,7 @@
  */
 
 #include <glibmm/interface.h>
-#include <gtk/gtkeditable.h>
+#include <gtk/gtk.h>
 _DEFS(gtkmm,gtk)
 _PINCLUDE(glibmm/private/interface_p.h)
 

Modified: trunk/gtk/src/entry.ccg
==============================================================================
--- trunk/gtk/src/entry.ccg	(original)
+++ trunk/gtk/src/entry.ccg	Wed Dec 10 19:45:14 2008
@@ -20,5 +20,5 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtkentry.h>
+#include <gtk/gtk.h>
 

Modified: trunk/gtk/src/entrycompletion.ccg
==============================================================================
--- trunk/gtk/src/entrycompletion.ccg	(original)
+++ trunk/gtk/src/entrycompletion.ccg	Wed Dec 10 19:45:14 2008
@@ -20,7 +20,7 @@
 
 #include <gtkmm/treeiter.h>
 #include <gtkmm/entry.h>
-#include <gtk/gtkentrycompletion.h>
+#include <gtk/gtk.h>
 
 
 static gboolean SignalProxy_Match_gtk_callback(GtkEntryCompletion* completion, const gchar* key, GtkTreeIter* iter, gpointer user_data)

Modified: trunk/gtk/src/enums.hg
==============================================================================
--- trunk/gtk/src/enums.hg	(original)
+++ trunk/gtk/src/enums.hg	Wed Dec 10 19:45:14 2008
@@ -25,7 +25,7 @@
 namespace Gtk
 {
 
-_CC_INCLUDE(gtk/gtktypebuiltins.h)
+_CC_INCLUDE(gtk/gtk.h)
 
 _WRAP_ENUM(AccelFlags, GtkAccelFlags)
 _WRAP_ENUM(AnchorType, GtkAnchorType)

Modified: trunk/gtk/src/eventbox.ccg
==============================================================================
--- trunk/gtk/src/eventbox.ccg	(original)
+++ trunk/gtk/src/eventbox.ccg	Wed Dec 10 19:45:14 2008
@@ -20,4 +20,4 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtkeventbox.h>
+#include <gtk/gtk.h>

Modified: trunk/gtk/src/expander.ccg
==============================================================================
--- trunk/gtk/src/expander.ccg	(original)
+++ trunk/gtk/src/expander.ccg	Wed Dec 10 19:45:14 2008
@@ -20,7 +20,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtkexpander.h>
+#include <gtk/gtk.h>
 
 namespace Gtk
 {

Modified: trunk/gtk/src/filechooser.ccg
==============================================================================
--- trunk/gtk/src/filechooser.ccg	(original)
+++ trunk/gtk/src/filechooser.ccg	Wed Dec 10 19:45:14 2008
@@ -18,7 +18,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtkfilechooser.h>
+#include <gtk/gtk.h>
 //#include <gtk/gtkfilesystem.h> //We include this semi-private header just to get GTK_FILE_SYSTEM_ERROR.
 
 

Modified: trunk/gtk/src/filechooserbutton.ccg
==============================================================================
--- trunk/gtk/src/filechooserbutton.ccg	(original)
+++ trunk/gtk/src/filechooserbutton.ccg	Wed Dec 10 19:45:14 2008
@@ -20,7 +20,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtkfilechooserbutton.h>
+#include <gtk/gtk.h>
 
 namespace Gtk
 {

Modified: trunk/gtk/src/filechooserdialog.ccg
==============================================================================
--- trunk/gtk/src/filechooserdialog.ccg	(original)
+++ trunk/gtk/src/filechooserdialog.ccg	Wed Dec 10 19:45:14 2008
@@ -20,7 +20,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtkfilechooserdialog.h>
+#include <gtk/gtk.h>
 
 
 namespace Gtk

Modified: trunk/gtk/src/filechooserwidget.ccg
==============================================================================
--- trunk/gtk/src/filechooserwidget.ccg	(original)
+++ trunk/gtk/src/filechooserwidget.ccg	Wed Dec 10 19:45:14 2008
@@ -20,7 +20,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtkfilechooserwidget.h>
+#include <gtk/gtk.h>
 
 namespace Gtk
 {

Modified: trunk/gtk/src/filefilter.ccg
==============================================================================
--- trunk/gtk/src/filefilter.ccg	(original)
+++ trunk/gtk/src/filefilter.ccg	Wed Dec 10 19:45:14 2008
@@ -18,8 +18,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtkfilefilter.h>
-#include <gtk/gtktypebuiltins.h> //For gtk_file_filter_flags_get_type().
+#include <gtk/gtk.h> //For gtk_file_filter_flags_get_type().
 
 static gboolean SignalProxy_Custom_gtk_callback(const GtkFileFilterInfo* filter_info, gpointer data)
 {

Modified: trunk/gtk/src/fileselection.ccg
==============================================================================
--- trunk/gtk/src/fileselection.ccg	(original)
+++ trunk/gtk/src/fileselection.ccg	Wed Dec 10 19:45:14 2008
@@ -18,7 +18,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtkfilesel.h>
+#include <gtk/gtk.h>
 #include <gtkmm/entry.h>
 #include <gtkmm/label.h>
 #include <gtkmm/box.h>

Modified: trunk/gtk/src/fixed.ccg
==============================================================================
--- trunk/gtk/src/fixed.ccg	(original)
+++ trunk/gtk/src/fixed.ccg	Wed Dec 10 19:45:14 2008
@@ -20,7 +20,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtkfixed.h>
+#include <gtk/gtk.h>
 
 namespace Gtk
 {

Modified: trunk/gtk/src/fontbutton.ccg
==============================================================================
--- trunk/gtk/src/fontbutton.ccg	(original)
+++ trunk/gtk/src/fontbutton.ccg	Wed Dec 10 19:45:14 2008
@@ -20,7 +20,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtkfontbutton.h>
+#include <gtk/gtk.h>
 
 namespace Gtk
 {

Modified: trunk/gtk/src/fontselection.ccg
==============================================================================
--- trunk/gtk/src/fontselection.ccg	(original)
+++ trunk/gtk/src/fontselection.ccg	Wed Dec 10 19:45:14 2008
@@ -21,5 +21,5 @@
 #include <gtkmm/button.h>
 #include <gtkmm/entry.h>
 #include <gtkmm/radiobutton.h>
-#include <gtk/gtkfontsel.h>
+#include <gtk/gtk.h>
 

Modified: trunk/gtk/src/frame.ccg
==============================================================================
--- trunk/gtk/src/frame.ccg	(original)
+++ trunk/gtk/src/frame.ccg	Wed Dec 10 19:45:14 2008
@@ -18,7 +18,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtkframe.h>
+#include <gtk/gtk.h>
 
 namespace Gtk
 {

Modified: trunk/gtk/src/handlebox.ccg
==============================================================================
--- trunk/gtk/src/handlebox.ccg	(original)
+++ trunk/gtk/src/handlebox.ccg	Wed Dec 10 19:45:14 2008
@@ -20,7 +20,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtkhandlebox.h>
+#include <gtk/gtk.h>
 #include <gdkmm/window.h>
 
 namespace Gtk

Modified: trunk/gtk/src/iconfactory.ccg
==============================================================================
--- trunk/gtk/src/iconfactory.ccg	(original)
+++ trunk/gtk/src/iconfactory.ccg	Wed Dec 10 19:45:14 2008
@@ -21,7 +21,7 @@
  */
 
 #include <gtkmm/settings.h>
-#include <gtk/gtkiconfactory.h>
+#include <gtk/gtk.h>
 
 namespace Gtk
 {

Modified: trunk/gtk/src/iconinfo.ccg
==============================================================================
--- trunk/gtk/src/iconinfo.ccg	(original)
+++ trunk/gtk/src/iconinfo.ccg	Wed Dec 10 19:45:14 2008
@@ -15,7 +15,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtkicontheme.h>
+#include <gtk/gtk.h>
 #include <gtkmm/icontheme.h>
  
 namespace Gtk

Modified: trunk/gtk/src/iconset.ccg
==============================================================================
--- trunk/gtk/src/iconset.ccg	(original)
+++ trunk/gtk/src/iconset.ccg	Wed Dec 10 19:45:14 2008
@@ -22,7 +22,7 @@
 
 #include <gtkmm/widget.h>
 #include <gtkmm/style.h>
-#include <gtk/gtkiconfactory.h>
+#include <gtk/gtk.h>
 
 namespace Gtk
 {

Modified: trunk/gtk/src/iconsource.ccg
==============================================================================
--- trunk/gtk/src/iconsource.ccg	(original)
+++ trunk/gtk/src/iconsource.ccg	Wed Dec 10 19:45:14 2008
@@ -20,4 +20,4 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtkiconfactory.h>
\ No newline at end of file
+#include <gtk/gtk.h>

Modified: trunk/gtk/src/icontheme.ccg
==============================================================================
--- trunk/gtk/src/icontheme.ccg	(original)
+++ trunk/gtk/src/icontheme.ccg	Wed Dec 10 19:45:14 2008
@@ -15,8 +15,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtkicontheme.h>
-#include <gtk/gtktypebuiltins.h> //For gtk_icon_theme_error_get_type().
+#include <gtk/gtk.h> //For gtk_icon_theme_error_get_type().
 
 
 namespace Gtk

Modified: trunk/gtk/src/iconview.ccg
==============================================================================
--- trunk/gtk/src/iconview.ccg	(original)
+++ trunk/gtk/src/iconview.ccg	Wed Dec 10 19:45:14 2008
@@ -19,9 +19,6 @@
  */
 
 #include <gtkmm/adjustment.h> 
-#include <gtk/gtkiconview.h>
-#include <gtk/gtktreemodel.h>
-#include <gtk/gtktreeview.h>
 #include <gtk/gtk.h>
 
 namespace //anonymous namespace

Modified: trunk/gtk/src/image.ccg
==============================================================================
--- trunk/gtk/src/image.ccg	(original)
+++ trunk/gtk/src/image.ccg	Wed Dec 10 19:45:14 2008
@@ -20,7 +20,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtkimage.h>
+#include <gtk/gtk.h>
 #include <gdkmm/image.h>
 #include <gdkmm/bitmap.h>
 #include <gdkmm/pixmap.h>

Modified: trunk/gtk/src/image.hg
==============================================================================
--- trunk/gtk/src/image.hg	(original)
+++ trunk/gtk/src/image.hg	Wed Dec 10 19:45:14 2008
@@ -31,7 +31,7 @@
 namespace Gtk
 {
 
-_CC_INCLUDE(gtk/gtktypebuiltins.h)
+_CC_INCLUDE(gtk/gtk.h)
 _WRAP_ENUM(ImageType, GtkImageType)
 
 

Modified: trunk/gtk/src/imagemenuitem.ccg
==============================================================================
--- trunk/gtk/src/imagemenuitem.ccg	(original)
+++ trunk/gtk/src/imagemenuitem.ccg	Wed Dec 10 19:45:14 2008
@@ -20,7 +20,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtkimagemenuitem.h>
+#include <gtk/gtk.h>
 
 #include <gtkmm/image.h>
 #include <gtkmm/stock.h>

Modified: trunk/gtk/src/inputdialog.ccg
==============================================================================
--- trunk/gtk/src/inputdialog.ccg	(original)
+++ trunk/gtk/src/inputdialog.ccg	Wed Dec 10 19:45:14 2008
@@ -20,7 +20,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtkinputdialog.h>
+#include <gtk/gtk.h>
 #include <gtkmm/button.h>
 #include <gtkmm/optionmenu.h>
 #include <gtkmm/scrolledwindow.h>

Modified: trunk/gtk/src/invisible.ccg
==============================================================================
--- trunk/gtk/src/invisible.ccg	(original)
+++ trunk/gtk/src/invisible.ccg	Wed Dec 10 19:45:14 2008
@@ -20,7 +20,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtkinvisible.h>
+#include <gtk/gtk.h>
 
 namespace Gtk
 {

Modified: trunk/gtk/src/item.ccg
==============================================================================
--- trunk/gtk/src/item.ccg	(original)
+++ trunk/gtk/src/item.ccg	Wed Dec 10 19:45:14 2008
@@ -20,6 +20,6 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtkitem.h>
+#include <gtk/gtk.h>
 
 

Modified: trunk/gtk/src/label.ccg
==============================================================================
--- trunk/gtk/src/label.ccg	(original)
+++ trunk/gtk/src/label.ccg	Wed Dec 10 19:45:14 2008
@@ -18,7 +18,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtklabel.h>
+#include <gtk/gtk.h>
 #include <gtkmm/menu.h>
 
 namespace Gtk

Modified: trunk/gtk/src/label.hg
==============================================================================
--- trunk/gtk/src/label.hg	(original)
+++ trunk/gtk/src/label.hg	Wed Dec 10 19:45:14 2008
@@ -19,7 +19,7 @@
 
 _DEFS(gtkmm,gtk)
 _PINCLUDE(gtkmm/private/misc_p.h)
-_PINCLUDE(gtk/gtkmenu.h)
+_PINCLUDE(gtk/gtk.h)
 
 #include <gtkmm/misc.h>
 #include <pangomm/attrlist.h>

Modified: trunk/gtk/src/layout.ccg
==============================================================================
--- trunk/gtk/src/layout.ccg	(original)
+++ trunk/gtk/src/layout.ccg	Wed Dec 10 19:45:14 2008
@@ -20,7 +20,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtklayout.h>
+#include <gtk/gtk.h>
 
 namespace Gtk
 {

Modified: trunk/gtk/src/linkbutton.ccg
==============================================================================
--- trunk/gtk/src/linkbutton.ccg	(original)
+++ trunk/gtk/src/linkbutton.ccg	Wed Dec 10 19:45:14 2008
@@ -20,7 +20,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtklinkbutton.h>
+#include <gtk/gtk.h>
 
 
 static void SignalProxy_UriHook_gtk_callback(GtkLinkButton *button, const gchar *link, gpointer user_data)

Modified: trunk/gtk/src/liststore.ccg
==============================================================================
--- trunk/gtk/src/liststore.ccg	(original)
+++ trunk/gtk/src/liststore.ccg	Wed Dec 10 19:45:14 2008
@@ -18,7 +18,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtkliststore.h>
+#include <gtk/gtk.h>
 
 
 namespace Gtk

Modified: trunk/gtk/src/main.hg
==============================================================================
--- trunk/gtk/src/main.hg	(original)
+++ trunk/gtk/src/main.hg	Wed Dec 10 19:45:14 2008
@@ -20,7 +20,7 @@
  */
 
 
-#include <gtk/gtkmain.h>
+#include <gtk/gtk.h>
 
 #include <sigc++/sigc++.h>
 #include <gdkmm/types.h>

Modified: trunk/gtk/src/menu.ccg
==============================================================================
--- trunk/gtk/src/menu.ccg	(original)
+++ trunk/gtk/src/menu.ccg	Wed Dec 10 19:45:14 2008
@@ -18,8 +18,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtkdnd.h>
-#include <gtk/gtkmenu.h>
+#include <gtk/gtk.h>
 #include <gtkmm/accelgroup.h>
 
 

Modified: trunk/gtk/src/menubar.ccg
==============================================================================
--- trunk/gtk/src/menubar.ccg	(original)
+++ trunk/gtk/src/menubar.ccg	Wed Dec 10 19:45:14 2008
@@ -18,7 +18,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtkmenubar.h>
+#include <gtk/gtk.h>
 
 namespace Gtk
 {

Modified: trunk/gtk/src/menuitem.ccg
==============================================================================
--- trunk/gtk/src/menuitem.ccg	(original)
+++ trunk/gtk/src/menuitem.ccg	Wed Dec 10 19:45:14 2008
@@ -20,8 +20,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtkmenuitem.h>
-#include <gtk/gtkaccelmap.h>
+#include <gtk/gtk.h>
 #include <gtkmm/label.h>
 #include <gtkmm/misc.h>
 #include <gtkmm/menu.h>

Modified: trunk/gtk/src/menushell.ccg
==============================================================================
--- trunk/gtk/src/menushell.ccg	(original)
+++ trunk/gtk/src/menushell.ccg	Wed Dec 10 19:45:14 2008
@@ -18,8 +18,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtkmenuitem.h>
-#include <gtk/gtkaccellabel.h>
+#include <gtk/gtk.h>
 
 
 namespace Gtk

Modified: trunk/gtk/src/menutoolbutton.ccg
==============================================================================
--- trunk/gtk/src/menutoolbutton.ccg	(original)
+++ trunk/gtk/src/menutoolbutton.ccg	Wed Dec 10 19:45:14 2008
@@ -20,7 +20,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtkmenutoolbutton.h>
+#include <gtk/gtk.h>
 
 namespace Gtk
 {

Modified: trunk/gtk/src/messagedialog.ccg
==============================================================================
--- trunk/gtk/src/messagedialog.ccg	(original)
+++ trunk/gtk/src/messagedialog.ccg	Wed Dec 10 19:45:14 2008
@@ -20,8 +20,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtkmessagedialog.h>
-#include <gtk/gtklabel.h>
+#include <gtk/gtk.h>
 
 
 namespace Gtk

Modified: trunk/gtk/src/messagedialog.hg
==============================================================================
--- trunk/gtk/src/messagedialog.hg	(original)
+++ trunk/gtk/src/messagedialog.hg	Wed Dec 10 19:45:14 2008
@@ -27,7 +27,7 @@
 namespace Gtk
 {
 
-_CC_INCLUDE(gtk/gtktypebuiltins.h)
+_CC_INCLUDE(gtk/gtk.h)
 _WRAP_ENUM(MessageType, GtkMessageType)
 _WRAP_ENUM(ButtonsType, GtkButtonsType)
 

Modified: trunk/gtk/src/misc.ccg
==============================================================================
--- trunk/gtk/src/misc.ccg	(original)
+++ trunk/gtk/src/misc.ccg	Wed Dec 10 19:45:14 2008
@@ -20,7 +20,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtkmisc.h>
+#include <gtk/gtk.h>
 
 namespace Gtk
 {

Modified: trunk/gtk/src/notebook.ccg
==============================================================================
--- trunk/gtk/src/notebook.ccg	(original)
+++ trunk/gtk/src/notebook.ccg	Wed Dec 10 19:45:14 2008
@@ -18,7 +18,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtknotebook.h>
+#include <gtk/gtk.h>
 #include <gtkmm/label.h>
 
 //We use a function instead of a static method, so we can make it static, so it is not exported.

Modified: trunk/gtk/src/notebook.hg
==============================================================================
--- trunk/gtk/src/notebook.hg	(original)
+++ trunk/gtk/src/notebook.hg	Wed Dec 10 19:45:14 2008
@@ -38,7 +38,7 @@
 namespace Gtk
 {
 
-_CC_INCLUDE(gtk/gtktypebuiltins.h)
+_CC_INCLUDE(gtk/gtk.h)
 _WRAP_ENUM(NotebookTab, GtkNotebookTab)
 
 

Modified: trunk/gtk/src/object.ccg
==============================================================================
--- trunk/gtk/src/object.ccg	(original)
+++ trunk/gtk/src/object.ccg	Wed Dec 10 19:45:14 2008
@@ -18,7 +18,7 @@
  */
 
 #include <glibmm/quark.h>
-#include <gtk/gtkobject.h>
+#include <gtk/gtk.h>
 
 
 namespace Gtk

Modified: trunk/gtk/src/optionmenu.ccg
==============================================================================
--- trunk/gtk/src/optionmenu.ccg	(original)
+++ trunk/gtk/src/optionmenu.ccg	Wed Dec 10 19:45:14 2008
@@ -22,7 +22,7 @@
 
 #include <gtkmm/menu.h>
 #include <gtkmm/window.h>
-#include <gtk/gtkoptionmenu.h>
+#include <gtk/gtk.h>
 
 namespace Gtk
 {

Modified: trunk/gtk/src/pagesetup.ccg
==============================================================================
--- trunk/gtk/src/pagesetup.ccg	(original)
+++ trunk/gtk/src/pagesetup.ccg	Wed Dec 10 19:45:14 2008
@@ -15,8 +15,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtkpagesetup.h>
-#include <gtk/gtktypebuiltins.h>
+#include <gtk/gtk.h>
 
 namespace Gtk
 {

Modified: trunk/gtk/src/pagesetupunixdialog.ccg
==============================================================================
--- trunk/gtk/src/pagesetupunixdialog.ccg	(original)
+++ trunk/gtk/src/pagesetupunixdialog.ccg	Wed Dec 10 19:45:14 2008
@@ -16,7 +16,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtkpagesetupunixdialog.h>
+#include <gtk/gtkunixprint.h>
 
 namespace Gtk
 {

Modified: trunk/gtk/src/paned.ccg
==============================================================================
--- trunk/gtk/src/paned.ccg	(original)
+++ trunk/gtk/src/paned.ccg	Wed Dec 10 19:45:14 2008
@@ -20,9 +20,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtkpaned.h>
-#include <gtk/gtkhpaned.h>
-#include <gtk/gtkvpaned.h>
+#include <gtk/gtk.h>
 
 namespace Gtk
 {

Modified: trunk/gtk/src/papersize.ccg
==============================================================================
--- trunk/gtk/src/papersize.ccg	(original)
+++ trunk/gtk/src/papersize.ccg	Wed Dec 10 19:45:14 2008
@@ -15,8 +15,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtkpapersize.h>
-#include <gtk/gtktypebuiltins.h>
+#include <gtk/gtk.h>
 
 namespace Gtk
 {

Modified: trunk/gtk/src/plug.ccg
==============================================================================
--- trunk/gtk/src/plug.ccg	(original)
+++ trunk/gtk/src/plug.ccg	Wed Dec 10 19:45:14 2008
@@ -20,7 +20,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtkplug.h>
+#include <gtk/gtk.h>
 
 namespace Gtk
 {

Modified: trunk/gtk/src/printcontext.ccg
==============================================================================
--- trunk/gtk/src/printcontext.ccg	(original)
+++ trunk/gtk/src/printcontext.ccg	Wed Dec 10 19:45:14 2008
@@ -15,7 +15,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtkprintcontext.h>
+#include <gtk/gtk.h>
 
 namespace Gtk
 {

Modified: trunk/gtk/src/printer.ccg
==============================================================================
--- trunk/gtk/src/printer.ccg	(original)
+++ trunk/gtk/src/printer.ccg	Wed Dec 10 19:45:14 2008
@@ -16,7 +16,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtkprinter.h>
+#include <gtk/gtkunixprint.h>
 
 // This Signal Proxy allows the C++ coder to specify a sigc::slot instead of a static function.
 

Modified: trunk/gtk/src/printjob.ccg
==============================================================================
--- trunk/gtk/src/printjob.ccg	(original)
+++ trunk/gtk/src/printjob.ccg	Wed Dec 10 19:45:14 2008
@@ -16,8 +16,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtkprintjob.h>
-#include <gtk/gtktypebuiltins.h>
+#include <gtk/gtkunixprint.h>
 
 // This Signal Proxy allows the C++ coder to specify a sigc::slot instead of a static function.
 

Modified: trunk/gtk/src/printoperation.ccg
==============================================================================
--- trunk/gtk/src/printoperation.ccg	(original)
+++ trunk/gtk/src/printoperation.ccg	Wed Dec 10 19:45:14 2008
@@ -16,7 +16,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtkprintoperation.h>
+#include <gtk/gtk.h>
 
 // This Signal Proxy allows the C++ coder to specify a sigc::slot instead of a static function.
 

Modified: trunk/gtk/src/printoperation.hg
==============================================================================
--- trunk/gtk/src/printoperation.hg	(original)
+++ trunk/gtk/src/printoperation.hg	Wed Dec 10 19:45:14 2008
@@ -25,7 +25,7 @@
 
 _DEFS(gtkmm,gtk)
 _PINCLUDE(glibmm/private/object_p.h)
-_PINCLUDE(gtk/gtkprintoperation.h)
+_PINCLUDE(gtk/gtk.h)
 
 namespace Gtk
 {

Modified: trunk/gtk/src/printoperationpreview.ccg
==============================================================================
--- trunk/gtk/src/printoperationpreview.ccg	(original)
+++ trunk/gtk/src/printoperationpreview.ccg	Wed Dec 10 19:45:14 2008
@@ -16,4 +16,4 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtkprintoperationpreview.h>
+#include <gtk/gtk.h>

Modified: trunk/gtk/src/printoperationpreview.hg
==============================================================================
--- trunk/gtk/src/printoperationpreview.hg	(original)
+++ trunk/gtk/src/printoperationpreview.hg	Wed Dec 10 19:45:14 2008
@@ -15,7 +15,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtkprintoperationpreview.h>
+#include <gtk/gtk.h>
 
 #include <glibmm/interface.h>
 

Modified: trunk/gtk/src/printsettings.ccg
==============================================================================
--- trunk/gtk/src/printsettings.ccg	(original)
+++ trunk/gtk/src/printsettings.ccg	Wed Dec 10 19:45:14 2008
@@ -15,12 +15,11 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtkprintsettings.h>
-#include <gtk/gtktypebuiltins.h>
+#include <gtk/gtk.h>
 
 #include <vector>
 
-#include <glib/gmem.h>
+#include <glib.h>
 
 namespace // anonymous
 {

Modified: trunk/gtk/src/printunixdialog.ccg
==============================================================================
--- trunk/gtk/src/printunixdialog.ccg	(original)
+++ trunk/gtk/src/printunixdialog.ccg	Wed Dec 10 19:45:14 2008
@@ -16,7 +16,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtkprintunixdialog.h>
+#include <gtk/gtkunixprint.h>
 #include <gtkmm/label.h>
 
 namespace Gtk

Modified: trunk/gtk/src/progress.ccg
==============================================================================
--- trunk/gtk/src/progress.ccg	(original)
+++ trunk/gtk/src/progress.ccg	Wed Dec 10 19:45:14 2008
@@ -21,6 +21,6 @@
  */
 
 #include <gtkmm/adjustment.h>
-#include <gtk/gtkprogress.h>
+#include <gtk/gtk.h>
 
 

Modified: trunk/gtk/src/progressbar.ccg
==============================================================================
--- trunk/gtk/src/progressbar.ccg	(original)
+++ trunk/gtk/src/progressbar.ccg	Wed Dec 10 19:45:14 2008
@@ -21,4 +21,4 @@
  */
 
 #include <gtkmm/adjustment.h>
-#include <gtk/gtkprogressbar.h>
+#include <gtk/gtk.h>

Modified: trunk/gtk/src/progressbar.hg
==============================================================================
--- trunk/gtk/src/progressbar.hg	(original)
+++ trunk/gtk/src/progressbar.hg	Wed Dec 10 19:45:14 2008
@@ -29,7 +29,7 @@
 namespace Gtk
 {
 
-_CC_INCLUDE(gtk/gtktypebuiltins.h)
+_CC_INCLUDE(gtk/gtk.h)
 _WRAP_ENUM(ProgressBarStyle, GtkProgressBarStyle)
 _WRAP_ENUM(ProgressBarOrientation, GtkProgressBarOrientation)
 

Modified: trunk/gtk/src/radioaction.ccg
==============================================================================
--- trunk/gtk/src/radioaction.ccg	(original)
+++ trunk/gtk/src/radioaction.ccg	Wed Dec 10 19:45:14 2008
@@ -18,7 +18,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtkradioaction.h>
+#include <gtk/gtk.h>
 
 
 typedef Gtk::RadioAction::Group Group; //So that the generate get_group return type is parsed.

Modified: trunk/gtk/src/radiobutton.ccg
==============================================================================
--- trunk/gtk/src/radiobutton.ccg	(original)
+++ trunk/gtk/src/radiobutton.ccg	Wed Dec 10 19:45:14 2008
@@ -20,7 +20,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtkradiobutton.h>
+#include <gtk/gtk.h>
 
 typedef Gtk::RadioButton::Group Group; //So that the generate get_group return type is parsed.
 

Modified: trunk/gtk/src/radiomenuitem.ccg
==============================================================================
--- trunk/gtk/src/radiomenuitem.ccg	(original)
+++ trunk/gtk/src/radiomenuitem.ccg	Wed Dec 10 19:45:14 2008
@@ -22,7 +22,7 @@
 
 #include <gtkmm/misc.h>
 #include <gtkmm/label.h>
-#include <gtk/gtkradiomenuitem.h>
+#include <gtk/gtk.h>
 
 typedef Gtk::RadioMenuItem::Group Group; //So that the generate get_group return type is parsed.
 

Modified: trunk/gtk/src/radiotoolbutton.ccg
==============================================================================
--- trunk/gtk/src/radiotoolbutton.ccg	(original)
+++ trunk/gtk/src/radiotoolbutton.ccg	Wed Dec 10 19:45:14 2008
@@ -20,7 +20,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtkradiotoolbutton.h>
+#include <gtk/gtk.h>
 
 typedef Gtk::RadioToolButton::Group Group; //So that the generate get_group return type is parsed.
 

Modified: trunk/gtk/src/range.ccg
==============================================================================
--- trunk/gtk/src/range.ccg	(original)
+++ trunk/gtk/src/range.ccg	Wed Dec 10 19:45:14 2008
@@ -18,7 +18,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtkrange.h>
+#include <gtk/gtk.h>
 #include <gtkmm/adjustment.h>
 
 namespace Gtk

Modified: trunk/gtk/src/rc.ccg
==============================================================================
--- trunk/gtk/src/rc.ccg	(original)
+++ trunk/gtk/src/rc.ccg	Wed Dec 10 19:45:14 2008
@@ -22,7 +22,7 @@
 #include <gtkmm/settings.h>
 #include <gtkmm/widget.h>
 #include <gtkmm/style.h>
-#include <gtk/gtkrc.h>
+#include <gtk/gtk.h>
 
 
 namespace Gtk

Modified: trunk/gtk/src/rc.hg
==============================================================================
--- trunk/gtk/src/rc.hg	(original)
+++ trunk/gtk/src/rc.hg	Wed Dec 10 19:45:14 2008
@@ -52,7 +52,7 @@
 class Settings;
 class Style;
 
-_CC_INCLUDE(gtk/gtktypebuiltins.h)
+_CC_INCLUDE(gtk/gtk.h)
 _WRAP_ENUM(RcFlags, GtkRcFlags)
 
 

Modified: trunk/gtk/src/recentaction.ccg
==============================================================================
--- trunk/gtk/src/recentaction.ccg	(original)
+++ trunk/gtk/src/recentaction.ccg	Wed Dec 10 19:45:14 2008
@@ -18,7 +18,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtkrecentaction.h>
+#include <gtk/gtk.h>
 
 
 namespace Gtk

Modified: trunk/gtk/src/recentchooser.ccg
==============================================================================
--- trunk/gtk/src/recentchooser.ccg	(original)
+++ trunk/gtk/src/recentchooser.ccg	Wed Dec 10 19:45:14 2008
@@ -15,7 +15,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtkrecentchooser.h>
+#include <gtk/gtk.h>
 
 // This Signal Proxy allows the C++ coder to specify a sigc::slot instead of a static function.
 

Modified: trunk/gtk/src/recentchooser.hg
==============================================================================
--- trunk/gtk/src/recentchooser.hg	(original)
+++ trunk/gtk/src/recentchooser.hg	Wed Dec 10 19:45:14 2008
@@ -15,7 +15,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtkrecentchooser.h>
+#include <gtk/gtk.h>
 #include <glibmm/interface.h>
 #include <gtkmm/recentinfo.h>
 #include <gtkmm/recentfilter.h>

Modified: trunk/gtk/src/recentchooserdialog.ccg
==============================================================================
--- trunk/gtk/src/recentchooserdialog.ccg	(original)
+++ trunk/gtk/src/recentchooserdialog.ccg	Wed Dec 10 19:45:14 2008
@@ -15,7 +15,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtkrecentchooserdialog.h>
+#include <gtk/gtk.h>
 
 
 namespace Gtk

Modified: trunk/gtk/src/recentchoosermenu.ccg
==============================================================================
--- trunk/gtk/src/recentchoosermenu.ccg	(original)
+++ trunk/gtk/src/recentchoosermenu.ccg	Wed Dec 10 19:45:14 2008
@@ -15,7 +15,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtkrecentchoosermenu.h>
+#include <gtk/gtk.h>
 
 namespace Gtk
 {

Modified: trunk/gtk/src/recentchooserwidget.ccg
==============================================================================
--- trunk/gtk/src/recentchooserwidget.ccg	(original)
+++ trunk/gtk/src/recentchooserwidget.ccg	Wed Dec 10 19:45:14 2008
@@ -15,7 +15,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtkrecentchooserwidget.h>
+#include <gtk/gtk.h>
 
 namespace Gtk
 {

Modified: trunk/gtk/src/recentfilter.ccg
==============================================================================
--- trunk/gtk/src/recentfilter.ccg	(original)
+++ trunk/gtk/src/recentfilter.ccg	Wed Dec 10 19:45:14 2008
@@ -15,8 +15,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtkrecentfilter.h>
-#include <gtk/gtktypebuiltins.h>
+#include <gtk/gtk.h>
 
 #include <glibmm/ustring.h>
 

Modified: trunk/gtk/src/recentinfo.ccg
==============================================================================
--- trunk/gtk/src/recentinfo.ccg	(original)
+++ trunk/gtk/src/recentinfo.ccg	Wed Dec 10 19:45:14 2008
@@ -15,7 +15,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtkrecentmanager.h>
+#include <gtk/gtk.h>
 
 namespace Gtk
 {

Modified: trunk/gtk/src/recentmanager.ccg
==============================================================================
--- trunk/gtk/src/recentmanager.ccg	(original)
+++ trunk/gtk/src/recentmanager.ccg	Wed Dec 10 19:45:14 2008
@@ -15,8 +15,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtkrecentmanager.h>
-#include <gtk/gtktypebuiltins.h>
+#include <gtk/gtk.h>
 
 namespace Gtk
 {

Modified: trunk/gtk/src/ruler.ccg
==============================================================================
--- trunk/gtk/src/ruler.ccg	(original)
+++ trunk/gtk/src/ruler.ccg	Wed Dec 10 19:45:14 2008
@@ -20,9 +20,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtkruler.h>
-#include <gtk/gtkhruler.h>
-#include <gtk/gtkvruler.h>
+#include <gtk/gtk.h>
 #include <cstring>
 
 using std::strcmp;

Modified: trunk/gtk/src/scale.ccg
==============================================================================
--- trunk/gtk/src/scale.ccg	(original)
+++ trunk/gtk/src/scale.ccg	Wed Dec 10 19:45:14 2008
@@ -22,9 +22,7 @@
 
 #include <gtkmm/adjustment.h>
 
-#include <gtk/gtkscale.h>
-#include <gtk/gtkhscale.h>
-#include <gtk/gtkvscale.h>
+#include <gtk/gtk.h>
 #include <math.h>
 #include <cstring> //For strlen()
 #include <memory>

Modified: trunk/gtk/src/scalebutton.ccg
==============================================================================
--- trunk/gtk/src/scalebutton.ccg	(original)
+++ trunk/gtk/src/scalebutton.ccg	Wed Dec 10 19:45:14 2008
@@ -20,7 +20,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtkscalebutton.h>
+#include <gtk/gtk.h>
 
 namespace Gtk
 {

Modified: trunk/gtk/src/scrollbar.ccg
==============================================================================
--- trunk/gtk/src/scrollbar.ccg	(original)
+++ trunk/gtk/src/scrollbar.ccg	Wed Dec 10 19:45:14 2008
@@ -22,9 +22,7 @@
 
 #include <gtkmm/adjustment.h>
 
-#include <gtk/gtkscrollbar.h>
-#include <gtk/gtkhscrollbar.h>
-#include <gtk/gtkvscrollbar.h>
+#include <gtk/gtk.h>
 
 namespace Gtk
 {

Modified: trunk/gtk/src/scrolledwindow.ccg
==============================================================================
--- trunk/gtk/src/scrolledwindow.ccg	(original)
+++ trunk/gtk/src/scrolledwindow.ccg	Wed Dec 10 19:45:14 2008
@@ -23,7 +23,7 @@
 #include <gtkmm/scrollbar.h>
 #include <gtkmm/viewport.h>
 #include <gtkmm/adjustment.h>
-#include <gtk/gtkscrolledwindow.h>
+#include <gtk/gtk.h>
 
 
 namespace Gtk

Modified: trunk/gtk/src/selectiondata.ccg
==============================================================================
--- trunk/gtk/src/selectiondata.ccg	(original)
+++ trunk/gtk/src/selectiondata.ccg	Wed Dec 10 19:45:14 2008
@@ -21,7 +21,7 @@
 #include <gtkmm/textbuffer.h>
 #include <gdkmm/pixbuf.h>
 #include <glibmm/utility.h> //For ScopedPtr<>.
-#include <gtk/gtkselection.h>
+#include <gtk/gtk.h>
 
 
 

Modified: trunk/gtk/src/separator.ccg
==============================================================================
--- trunk/gtk/src/separator.ccg	(original)
+++ trunk/gtk/src/separator.ccg	Wed Dec 10 19:45:14 2008
@@ -20,6 +20,4 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtkseparator.h>
-#include <gtk/gtkhseparator.h>
-#include <gtk/gtkvseparator.h>
+#include <gtk/gtk.h>

Modified: trunk/gtk/src/separatormenuitem.ccg
==============================================================================
--- trunk/gtk/src/separatormenuitem.ccg	(original)
+++ trunk/gtk/src/separatormenuitem.ccg	Wed Dec 10 19:45:14 2008
@@ -20,4 +20,4 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtkseparatormenuitem.h>
+#include <gtk/gtk.h>

Modified: trunk/gtk/src/separatortoolitem.ccg
==============================================================================
--- trunk/gtk/src/separatortoolitem.ccg	(original)
+++ trunk/gtk/src/separatortoolitem.ccg	Wed Dec 10 19:45:14 2008
@@ -20,7 +20,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtkseparatortoolitem.h>
+#include <gtk/gtk.h>
 
 namespace Gtk
 {

Modified: trunk/gtk/src/settings.ccg
==============================================================================
--- trunk/gtk/src/settings.ccg	(original)
+++ trunk/gtk/src/settings.ccg	Wed Dec 10 19:45:14 2008
@@ -20,7 +20,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtksettings.h>
+#include <gtk/gtk.h>
 
 namespace Gtk
 {

Modified: trunk/gtk/src/sizegroup.ccg
==============================================================================
--- trunk/gtk/src/sizegroup.ccg	(original)
+++ trunk/gtk/src/sizegroup.ccg	Wed Dec 10 19:45:14 2008
@@ -20,7 +20,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtksizegroup.h>
+#include <gtk/gtk.h>
 
 namespace Gtk
 {

Modified: trunk/gtk/src/sizegroup.hg
==============================================================================
--- trunk/gtk/src/sizegroup.hg	(original)
+++ trunk/gtk/src/sizegroup.hg	Wed Dec 10 19:45:14 2008
@@ -28,7 +28,7 @@
 namespace Gtk
 {
 
-_CC_INCLUDE(gtk/gtktypebuiltins.h)
+_CC_INCLUDE(gtk/gtk.h)
 _WRAP_ENUM(SizeGroupMode, GtkSizeGroupMode)
 
 /** Gtk::SizeGroup provides a mechanism for grouping a number of widgets together so they all request the same amount of space. 

Modified: trunk/gtk/src/socket.ccg
==============================================================================
--- trunk/gtk/src/socket.ccg	(original)
+++ trunk/gtk/src/socket.ccg	Wed Dec 10 19:45:14 2008
@@ -18,5 +18,5 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtksocket.h>
+#include <gtk/gtk.h>
 

Modified: trunk/gtk/src/spinbutton.ccg
==============================================================================
--- trunk/gtk/src/spinbutton.ccg	(original)
+++ trunk/gtk/src/spinbutton.ccg	Wed Dec 10 19:45:14 2008
@@ -19,7 +19,7 @@
  */
 
 #include <gtkmm/adjustment.h>
-#include <gtk/gtkspinbutton.h>
+#include <gtk/gtk.h>
 
 namespace Gtk
 {

Modified: trunk/gtk/src/spinbutton.hg
==============================================================================
--- trunk/gtk/src/spinbutton.hg	(original)
+++ trunk/gtk/src/spinbutton.hg	Wed Dec 10 19:45:14 2008
@@ -27,7 +27,7 @@
 namespace Gtk
 {
 
-_CC_INCLUDE(gtk/gtktypebuiltins.h)
+_CC_INCLUDE(gtk/gtk.h)
 _WRAP_ENUM(SpinButtonUpdatePolicy, GtkSpinButtonUpdatePolicy)
 _WRAP_ENUM(SpinType, GtkSpinType)
 

Modified: trunk/gtk/src/statusbar.ccg
==============================================================================
--- trunk/gtk/src/statusbar.ccg	(original)
+++ trunk/gtk/src/statusbar.ccg	Wed Dec 10 19:45:14 2008
@@ -20,7 +20,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtkstatusbar.h>
+#include <gtk/gtk.h>
 
 namespace Gtk
 {

Modified: trunk/gtk/src/statusicon.ccg
==============================================================================
--- trunk/gtk/src/statusicon.ccg	(original)
+++ trunk/gtk/src/statusicon.ccg	Wed Dec 10 19:45:14 2008
@@ -18,7 +18,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtkstatusicon.h>
+#include <gtk/gtk.h>
 
 
 namespace Gtk

Modified: trunk/gtk/src/stockitem.ccg
==============================================================================
--- trunk/gtk/src/stockitem.ccg	(original)
+++ trunk/gtk/src/stockitem.ccg	Wed Dec 10 19:45:14 2008
@@ -18,7 +18,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtkstock.h>
+#include <gtk/gtk.h>
  
 namespace Gtk
 {

Modified: trunk/gtk/src/style.ccg
==============================================================================
--- trunk/gtk/src/style.ccg	(original)
+++ trunk/gtk/src/style.ccg	Wed Dec 10 19:45:14 2008
@@ -20,7 +20,7 @@
 
 #include <gtkmm/widget.h>
 #include <gtkmm/rc.h>
-#include <gtk/gtkstyle.h>
+#include <gtk/gtk.h>
 
 
 namespace Gtk

Modified: trunk/gtk/src/style.hg
==============================================================================
--- trunk/gtk/src/style.hg	(original)
+++ trunk/gtk/src/style.hg	Wed Dec 10 19:45:14 2008
@@ -23,7 +23,7 @@
 
 _DEFS(gtkmm,gtk)
 _PINCLUDE(glibmm/private/object_p.h)
-_PINCLUDE(gtk/gtkrc.h)
+_PINCLUDE(gtk/gtk.h)
 #m4begin
 
 m4_define(`_STYLE_MEMBER_COLOR',`dnl

Modified: trunk/gtk/src/table.ccg
==============================================================================
--- trunk/gtk/src/table.ccg	(original)
+++ trunk/gtk/src/table.ccg	Wed Dec 10 19:45:14 2008
@@ -20,7 +20,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtktable.h>
+#include <gtk/gtk.h>
 
 namespace Gtk
 {

Modified: trunk/gtk/src/table.hg
==============================================================================
--- trunk/gtk/src/table.hg	(original)
+++ trunk/gtk/src/table.hg	Wed Dec 10 19:45:14 2008
@@ -20,7 +20,7 @@
 #include <glibmm/helperlist.h>
 #include <gtkmm/container.h>
 #include <gtkmm/enums.h>
-#include <gtk/gtktable.h> /* for GtkTableChild */
+#include <gtk/gtk.h> /* for GtkTableChild */
 
 _DEFS(gtkmm,gtk)
 _PINCLUDE(gtkmm/private/container_p.h)

Modified: trunk/gtk/src/targetlist.hg
==============================================================================
--- trunk/gtk/src/targetlist.hg	(original)
+++ trunk/gtk/src/targetlist.hg	Wed Dec 10 19:45:14 2008
@@ -21,7 +21,7 @@
 #include <gtkmm/targetentry.h>
 #include <gdkmm/types.h>
 
-_CC_INCLUDE(gtk/gtkselection.h)
+_CC_INCLUDE(gtk/gtk.h)
   
 namespace Gtk
 {

Modified: trunk/gtk/src/tearoffmenuitem.ccg
==============================================================================
--- trunk/gtk/src/tearoffmenuitem.ccg	(original)
+++ trunk/gtk/src/tearoffmenuitem.ccg	Wed Dec 10 19:45:14 2008
@@ -20,7 +20,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtktearoffmenuitem.h>
+#include <gtk/gtk.h>
 
 namespace Gtk
 {
@@ -30,4 +30,4 @@
   return gobj()->torn_off;
 }
 
-} /* namespace Gtk */
\ No newline at end of file
+} /* namespace Gtk */

Modified: trunk/gtk/src/textattributes.ccg
==============================================================================
--- trunk/gtk/src/textattributes.ccg	(original)
+++ trunk/gtk/src/textattributes.ccg	Wed Dec 10 19:45:14 2008
@@ -20,5 +20,5 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtktexttag.h>
+#include <gtk/gtk.h>
 

Modified: trunk/gtk/src/textbuffer.ccg
==============================================================================
--- trunk/gtk/src/textbuffer.ccg	(original)
+++ trunk/gtk/src/textbuffer.ccg	Wed Dec 10 19:45:14 2008
@@ -18,9 +18,8 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtktextbuffer.h>
-#include <gtk/gtktextbufferrichtext.h>
-#include <glib/gslist.h>
+#include <gtk/gtk.h>
+#include <glib.h>
 #include <gtkmm/textmark.h>
 #include <gtkmm/textiter.h>
 

Modified: trunk/gtk/src/textchildanchor.ccg
==============================================================================
--- trunk/gtk/src/textchildanchor.ccg	(original)
+++ trunk/gtk/src/textchildanchor.ccg	Wed Dec 10 19:45:14 2008
@@ -20,4 +20,4 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtktextchild.h>
\ No newline at end of file
+#include <gtk/gtk.h>

Modified: trunk/gtk/src/textiter.hg
==============================================================================
--- trunk/gtk/src/textiter.hg	(original)
+++ trunk/gtk/src/textiter.hg	Wed Dec 10 19:45:14 2008
@@ -23,7 +23,7 @@
 #include <gtkmm/texttag.h>
 #include <gtkmm/textchildanchor.h>
 #include <gtkmm/textattributes.h>
-#include <gtk/gtktextiter.h> /* we need the definition of GtkTextIter */
+#include <gtk/gtk.h> /* we need the definition of GtkTextIter */
 
 
 _DEFS(gtkmm,gtk)
@@ -31,7 +31,7 @@
 namespace Gtk
 {
 
-_CC_INCLUDE(gtk/gtktypebuiltins.h)
+_CC_INCLUDE(gtk/gtk.h)
 _WRAP_ENUM(TextSearchFlags, GtkTextSearchFlags)
 
 class TextBuffer;

Modified: trunk/gtk/src/textmark.ccg
==============================================================================
--- trunk/gtk/src/textmark.ccg	(original)
+++ trunk/gtk/src/textmark.ccg	Wed Dec 10 19:45:14 2008
@@ -23,7 +23,7 @@
 
 #include <gtkmm/textmark.h>
 #include <gtkmm/textbuffer.h>
-#include <gtk/gtktextmark.h>
+#include <gtk/gtk.h>
 
 
 namespace Gtk

Modified: trunk/gtk/src/texttag.ccg
==============================================================================
--- trunk/gtk/src/texttag.ccg	(original)
+++ trunk/gtk/src/texttag.ccg	Wed Dec 10 19:45:14 2008
@@ -22,4 +22,4 @@
 
 #include <gtkmm/textbuffer.h>
 #include <gtkmm/textiter.h>
-#include <gtk/gtktexttag.h>
\ No newline at end of file
+#include <gtk/gtk.h>

Modified: trunk/gtk/src/texttag.hg
==============================================================================
--- trunk/gtk/src/texttag.hg	(original)
+++ trunk/gtk/src/texttag.hg	Wed Dec 10 19:45:14 2008
@@ -29,7 +29,7 @@
 
 _DEFS(gtkmm,gtk)
 _PINCLUDE(glibmm/private/object_p.h)
-_PINCLUDE(gtk/gtktexttag.h)
+_PINCLUDE(gtk/gtk.h)
 
 namespace Gtk
 {

Modified: trunk/gtk/src/texttagtable.ccg
==============================================================================
--- trunk/gtk/src/texttagtable.ccg	(original)
+++ trunk/gtk/src/texttagtable.ccg	Wed Dec 10 19:45:14 2008
@@ -21,8 +21,7 @@
  */
 
 #include <gtkmm/texttag.h>
-#include <gtk/gtktexttag.h>
-#include <gtk/gtktexttagtable.h>
+#include <gtk/gtk.h>
 
 
 static void SignalProxy_ForEach_gtk_callback(GtkTextTag* texttag, gpointer data)

Modified: trunk/gtk/src/textview.ccg
==============================================================================
--- trunk/gtk/src/textview.ccg	(original)
+++ trunk/gtk/src/textview.ccg	Wed Dec 10 19:45:14 2008
@@ -18,7 +18,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtktextview.h>
+#include <gtk/gtk.h>
 
 namespace Gtk
 {

Modified: trunk/gtk/src/textview.hg
==============================================================================
--- trunk/gtk/src/textview.hg	(original)
+++ trunk/gtk/src/textview.hg	Wed Dec 10 19:45:14 2008
@@ -34,7 +34,7 @@
 namespace Gtk
 {
 
-_CC_INCLUDE(gtk/gtktypebuiltins.h)
+_CC_INCLUDE(gtk/gtk.h)
 _WRAP_ENUM(TextWindowType, GtkTextWindowType)
 
 

Modified: trunk/gtk/src/toggleaction.ccg
==============================================================================
--- trunk/gtk/src/toggleaction.ccg	(original)
+++ trunk/gtk/src/toggleaction.ccg	Wed Dec 10 19:45:14 2008
@@ -18,7 +18,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtktoggleaction.h>
+#include <gtk/gtk.h>
 
 
 namespace Gtk

Modified: trunk/gtk/src/togglebutton.ccg
==============================================================================
--- trunk/gtk/src/togglebutton.ccg	(original)
+++ trunk/gtk/src/togglebutton.ccg	Wed Dec 10 19:45:14 2008
@@ -20,7 +20,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtktogglebutton.h>
+#include <gtk/gtk.h>
 
 namespace Gtk
 {

Modified: trunk/gtk/src/toggletoolbutton.ccg
==============================================================================
--- trunk/gtk/src/toggletoolbutton.ccg	(original)
+++ trunk/gtk/src/toggletoolbutton.ccg	Wed Dec 10 19:45:14 2008
@@ -20,7 +20,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtktoggletoolbutton.h>
+#include <gtk/gtk.h>
 
 namespace Gtk
 {

Modified: trunk/gtk/src/toolbar.ccg
==============================================================================
--- trunk/gtk/src/toolbar.ccg	(original)
+++ trunk/gtk/src/toolbar.ccg	Wed Dec 10 19:45:14 2008
@@ -27,8 +27,7 @@
 #include <gtkmm/tooltips.h>
 //#include <gtkmm/image.h>
 #include <gtkmm/label.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtktoolbar.h>
+#include <gtk/gtk.h>
 
 namespace Gtk
 {

Modified: trunk/gtk/src/toolbutton.ccg
==============================================================================
--- trunk/gtk/src/toolbutton.ccg	(original)
+++ trunk/gtk/src/toolbutton.ccg	Wed Dec 10 19:45:14 2008
@@ -20,7 +20,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtktoolbutton.h>
+#include <gtk/gtk.h>
 
 namespace Gtk
 {

Modified: trunk/gtk/src/toolitem.ccg
==============================================================================
--- trunk/gtk/src/toolitem.ccg	(original)
+++ trunk/gtk/src/toolitem.ccg	Wed Dec 10 19:45:14 2008
@@ -20,7 +20,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtktoolitem.h>
+#include <gtk/gtk.h>
 
 namespace Gtk
 {

Modified: trunk/gtk/src/toolshell.ccg
==============================================================================
--- trunk/gtk/src/toolshell.ccg	(original)
+++ trunk/gtk/src/toolshell.ccg	Wed Dec 10 19:45:14 2008
@@ -18,5 +18,5 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtkeditable.h>
+#include <gtk/gtk.h>
 

Modified: trunk/gtk/src/tooltip.ccg
==============================================================================
--- trunk/gtk/src/tooltip.ccg	(original)
+++ trunk/gtk/src/tooltip.ccg	Wed Dec 10 19:45:14 2008
@@ -17,7 +17,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtktooltip.h>
+#include <gtk/gtk.h>
 
 namespace Gtk
 {

Modified: trunk/gtk/src/tooltips.ccg
==============================================================================
--- trunk/gtk/src/tooltips.ccg	(original)
+++ trunk/gtk/src/tooltips.ccg	Wed Dec 10 19:45:14 2008
@@ -18,8 +18,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtkwidget.h>
-#include <gtk/gtktooltips.h>
+#include <gtk/gtk.h>
 #include <gdkmm/color.h>
 #include <gtkmm/widget.h>
 

Modified: trunk/gtk/src/treedragdest.ccg
==============================================================================
--- trunk/gtk/src/treedragdest.ccg	(original)
+++ trunk/gtk/src/treedragdest.ccg	Wed Dec 10 19:45:14 2008
@@ -20,5 +20,5 @@
 
 #include <gtkmm/treepath.h>
 #include <gtkmm/selectiondata_private.h>
-#include <gtk/gtktreednd.h>
+#include <gtk/gtk.h>
 

Modified: trunk/gtk/src/treedragsource.ccg
==============================================================================
--- trunk/gtk/src/treedragsource.ccg	(original)
+++ trunk/gtk/src/treedragsource.ccg	Wed Dec 10 19:45:14 2008
@@ -20,7 +20,7 @@
 
 #include <gtkmm/treepath.h>
 #include <gtkmm/selectiondata_private.h> //For SelectionData_WithoutOwnership
-#include <gtk/gtktreednd.h>
+#include <gtk/gtk.h>
 
 
 namespace Gtk

Modified: trunk/gtk/src/treeiter.hg
==============================================================================
--- trunk/gtk/src/treeiter.hg	(original)
+++ trunk/gtk/src/treeiter.hg	Wed Dec 10 19:45:14 2008
@@ -22,7 +22,7 @@
 #include <gtkmm/treemodelcolumn.h>
 #include <gtkmmconfig.h>
 #include <iterator>
-#include <gtk/gtktreemodel.h> /* for GtkTreeIter */
+#include <gtk/gtk.h> /* for GtkTreeIter */
 
 GLIBMM_USING_STD(forward_iterator_tag)
 

Modified: trunk/gtk/src/treemodel.ccg
==============================================================================
--- trunk/gtk/src/treemodel.ccg	(original)
+++ trunk/gtk/src/treemodel.ccg	Wed Dec 10 19:45:14 2008
@@ -20,8 +20,7 @@
 
 #include <gtkmm/treeiter.h>
 #include <gtkmm/treepath.h>
-#include <gtk/gtktreestore.h>
-#include <gtk/gtktreemodel.h>
+#include <gtk/gtk.h>
 
 namespace
 {

Modified: trunk/gtk/src/treemodel.hg
==============================================================================
--- trunk/gtk/src/treemodel.hg	(original)
+++ trunk/gtk/src/treemodel.hg	Wed Dec 10 19:45:14 2008
@@ -17,7 +17,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtktreemodel.h>
+#include <gtk/gtk.h>
 #include <glibmm/interface.h>
 #include <gtkmm/treeiter.h>
 #include <gtkmm/treemodelcolumn.h>
@@ -32,7 +32,7 @@
 class TreePath;
 class TreeRowReference;
 
-_CC_INCLUDE(gtk/gtktypebuiltins.h)
+_CC_INCLUDE(gtk/gtk.h)
 _WRAP_ENUM(TreeModelFlags, GtkTreeModelFlags)
 
 //TODO: Remove any mention of null arguments from the method documentation, by adding overrides in gtk_docs_override.xml.

Modified: trunk/gtk/src/treemodelfilter.ccg
==============================================================================
--- trunk/gtk/src/treemodelfilter.ccg	(original)
+++ trunk/gtk/src/treemodelfilter.ccg	Wed Dec 10 19:45:14 2008
@@ -18,7 +18,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtktreemodelfilter.h>
+#include <gtk/gtk.h>
 
 
 static gboolean SignalProxy_Visible_gtk_callback(GtkTreeModel* model, GtkTreeIter* iter, gpointer data)

Modified: trunk/gtk/src/treemodelsort.ccg
==============================================================================
--- trunk/gtk/src/treemodelsort.ccg	(original)
+++ trunk/gtk/src/treemodelsort.ccg	Wed Dec 10 19:45:14 2008
@@ -18,7 +18,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtktreemodelsort.h>
+#include <gtk/gtk.h>
 
 
 typedef Gtk::TreeModel::Path Path; //So that the generated method implemenations can use this a return type.

Modified: trunk/gtk/src/treepath.ccg
==============================================================================
--- trunk/gtk/src/treepath.ccg	(original)
+++ trunk/gtk/src/treepath.ccg	Wed Dec 10 19:45:14 2008
@@ -20,8 +20,7 @@
 
 #include <gtkmm/treemodel.h>
 #include <glibmm/utility.h>
-#include <gtk/gtktreemodel.h>
-#include <gtk/gtktreednd.h>
+#include <gtk/gtk.h>
 
 
 namespace Gtk

Modified: trunk/gtk/src/treerowreference.ccg
==============================================================================
--- trunk/gtk/src/treerowreference.ccg	(original)
+++ trunk/gtk/src/treerowreference.ccg	Wed Dec 10 19:45:14 2008
@@ -18,7 +18,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtktreemodel.h>
+#include <gtk/gtk.h>
 
 
 namespace Gtk

Modified: trunk/gtk/src/treeselection.ccg
==============================================================================
--- trunk/gtk/src/treeselection.ccg	(original)
+++ trunk/gtk/src/treeselection.ccg	Wed Dec 10 19:45:14 2008
@@ -19,7 +19,7 @@
  */
 
 #include <gtkmm/treeview.h>
-#include <gtk/gtktreeselection.h>
+#include <gtk/gtk.h>
 
 
 static void proxy_foreach_selection_iter_callback(GtkTreeModel* model, GtkTreePath*, GtkTreeIter* iter, void* data)

Modified: trunk/gtk/src/treesortable.hg
==============================================================================
--- trunk/gtk/src/treesortable.hg	(original)
+++ trunk/gtk/src/treesortable.hg	Wed Dec 10 19:45:14 2008
@@ -27,7 +27,7 @@
 #include <gtkmm/treemodelcolumn.h>
 #include <gtkmm/treemodel.h>
 #include <gtkmm/treeiter.h>
-#include <gtk/gtktreesortable.h>
+#include <gtk/gtk.h>
 
 _DEFS(gtkmm,gtk)
 _PINCLUDE(glibmm/private/interface_p.h)

Modified: trunk/gtk/src/treestore.ccg
==============================================================================
--- trunk/gtk/src/treestore.ccg	(original)
+++ trunk/gtk/src/treestore.ccg	Wed Dec 10 19:45:14 2008
@@ -18,7 +18,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtktreestore.h>
+#include <gtk/gtk.h>
 
 
 namespace Gtk

Modified: trunk/gtk/src/treeview.ccg
==============================================================================
--- trunk/gtk/src/treeview.ccg	(original)
+++ trunk/gtk/src/treeview.ccg	Wed Dec 10 19:45:14 2008
@@ -23,7 +23,7 @@
 #include <gtkmm/treemodel.h>
 #include <gtkmm/treemodelfilter.h>
 #include <gtkmm/entry.h>
-#include <gtk/gtktreeview.h>
+#include <gtk/gtk.h>
 
 namespace
 {

Modified: trunk/gtk/src/treeview.hg
==============================================================================
--- trunk/gtk/src/treeview.hg	(original)
+++ trunk/gtk/src/treeview.hg	Wed Dec 10 19:45:14 2008
@@ -43,7 +43,7 @@
 namespace Gtk
 {
 
-_CC_INCLUDE(gtk/gtktypebuiltins.h)
+_CC_INCLUDE(gtk/gtk.h)
 _WRAP_ENUM(TreeViewDropPosition, GtkTreeViewDropPosition)
 _WRAP_ENUM(TreeViewGridLines, GtkTreeViewGridLines)
 

Modified: trunk/gtk/src/treeviewcolumn.ccg
==============================================================================
--- trunk/gtk/src/treeviewcolumn.ccg	(original)
+++ trunk/gtk/src/treeviewcolumn.ccg	Wed Dec 10 19:45:14 2008
@@ -18,7 +18,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtktreeviewcolumn.h>
+#include <gtk/gtk.h>
 #include <gtkmm/treeview_private.h>
 
 namespace Gtk

Modified: trunk/gtk/src/treeviewcolumn.hg
==============================================================================
--- trunk/gtk/src/treeviewcolumn.hg	(original)
+++ trunk/gtk/src/treeviewcolumn.hg	Wed Dec 10 19:45:14 2008
@@ -35,7 +35,7 @@
 namespace Gtk
 {
 
-_CC_INCLUDE(gtk/gtktypebuiltins.h)
+_CC_INCLUDE(gtk/gtk.h)
 _WRAP_ENUM(TreeViewColumnSizing, GtkTreeViewColumnSizing)
 
 

Modified: trunk/gtk/src/uimanager.ccg
==============================================================================
--- trunk/gtk/src/uimanager.ccg	(original)
+++ trunk/gtk/src/uimanager.ccg	Wed Dec 10 19:45:14 2008
@@ -18,7 +18,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtkuimanager.h>
+#include <gtk/gtk.h>
 
 
 namespace Gtk

Modified: trunk/gtk/src/viewport.ccg
==============================================================================
--- trunk/gtk/src/viewport.ccg	(original)
+++ trunk/gtk/src/viewport.ccg	Wed Dec 10 19:45:14 2008
@@ -22,4 +22,4 @@
 
 #include <gtkmm/viewport.h>
 #include <gtkmm/adjustment.h>
-#include <gtk/gtkviewport.h>
+#include <gtk/gtk.h>

Modified: trunk/gtk/src/volumebutton.ccg
==============================================================================
--- trunk/gtk/src/volumebutton.ccg	(original)
+++ trunk/gtk/src/volumebutton.ccg	Wed Dec 10 19:45:14 2008
@@ -20,7 +20,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtkvolumebutton.h>
+#include <gtk/gtk.h>
 
 namespace Gtk
 {

Modified: trunk/gtk/src/widget.ccg
==============================================================================
--- trunk/gtk/src/widget.ccg	(original)
+++ trunk/gtk/src/widget.ccg	Wed Dec 10 19:45:14 2008
@@ -27,14 +27,7 @@
 #include <gtkmm/selectiondata_private.h>
 #include <gtkmm/action.h>
 #include <gtkmm/tooltip.h>
-#include <gtk/gtkdnd.h>
-#include <gtk/gtkselection.h>
-#include <gtk/gtkwidget.h>
-#include <gtk/gtkcontainer.h>
-#include <gtk/gtkmenu.h>
-#include <gtk/gtkmenuitem.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtkaction.h> //For gtk_widget_get_action().
+#include <gtk/gtk.h> //For gtk_widget_get_action().
 
 
 namespace //anonymous

Modified: trunk/gtk/src/widget.hg
==============================================================================
--- trunk/gtk/src/widget.hg	(original)
+++ trunk/gtk/src/widget.hg	Wed Dec 10 19:45:14 2008
@@ -56,7 +56,7 @@
 namespace Gtk
 {
 
-_CC_INCLUDE(gtk/gtktypebuiltins.h)
+_CC_INCLUDE(gtk/gtk.h)
 _WRAP_ENUM(DestDefaults, GtkDestDefaults)
 _WRAP_ENUM(WidgetFlags, GtkWidgetFlags)
 _WRAP_ENUM(WidgetHelpType, GtkWidgetHelpType)

Modified: trunk/gtk/src/window.ccg
==============================================================================
--- trunk/gtk/src/window.ccg	(original)
+++ trunk/gtk/src/window.ccg	Wed Dec 10 19:45:14 2008
@@ -22,7 +22,7 @@
 
 #include <gtkmm/accelgroup.h>
 #include <gdkmm/cursor.h>
-#include <gtk/gtkwindow.h>
+#include <gtk/gtk.h>
 
 
 namespace Gtk

Modified: trunk/tests/refcount_dialog/main.cc
==============================================================================
--- trunk/tests/refcount_dialog/main.cc	(original)
+++ trunk/tests/refcount_dialog/main.cc	Wed Dec 10 19:45:14 2008
@@ -1,5 +1,5 @@
 #include <gtkmm.h>
-#include <gtk/gtkdialog.h>
+#include <gtk/gtk.h>
 #include <iostream>
 #include <list>
 

Modified: trunk/tools/extra_defs_gen/generate_defs_gtk.cc
==============================================================================
--- trunk/tools/extra_defs_gen/generate_defs_gtk.cc	(original)
+++ trunk/tools/extra_defs_gen/generate_defs_gtk.cc	Wed Dec 10 19:45:14 2008
@@ -24,10 +24,7 @@
 #include <gtk/gtk.h>
 
 #if !defined(G_OS_WIN32)
-#include <gtk/gtkprinter.h>
-#include <gtk/gtkprintjob.h>
-#include <gtk/gtkpagesetupunixdialog.h>
-#include <gtk/gtkprintunixdialog.h>
+#include <gtk/gtkunixprint.h>
 #endif /* G_OS_WIN32 */
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]