GNOME.org
 

[gtkmm] Add #includes needed with the latest glibmm.

commit 46ada3b5c7ffcecfa062e83ec1f62562c806879f
Author: Murray Cumming <murrayc murrayc com>
Date:   Tue Oct 25 12:15:51 2011 +0200

    Add #includes needed with the latest glibmm.
    
    * gdk/src/color.hg:
    * gdk/src/pixbuf.hg:
    * gdk/src/pixbufanimationiter.hg:
    * gdk/src/pixbufformat.hg:
    * gdk/src/rectangle.hg:
    * gdk/src/rgba.hg:
    * gdk/src/types.hg:
    * gtk/gtkmm/object.h:
    * gtk/gtkmm/stock.cc:
    * gtk/gtkmm/stockid.h:
    * gtk/src/border.hg:
    * gtk/src/enums.hg:
    * gtk/src/main.hg:
    * gtk/src/papersize.hg:
    * gtk/src/textattributes.hg: Add individual includes now that gmmproc does not
    add #include glibmm.h at the top of every generated header.

 ChangeLog                      |   21 +++++++++++++++++++++
 gdk/src/color.hg               |    1 +
 gdk/src/pixbuf.hg              |    1 +
 gdk/src/pixbufanimationiter.hg |    1 +
 gdk/src/pixbufformat.hg        |    2 ++
 gdk/src/rectangle.hg           |    1 +
 gdk/src/rgba.hg                |    1 +
 gdk/src/types.hg               |    1 +
 gtk/gtkmm/object.h             |    2 --
 gtk/gtkmm/stock.cc             |    1 +
 gtk/gtkmm/stockid.h            |    3 ++-
 gtk/src/border.hg              |    2 ++
 gtk/src/enums.hg               |    1 +
 gtk/src/main.hg                |    1 +
 gtk/src/papersize.hg           |    1 +
 gtk/src/textattributes.hg      |    3 ++-
 16 files changed, 39 insertions(+), 4 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index a806062..cfad238 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,24 @@
+2011-10-25  Murray Cumming  <murrayc murrayc com>
+
+	Add #includes needed with the latest glibmm.
+
+	* gdk/src/color.hg:
+	* gdk/src/pixbuf.hg:
+	* gdk/src/pixbufanimationiter.hg:
+	* gdk/src/pixbufformat.hg:
+	* gdk/src/rectangle.hg:
+	* gdk/src/rgba.hg:
+	* gdk/src/types.hg:
+	* gtk/gtkmm/object.h:
+	* gtk/gtkmm/stock.cc:
+	* gtk/gtkmm/stockid.h:
+	* gtk/src/border.hg:
+	* gtk/src/enums.hg:
+	* gtk/src/main.hg:
+	* gtk/src/papersize.hg:
+	* gtk/src/textattributes.hg: Add individual includes now that gmmproc does not 
+	add #include glibmm.h at the top of every generated header.
+
 2011-10-13  Murray Cumming  <murrayc murrayc com>
 
 	Deprecate Gtk::Table in favour of Gtk::Grid.
diff --git a/gdk/src/color.hg b/gdk/src/color.hg
index 990c253..8d68668 100644
--- a/gdk/src/color.hg
+++ b/gdk/src/color.hg
@@ -21,6 +21,7 @@
 // the #ifndef GDKMM_DISABLE_DEPRECATED in deprecated classes) is generated:
 _CONFIGINCLUDE(gdkmmconfig.h)
 
+#include <glibmm/value.h>
 #include <gdk/gdk.h>
 
 _DEFS(gdkmm,gdk)
diff --git a/gdk/src/pixbuf.hg b/gdk/src/pixbuf.hg
index eea4f62..f0465cc 100644
--- a/gdk/src/pixbuf.hg
+++ b/gdk/src/pixbuf.hg
@@ -27,6 +27,7 @@ _CONFIGINCLUDE(gdkmmconfig.h)
 #include <giomm/inputstream.h>
 #include <giomm/icon.h>
 #include <cairomm/surface.h>
+#include <glibmm/error.h>
 
 _DEFS(gdkmm,gdk)
 _PINCLUDE(glibmm/private/object_p.h)
diff --git a/gdk/src/pixbufanimationiter.hg b/gdk/src/pixbufanimationiter.hg
index c4803bf..deeefec 100644
--- a/gdk/src/pixbufanimationiter.hg
+++ b/gdk/src/pixbufanimationiter.hg
@@ -21,6 +21,7 @@
 
 #include <glibmm/object.h>
 #include <gdkmm/pixbuf.h>
+#include <glibmm/timeval.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
 
 _DEFS(gdkmm,gdk)
diff --git a/gdk/src/pixbufformat.hg b/gdk/src/pixbufformat.hg
index 81c13dd..12c7c5f 100644
--- a/gdk/src/pixbufformat.hg
+++ b/gdk/src/pixbufformat.hg
@@ -20,6 +20,8 @@
 _DEFS(gdkmm,gdk)
 
 #include <gdkmmconfig.h>
+#include <glibmm/value.h>
+#include <vector>
 
 namespace Gdk
 {
diff --git a/gdk/src/rectangle.hg b/gdk/src/rectangle.hg
index 1d33cb2..0548276 100644
--- a/gdk/src/rectangle.hg
+++ b/gdk/src/rectangle.hg
@@ -19,6 +19,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
+#include <glibmm/value.h>
 #include <gdk/gdk.h>
 
 _DEFS(gdkmm,gdk)
diff --git a/gdk/src/rgba.hg b/gdk/src/rgba.hg
index a758c12..00a083a 100644
--- a/gdk/src/rgba.hg
+++ b/gdk/src/rgba.hg
@@ -15,6 +15,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
+#include <glibmm/value.h>
 #include <gdk/gdk.h> //TODO: Remove this?
 
 _DEFS(gdkmm,gdk)
diff --git a/gdk/src/types.hg b/gdk/src/types.hg
index 89ca407..290b423 100644
--- a/gdk/src/types.hg
+++ b/gdk/src/types.hg
@@ -19,6 +19,7 @@
 
 _DEFS(gdkmm,gdk)
 
+#include <glibmm/value.h>
 #include <gdk/gdk.h>
 #include <gdkmmconfig.h>
 
diff --git a/gtk/gtkmm/object.h b/gtk/gtkmm/object.h
index e92f101..8c58843 100644
--- a/gtk/gtkmm/object.h
+++ b/gtk/gtkmm/object.h
@@ -18,8 +18,6 @@
 #ifndef _GTKMM_OBJECT_H
 #define _GTKMM_OBJECT_H
 
-
-#include <glibmm.h>
 #include <glibmm/object.h>
 #include <gtkmm/base.h>
 #include <gtkmmconfig.h>
diff --git a/gtk/gtkmm/stock.cc b/gtk/gtkmm/stock.cc
index d372e85..230f7a7 100644
--- a/gtk/gtkmm/stock.cc
+++ b/gtk/gtkmm/stock.cc
@@ -20,6 +20,7 @@
 
 #include <gtkmm/stock.h>
 #include <gtkmm/stockitem.h>
+#include <glibmm/vectorutils.h>
 #include <gtk/gtk.h>
 
 // Get rid of macro DELETE (from winnt.h).  We have some macro
diff --git a/gtk/gtkmm/stockid.h b/gtk/gtkmm/stockid.h
index ab7cb12..b2a5ec0 100644
--- a/gtk/gtkmm/stockid.h
+++ b/gtk/gtkmm/stockid.h
@@ -23,7 +23,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <glibmm.h>
+#include <glibmm/ustring.h>
+#include <glibmm/containerhandle_shared.h>
 
 namespace Gtk
 {
diff --git a/gtk/src/border.hg b/gtk/src/border.hg
index d017bac..741c0db 100644
--- a/gtk/src/border.hg
+++ b/gtk/src/border.hg
@@ -19,6 +19,8 @@
 
 _DEFS(gtkmm,gtk)
 
+#include <glibmm/value.h>
+
 namespace Gtk
 {
 
diff --git a/gtk/src/enums.hg b/gtk/src/enums.hg
index 944e4b8..c3d7024 100644
--- a/gtk/src/enums.hg
+++ b/gtk/src/enums.hg
@@ -19,6 +19,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
+#include <glibmm/value.h>
 #include <gtk/gtk.h>
 
 #include <gtkmmconfig.h> //For GTKMM_MAEMO_EXTENSIONS_ENABLED
diff --git a/gtk/src/main.hg b/gtk/src/main.hg
index cbea385..48bdcac 100644
--- a/gtk/src/main.hg
+++ b/gtk/src/main.hg
@@ -24,6 +24,7 @@
 
 #include <sigc++/sigc++.h>
 #include <gdkmm/types.h>
+#include <glibmm/optioncontext.h>
 
 _DEFS(gtkmm,gtk)
 
diff --git a/gtk/src/papersize.hg b/gtk/src/papersize.hg
index 5056435..7112a73 100644
--- a/gtk/src/papersize.hg
+++ b/gtk/src/papersize.hg
@@ -17,6 +17,7 @@
 
 _DEFS(gtkmm,gtk)
 
+#include <glibmm/keyfile.h>
 #include <vector>
 
 namespace Gtk
diff --git a/gtk/src/textattributes.hg b/gtk/src/textattributes.hg
index a2676ca..0ea0be4 100644
--- a/gtk/src/textattributes.hg
+++ b/gtk/src/textattributes.hg
@@ -19,9 +19,10 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-
 _DEFS(gtkmm,gtk)
 
+#include <glibmm/value.h>
+
 namespace Gtk
 {
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]