From f3756ff85a32f4b2a0771d0ac3bd78a69535395f Mon Sep 17 00:00:00 2001
From: Alex Valavanis <valavanisalex@gmail.com>
Date: Fri, 3 Jun 2011 11:44:52 +0100
Subject: Use generic headers in preparation for GTK+ 3 transition

Fixed bugs:
  - https://launchpad.net/bugs/792263

(bzr r10252.1.1)
---
 src/main.cpp | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

(limited to 'src/main.cpp')

diff --git a/src/main.cpp b/src/main.cpp
index ac0994be6..657e4c07e 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -31,7 +31,7 @@
 // This has to be included prior to anything that includes setjmp.h, it croaks otherwise
 #include <png.h>
 
-#include <gtk/gtkmessagedialog.h>
+#include <gtk/gtk.h>
 
 #ifdef HAVE_IEEEFP_H
 #include <ieeefp.h>
@@ -51,10 +51,6 @@
 #include <glib/gprintf.h>
 #include <glib-object.h>
 #include <gtk/gtk.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtkwindow.h>
-#include <gtk/gtkbox.h>
 
 #include "gc-core.h"
 
-- 
cgit v1.2.3


From 3638efba5bec8a6afc9211aa6bbe289767d20b38 Mon Sep 17 00:00:00 2001
From: "Jon A. Cruz" <jon@joncruz.org>
Date: Fri, 3 Jun 2011 19:45:55 -0700
Subject: Removed outdated/unsafe SP_DOCUMENT_DEFS macro and reduced usage of
 SP_ROOT() gtk type function/macro.

(bzr r10254)
---
 src/main.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/main.cpp')

diff --git a/src/main.cpp b/src/main.cpp
index ac0994be6..82a4b28c0 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1353,7 +1353,7 @@ sp_do_export_png(SPDocument *doc)
     } else if (sp_export_area_page || !(sp_export_id || sp_export_area_drawing)) {
         /* Export the whole page: note: Inkscape uses 'page' in all menus and dialogs, not 'canvas' */
         doc->ensureUpToDate();
-        Geom::Point origin (SP_ROOT(doc->root)->x.computed, SP_ROOT(doc->root)->y.computed);
+        Geom::Point origin(doc->getRoot()->x.computed, doc->getRoot()->y.computed);
         area = Geom::Rect(origin, origin + doc->getDimensions());
     }
 
-- 
cgit v1.2.3