Merge from trunk

(bzr r9508.1.89)

8 files changed, 60 insertions, 43 deletions

diff --git a/src/helper/CMakeLists.txt b/src/helper/CMakeLists.txt
index 8f42a0d5a..8137487e2 100644
--- a/src/helper/CMakeLists.txt
+++ b/src/helper/CMakeLists.txt
@@ -1,29 +1,50 @@
+
 include(UseGlibMarshal)
 
 GLIB_MARSHAL(sp_marshal sp-marshal "${CMAKE_CURRENT_BINARY_DIR}/helper")
-SET(GlibOutput
-${CMAKE_CURRENT_BINARY_DIR}/sp-marshal.cpp
-${CMAKE_CURRENT_BINARY_DIR}/sp-marshal.h
+
+set(sp_marshal_SRC
+	${CMAKE_CURRENT_BINARY_DIR}/sp-marshal.cpp
+	${CMAKE_CURRENT_BINARY_DIR}/sp-marshal.h
 )
 
-SET(helper_SRC
-action.cpp
-geom.cpp
-geom-nodetype.cpp
-gnome-utils.cpp
-pixbuf-ops.cpp
-png-write.cpp
-stock-items.cpp
-unit-menu.cpp
-units.cpp
-#units-test.cpp
-unit-tracker.cpp
-window.cpp
-sp-marshal.list
-# we generate this file and it's .h counter-part
-${CMAKE_CURRENT_BINARY_DIR}/sp-marshal.cpp
-${CMAKE_CURRENT_BINARY_DIR}/sp-marshal.h
+set(helper_SRC
+	action.cpp
+	geom.cpp
+	geom-nodetype.cpp
+	gnome-utils.cpp
+	pixbuf-ops.cpp
+	png-write.cpp
+	stock-items.cpp
+	unit-menu.cpp
+	units.cpp
+	#units-test.cpp
+	unit-tracker.cpp
+	window.cpp
+
+	# we generate this file and it's .h counter-part
+	${sp_marshal_SRC}
+
+
+	# -------
+	# Headers
+	action.h
+	geom-curves.h
+	geom-nodetype.h
+	geom.h
+	gnome-utils.h
+	helper-forward.h
+	pixbuf-ops.h
+	png-write.h
+	recthull.h
+	stlport.h
+	stock-items.h
+	unit-menu.h
+	unit-tracker.h
+	units-test.h
+	units.h
+	window.h
 )
-ADD_LIBRARY(helper STATIC ${helper_SRC})
-TARGET_LINK_LIBRARIES(helper
-2geom ${INKSCAPE_LIBS})
\ No newline at end of file
+
+# add_inkscape_lib(helper_LIB "${helper_SRC}")
+add_inkscape_source("${helper_SRC}")
diff --git a/src/helper/stock-items.cpp b/src/helper/stock-items.cpp
index 9f3f172ac..96454cf3a 100644
--- a/src/helper/stock-items.cpp
+++ b/src/helper/stock-items.cpp
@@ -69,7 +69,7 @@ static SPObject * sp_marker_load_from_svg(gchar const *name, SPDocument *current
         /* Get the marker we want */
         SPObject *object = doc->getObjectById(name);
         if (object && SP_IS_MARKER(object)) {
-            SPDefs *defs= (SPDefs *) SP_DOCUMENT_DEFS(current_doc);
+            SPDefs *defs = current_doc->getDefs();
             Inkscape::XML::Document *xml_doc = current_doc->getReprDoc();
             Inkscape::XML::Node *mark_repr = object->getRepr()->duplicate(xml_doc);
             defs->getRepr()->addChild(mark_repr, NULL);
@@ -113,7 +113,7 @@ sp_pattern_load_from_svg(gchar const *name, SPDocument *current_doc)
         /* Get the pattern we want */
         SPObject *object = doc->getObjectById(name);
         if (object && SP_IS_PATTERN(object)) {
-            SPDefs *defs= (SPDefs *) SP_DOCUMENT_DEFS(current_doc);
+            SPDefs *defs = current_doc->getDefs();
             Inkscape::XML::Document *xml_doc = current_doc->getReprDoc();
             Inkscape::XML::Node *pat_repr = object->getRepr()->duplicate(xml_doc);
             defs->getRepr()->addChild(pat_repr, NULL);
@@ -156,7 +156,7 @@ sp_gradient_load_from_svg(gchar const *name, SPDocument *current_doc)
         /* Get the gradient we want */
         SPObject *object = doc->getObjectById(name);
         if (object && SP_IS_GRADIENT(object)) {
-            SPDefs *defs= (SPDefs *) SP_DOCUMENT_DEFS(current_doc);
+            SPDefs *defs = current_doc->getDefs();
             Inkscape::XML::Document *xml_doc = current_doc->getReprDoc();
             Inkscape::XML::Node *pat_repr = object->getRepr()->duplicate(xml_doc);
             defs->getRepr()->addChild(pat_repr, NULL);
@@ -195,7 +195,7 @@ SPObject *get_stock_item(gchar const *urn)
 
         SPDesktop *desktop = inkscape_active_desktop();
         SPDocument *doc = sp_desktop_document(desktop);
-        SPDefs *defs = reinterpret_cast<SPDefs *>(SP_DOCUMENT_DEFS(doc));
+        SPDefs *defs = doc->getDefs();
 
         SPObject *object = NULL;
         if (!strcmp(base, "marker")) {
diff --git a/src/helper/unit-menu.cpp b/src/helper/unit-menu.cpp
index e4ff09829..bcc8589e2 100644
--- a/src/helper/unit-menu.cpp
+++ b/src/helper/unit-menu.cpp
@@ -17,10 +17,7 @@
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
-#include <gtk/gtksignal.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtkmenu.h>
-#include <gtk/gtkmenuitem.h>
+#include <gtk/gtk.h>
 #include "helper/sp-marshal.h"
 #include "helper/units.h"
 #include "helper/unit-menu.h"
@@ -208,7 +205,7 @@ spus_unit_activate(GtkWidget *widget, SPUnitSelector *us)
         /* when the base changes, signal all the adjustments to get them
          * to recalculate */
         for (GSList *l = us->adjustments; l != NULL; l = g_slist_next(l)) {
-            gtk_signal_emit_by_name(GTK_OBJECT(l->data), "value_changed");
+            g_signal_emit_by_name(G_OBJECT(l->data), "value_changed");
         }
     }
 
@@ -236,7 +233,7 @@ spus_rebuild_menu(SPUnitSelector *us)
         GtkWidget *i = gtk_menu_item_new_with_label( u->abbr );
 
         gtk_object_set_data(GTK_OBJECT(i), "unit", (gpointer) u);
-        gtk_signal_connect(GTK_OBJECT(i), "activate", GTK_SIGNAL_FUNC(spus_unit_activate), us);
+        g_signal_connect(G_OBJECT(i), "activate", G_CALLBACK(spus_unit_activate), us);
 
         sp_set_font_size_smaller (i);
 
diff --git a/src/helper/unit-menu.h b/src/helper/unit-menu.h
index b3ab8836c..919873c58 100644
--- a/src/helper/unit-menu.h
+++ b/src/helper/unit-menu.h
@@ -11,7 +11,7 @@
  */
 
 #include <glib/gtypes.h>
-#include <gtk/gtkoptionmenu.h>
+#include <gtk/gtk.h>
 
 #include <helper/helper-forward.h>
 
@@ -19,10 +19,10 @@
 /* Unit selector Widget */
 
 #define SP_TYPE_UNIT_SELECTOR (sp_unit_selector_get_type())
-#define SP_UNIT_SELECTOR(o) (GTK_CHECK_CAST((o), SP_TYPE_UNIT_SELECTOR, SPUnitSelector))
-#define SP_UNIT_SELECTOR_CLASS(k) (GTK_CHECK_CLASS_CAST((k), SP_TYPE_UNIT_SELECTOR, SPUnitSelectorClass))
-#define SP_IS_UNIT_SELECTOR(o) (GTK_CHECK_TYPE((o), SP_TYPE_UNIT_SELECTOR))
-#define SP_IS_UNIT_SELECTOR_CLASS(k) (GTK_CHECK_CLASS_TYPE((k), SP_TYPE_UNIT_SELECTOR))
+#define SP_UNIT_SELECTOR(o) (G_TYPE_CHECK_INSTANCE_CAST((o), SP_TYPE_UNIT_SELECTOR, SPUnitSelector))
+#define SP_UNIT_SELECTOR_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), SP_TYPE_UNIT_SELECTOR, SPUnitSelectorClass))
+#define SP_IS_UNIT_SELECTOR(o) (G_TYPE_CHECK_INSTANCE_TYPE((o), SP_TYPE_UNIT_SELECTOR))
+#define SP_IS_UNIT_SELECTOR_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE((k), SP_TYPE_UNIT_SELECTOR))
 
 GType sp_unit_selector_get_type(void);
 
diff --git a/src/helper/unit-tracker.cpp b/src/helper/unit-tracker.cpp
index 3f5a72e6a..609c2f292 100644
--- a/src/helper/unit-tracker.cpp
+++ b/src/helper/unit-tracker.cpp
@@ -10,7 +10,7 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include <gtk/gtkliststore.h>
+#include <gtk/gtk.h>
 
 #include "unit-tracker.h"
 #include "ege-select-one-action.h"
diff --git a/src/helper/unit-tracker.h b/src/helper/unit-tracker.h
index 0f333b2ec..a15a0a6ca 100644
--- a/src/helper/unit-tracker.h
+++ b/src/helper/unit-tracker.h
@@ -15,8 +15,7 @@
 
 #include <map>
 
-#include <gtk/gtkaction.h>
-#include <gtk/gtkliststore.h>
+#include <gtk/gtk.h>
 
 #include "helper/units.h"
 
diff --git a/src/helper/window.cpp b/src/helper/window.cpp
index b814424e5..f4640203d 100644
--- a/src/helper/window.cpp
+++ b/src/helper/window.cpp
@@ -12,7 +12,7 @@
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
-#include <gtk/gtkwindow.h>
+#include <gtk/gtk.h>
 #include <gtkmm/window.h>
 
 #include "inkscape.h"
diff --git a/src/helper/window.h b/src/helper/window.h
index 36b91a813..dc2c48bc0 100644
--- a/src/helper/window.h
+++ b/src/helper/window.h
@@ -10,7 +10,7 @@
  * This code is in public domain
  */
 
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
 #include <gtkmm/window.h>
 
 /*