[gtkmm] Avoid includes of gtk/gtk.h.

[Murray Cumming <murrayc src gnome org>]

commit 6917be6086e40e42d392625e68e09421a9818ead
Author: Murray Cumming <murrayc murrayc com>
Date:   Tue Nov 2 10:53:29 2010 +0100

    Avoid includes of gtk/gtk.h.
    
    * gtk/src/activatable.hg:
    * gtk/src/buildable.hg:
    * gtk/src/editable.hg:
    * gtk/src/orientable.hg:
    * gtk/src/printoperationpreview.hg:
    * gtk/src/recentchooser.hg:
    * gtk/src/scrollable.hg:
    * gtk/src/toolshell.hg:
    * gtk/src/treesortable.hg: Add a typedef for the C interface structs instead
    of including gtk/gtk.h.

 ChangeLog                        |   15 +++++++++++++++
 gtk/src/activatable.hg           |    7 ++++++-
 gtk/src/buildable.hg             |    7 +++++++
 gtk/src/editable.hg              |    8 ++++++--
 gtk/src/orientable.hg            |    7 ++++++-
 gtk/src/printoperationpreview.hg |    9 +++++++--
 gtk/src/recentchooser.hg         |    8 +++++++-
 gtk/src/scrollable.hg            |    7 ++++++-
 gtk/src/toolshell.hg             |    7 ++++++-
 gtk/src/treesortable.hg          |    8 +++++++-
 10 files changed, 73 insertions(+), 10 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 0b53574..d6f9a3b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,20 @@
 2010-11-02  Murray Cumming  <murrayc murrayc com>
 
+	Avoid includes of gtk/gtk.h.
+
+	* gtk/src/activatable.hg:
+	* gtk/src/buildable.hg:
+	* gtk/src/editable.hg:
+	* gtk/src/orientable.hg:
+	* gtk/src/printoperationpreview.hg:
+	* gtk/src/recentchooser.hg:
+	* gtk/src/scrollable.hg:
+	* gtk/src/toolshell.hg:
+	* gtk/src/treesortable.hg: Add a typedef for the C interface structs instead
+	of including gtk/gtk.h.
+
+2010-11-02  Murray Cumming  <murrayc murrayc com>
+
 	Fix the build.
 
 	* gdk/src/dragcontext.hg: Include cairomm/surface.h.
diff --git a/gtk/src/activatable.hg b/gtk/src/activatable.hg
index 080dbe9..8151546 100644
--- a/gtk/src/activatable.hg
+++ b/gtk/src/activatable.hg
@@ -19,10 +19,15 @@
 
 #include <gtkmm/action.h>
 #include <glibmm/interface.h>
-#include <gtk/gtk.h>
 _DEFS(gtkmm,gtk)
 _PINCLUDE(glibmm/private/interface_p.h)
 
+#ifndef DOXYGEN_SHOULD_SKIP_THIS
+extern "C"
+{
+typedef struct _GtkActivatableIface GtkActivatableIface;
+}
+#endif /* DOXYGEN_SHOULD_SKIP_THIS */
 
 namespace Gtk
 {
diff --git a/gtk/src/buildable.hg b/gtk/src/buildable.hg
index 628bdf1..76f9c1a 100644
--- a/gtk/src/buildable.hg
+++ b/gtk/src/buildable.hg
@@ -23,6 +23,13 @@ _DEFS(gtkmm,gtk)
 _PINCLUDE(glibmm/private/interface_p.h)
 
 
+#ifndef DOXYGEN_SHOULD_SKIP_THIS
+extern "C"
+{
+typedef struct _GtkBuildableIface GtkBuildableIface;
+}
+#endif /* DOXYGEN_SHOULD_SKIP_THIS */
+
 namespace Gtk
 {
 
diff --git a/gtk/src/editable.hg b/gtk/src/editable.hg
index 266fe16..82722a0 100644
--- a/gtk/src/editable.hg
+++ b/gtk/src/editable.hg
@@ -18,10 +18,15 @@
  */
 
 #include <glibmm/interface.h>
-#include <gtk/gtk.h> //TODO: Avoid including this?
 _DEFS(gtkmm,gtk)
 _PINCLUDE(glibmm/private/interface_p.h)
 
+#ifndef DOXYGEN_SHOULD_SKIP_THIS
+extern "C"
+{
+typedef struct _GtkEditableInterface GtkEditableInterface;
+}
+#endif /* DOXYGEN_SHOULD_SKIP_THIS */
 
 namespace Gtk
 {
@@ -132,4 +137,3 @@ dnl // string is rarely needed -- probably not a good idea to make this generic.
 };
 
 } // namespace Gtk
-
diff --git a/gtk/src/orientable.hg b/gtk/src/orientable.hg
index 000caa2..dafe240 100644
--- a/gtk/src/orientable.hg
+++ b/gtk/src/orientable.hg
@@ -19,10 +19,15 @@
 
 #include <glibmm/interface.h>
 #include <gtkmm/enums.h>
-#include <gtk/gtk.h>
 _DEFS(gtkmm,gtk)
 _PINCLUDE(glibmm/private/interface_p.h)
 
+#ifndef DOXYGEN_SHOULD_SKIP_THIS
+extern "C"
+{
+typedef struct _GtkOrientableIface GtkOrientableIface;
+}
+#endif /* DOXYGEN_SHOULD_SKIP_THIS */
 
 namespace Gtk
 {
diff --git a/gtk/src/printoperationpreview.hg b/gtk/src/printoperationpreview.hg
index 4f8375e..ef3de22 100644
--- a/gtk/src/printoperationpreview.hg
+++ b/gtk/src/printoperationpreview.hg
@@ -15,8 +15,6 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtk.h>
-
 #include <glibmm/interface.h>
 
 #include <gtkmm/pagesetup.h>
@@ -25,6 +23,13 @@
 _DEFS(gtkmm,gtk)
 _PINCLUDE(glibmm/private/interface_p.h)
 
+#ifndef DOXYGEN_SHOULD_SKIP_THIS
+extern "C"
+{
+typedef struct _GtkPrintOperationPreviewIface GtkPrintOperationPreviewIface;
+}
+#endif /* DOXYGEN_SHOULD_SKIP_THIS */
+
 namespace Gtk
 {
 
diff --git a/gtk/src/recentchooser.hg b/gtk/src/recentchooser.hg
index 39309bd..0fa0d33 100644
--- a/gtk/src/recentchooser.hg
+++ b/gtk/src/recentchooser.hg
@@ -15,7 +15,6 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtk.h>
 #include <glibmm/interface.h>
 #include <gtkmm/recentinfo.h>
 #include <gtkmm/recentfilter.h>
@@ -24,6 +23,13 @@
 _DEFS(gtkmm,gtk)
 _PINCLUDE(glibmm/private/interface_p.h)
 
+#ifndef DOXYGEN_SHOULD_SKIP_THIS
+extern "C"
+{
+typedef struct _GtkRecentChooserIface GtkRecentChooserIface;
+}
+#endif /* DOXYGEN_SHOULD_SKIP_THIS */
+
 namespace Gtk
 {
 
diff --git a/gtk/src/scrollable.hg b/gtk/src/scrollable.hg
index 675f9d2..608fed1 100644
--- a/gtk/src/scrollable.hg
+++ b/gtk/src/scrollable.hg
@@ -18,10 +18,15 @@
 #include <gtkmm/adjustment.h>
 #include <glibmm/interface.h>
 #include <gtkmm/enums.h>
-#include <gtk/gtk.h>
 _DEFS(gtkmm,gtk)
 _PINCLUDE(glibmm/private/interface_p.h)
 
+#ifndef DOXYGEN_SHOULD_SKIP_THIS
+extern "C"
+{
+typedef struct _GtkScrollableInterface GtkScrollableInterface;
+}
+#endif /* DOXYGEN_SHOULD_SKIP_THIS */
 
 namespace Gtk
 {
diff --git a/gtk/src/toolshell.hg b/gtk/src/toolshell.hg
index 298f882..6e9bbdf 100644
--- a/gtk/src/toolshell.hg
+++ b/gtk/src/toolshell.hg
@@ -20,11 +20,16 @@
 #include <glibmm/interface.h>
 #include <gtkmm/enums.h>
 #include <gtkmm/sizegroup.h>
-#include <gtk/gtk.h>
 
 _DEFS(gtkmm,gtk)
 _PINCLUDE(glibmm/private/interface_p.h)
 
+#ifndef DOXYGEN_SHOULD_SKIP_THIS
+extern "C"
+{
+typedef struct _GtkToolShellIface GtkToolShellIface;
+}
+#endif /* DOXYGEN_SHOULD_SKIP_THIS */
 
 namespace Gtk
 {
diff --git a/gtk/src/treesortable.hg b/gtk/src/treesortable.hg
index 3a2f8d3..9fb0166 100644
--- a/gtk/src/treesortable.hg
+++ b/gtk/src/treesortable.hg
@@ -27,11 +27,17 @@ _CONFIGINCLUDE(gtkmmconfig.h)
 #include <gtkmm/treemodelcolumn.h>
 #include <gtkmm/treemodel.h>
 #include <gtkmm/treeiter.h>
-#include <gtk/gtk.h>
 
 _DEFS(gtkmm,gtk)
 _PINCLUDE(glibmm/private/interface_p.h)
 
+#ifndef DOXYGEN_SHOULD_SKIP_THIS
+extern "C"
+{
+typedef struct _GtkTreeSortableIface GtkTreeSortableIface;
+}
+#endif /* DOXYGEN_SHOULD_SKIP_THIS */
+
 namespace Gtk
 {