[glom/boostpythonretry: 3/6] Do not include pygtk.h

[Murray Cumming <murrayc src gnome org>]

commit 7cb078f27b0fd14417368ba56370113efbd5578f
Author: Murray Cumming <murrayc murrayc com>
Date:   Tue Feb 2 18:37:00 2010 +0100

    Do not include pygtk.h
    
    * glom/libglom/python_embed/py_glom_record.h:
    * glom/libglom/python_embed/py_glom_relatedrecord.h:
    * glom/python_embed/glom_python.cc: Include pygobject.h instead of
    pygtk/pygtk.h, because we do not use anything from pygtk, or link to it.

 ChangeLog                                         |    9 +++++++++
 glom/libglom/python_embed/py_glom_record.h        |    4 ++--
 glom/libglom/python_embed/py_glom_relatedrecord.h |    4 ++--
 glom/python_embed/glom_python.cc                  |    4 ++--
 4 files changed, 15 insertions(+), 6 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 249499f..a8d0185 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2010-02-02  Murray Cumming  <murrayc murrayc com>
+
+  Do not include pygtk.h
+  
+	* glom/libglom/python_embed/py_glom_record.h:
+	* glom/libglom/python_embed/py_glom_relatedrecord.h:
+	* glom/python_embed/glom_python.cc: Include pygobject.h instead of 
+	pygtk/pygtk.h, because we do not use anything from pygtk, or link to it.
+
 2010-01-31  Murray Cumming  <murrayc murrayc com>
 
   Command-line parsing: Added some checks.
diff --git a/glom/libglom/python_embed/py_glom_record.h b/glom/libglom/python_embed/py_glom_record.h
index 8bf072b..f93a28f 100644
--- a/glom/libglom/python_embed/py_glom_record.h
+++ b/glom/libglom/python_embed/py_glom_record.h
@@ -21,8 +21,8 @@
 #ifndef GLOM_PYTHON_GLOM_RECORD_H
 #define GLOM_PYTHON_GLOM_RECORD_H
 
-#define NO_IMPORT_PYGTK //To avoid a multiple definition in pygtk.
-#include <pygtk/pygtk.h> //For the PyGObject and PyGBoxed struct definitions.
+#define NO_IMPORT_PYGOBJECT //To avoid a multiple definition in pygtk.
+#include <pygobject.h> //For the PyGObject and PyGBoxed struct definitions.
 
 #include <Python.h>
 
diff --git a/glom/libglom/python_embed/py_glom_relatedrecord.h b/glom/libglom/python_embed/py_glom_relatedrecord.h
index 8b2db84..3de3bc9 100644
--- a/glom/libglom/python_embed/py_glom_relatedrecord.h
+++ b/glom/libglom/python_embed/py_glom_relatedrecord.h
@@ -21,8 +21,8 @@
 #ifndef GLOM_PYTHON_GLOM_RELATEDRECORD_H
 #define GLOM_PYTHON_GLOM_RELATEDRECORD_H
 
-#define NO_IMPORT_PYGTK //To avoid a multiple definition in pygtk.
-#include <pygtk/pygtk.h> //For the PyGObject and PyGBoxed struct definitions.
+#define NO_IMPORT_PYGOBJECT //To avoid a multiple definition in pygtk.
+#include <pygobject.h> //For the PyGObject and PyGBoxed struct definitions.
 
 #include <libglom/document/document.h>
 #include <libglom/data_structure/field.h>
diff --git a/glom/python_embed/glom_python.cc b/glom/python_embed/glom_python.cc
index 3ac76d7..da6d98f 100644
--- a/glom/python_embed/glom_python.cc
+++ b/glom/python_embed/glom_python.cc
@@ -23,8 +23,8 @@
 #include <libglom/python_embed/py_glom_record.h>
 #include <libglom/python_embed/pygdavalue_conversions.h>
 
-#define NO_IMPORT_PYGTK //To avoid a multiple definition in pygtk.
-#include <pygtk/pygtk.h> //For the PyGObject and PyGBoxed struct definitions.
+#define NO_IMPORT_PYGOBJECT //To avoid a multiple definition in pygtk.
+#include <pygobject.h> //For the PyGObject and PyGBoxed struct definitions.
 
 #include <Python.h>
 #include <compile.h> /* for the PyCodeObject */