Fix Glibmm inclusions for Gtk+ 3 builds and implement a Gtk+ 3 compatible check for X11 backend

Fixed bugs:
  - https://launchpad.net/bugs/1160252
  - https://launchpad.net/bugs/1122774

(bzr r12247)

5 files changed, 10 insertions, 16 deletions

diff --git a/src/dom/dom.h b/src/dom/dom.h
index 22fd09ebf..14165166e 100644
--- a/src/dom/dom.h
+++ b/src/dom/dom.h
@@ -60,9 +60,9 @@
  */ 
 
 #ifdef DOM_STANDALONE
-#include <string>
+# include <string>
 #else
-#include <glibmm.h>
+# include <glibmm/ustring.h>
 #endif
 
 //# Unfortunate hack for a name collision
diff --git a/src/dom/io/domstream.cpp b/src/dom/io/domstream.cpp
index 7118025d6..1f08c0eee 100644
--- a/src/dom/io/domstream.cpp
+++ b/src/dom/io/domstream.cpp
@@ -34,9 +34,10 @@
  *
  */
 
+#include <cmath>
+#include <cstdarg>
 #include <cstdio>
-#include <math.h>
-#include <stdarg.h>
+#include <cstdlib>
 
 #include "domstream.h"
 #include "dom/ucd.h"
diff --git a/src/dom/uri.cpp b/src/dom/uri.cpp
index e1089017d..231995daf 100644
--- a/src/dom/uri.cpp
+++ b/src/dom/uri.cpp
@@ -27,17 +27,14 @@
  *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-
-
-
 #include "uri.h"
 #include "ucd.h"
 
-#include <stdio.h>
-#include <stdarg.h>
+#include <cstdarg>
+#include <cstdio>
+#include <cstdlib>
 #include <vector>
 
-
 namespace org
 {
 namespace w3c
diff --git a/src/dom/views.h b/src/dom/views.h
index f165d2a9b..f1154fb62 100644
--- a/src/dom/views.h
+++ b/src/dom/views.h
@@ -45,12 +45,9 @@
  * Be prepared in the future to adjust to this, if SVG ever switches .
  */
 
-
-
+#include <cstdlib>
 #include "dom.h"
 
-
-
 namespace org
 {
 namespace w3c
diff --git a/src/dom/xpathparser.cpp b/src/dom/xpathparser.cpp
index b19975966..4785ce93f 100644
--- a/src/dom/xpathparser.cpp
+++ b/src/dom/xpathparser.cpp
@@ -27,10 +27,9 @@
  *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-
 #include "ucd.h"
 #include "xpathparser.h"
-
+#include <cstdlib>
 
 namespace org
 {