Get pollar tiling working agains with trunk

(bzr r11073.1.37)

5 files changed, 14 insertions, 15 deletions

diff --git a/src/ui/dialog/dialog-manager.cpp b/src/ui/dialog/dialog-manager.cpp
index 32ceb397a..47e1fdd30 100644
--- a/src/ui/dialog/dialog-manager.cpp
+++ b/src/ui/dialog/dialog-manager.cpp
@@ -150,12 +150,8 @@ DialogManager::DialogManager() {
 //        registerFactory("PrintColorsPreviewDialog",      &create<PrintColorsPreviewDialog,       DockBehavior>);
         registerFactory("SvgFontsDialog",      &create<SvgFontsDialog,       DockBehavior>);
         registerFactory("Swatches",            &create<SwatchesPanel,        DockBehavior>);
-<<<<<<< TREE
-        registerFactory("TileDialog",          &create<ArrangeDialog,           DockBehavior>);
-=======
+        registerFactory("TileDialog",          &create<ArrangeDialog,        DockBehavior>);
         registerFactory("Symbols",             &create<SymbolsDialog,        DockBehavior>);
-        registerFactory("TileDialog",          &create<TileDialog,           DockBehavior>);
->>>>>>> MERGE-SOURCE
         registerFactory("Trace",               &create<TraceDialog,          DockBehavior>);
         registerFactory("PixelArt",            &create<PixelArtDialog,       DockBehavior>);
         registerFactory("Transformation",      &create<Transformation,       DockBehavior>);
diff --git a/src/ui/dialog/grid-arrange-tab.cpp b/src/ui/dialog/grid-arrange-tab.cpp
index 7ff915265..8c0a4dc66 100644
--- a/src/ui/dialog/grid-arrange-tab.cpp
+++ b/src/ui/dialog/grid-arrange-tab.cpp
@@ -587,7 +587,12 @@ static void updateSelectionCallback(Inkscape::Application */*inkscape*/, Inkscap
 GridArrangeTab::GridArrangeTab(ArrangeDialog *parent)
     : Parent(parent),
       XPadding(_("X:"), _("Horizontal spacing between columns."), UNIT_TYPE_LINEAR, "", "object-columns", &PaddingUnitMenu),
-      YPadding(_("Y:"), _("Vertical spacing between rows."), XPadding, "", "object-rows", &PaddingUnitMenu)
+      YPadding(_("Y:"), _("Vertical spacing between rows."), XPadding, "", "object-rows", &PaddingUnitMenu),
+#if WITH_GTKMM_3_0
+      PaddingTable(Gtk::manage(new Gtk::Grid()))
+#else
+      PaddingTable(Gtk::manage(new Gtk::Table(2, 2, false)))
+#endif
 {
      // bool used by spin button callbacks to stop loops where they change each other.
     updating = false;
diff --git a/src/ui/dialog/polar-arrange-tab.cpp b/src/ui/dialog/polar-arrange-tab.cpp
index 623aa4e3e..a00b8fc02 100644
--- a/src/ui/dialog/polar-arrange-tab.cpp
+++ b/src/ui/dialog/polar-arrange-tab.cpp
@@ -7,12 +7,12 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include <2geom/transforms.h>
-#include <glibmm/i18n.h>
-
 #include "ui/dialog/polar-arrange-tab.h"
 #include "ui/dialog/tile.h"
 
+#include <2geom/transforms.h>
+#include <glibmm/i18n.h>
+
 #include "verbs.h"
 #include "preferences.h"
 #include "inkscape.h"
@@ -240,7 +240,7 @@ static Geom::Point getAnchorPoint(int anchor, SPItem *item)
 	else
 	{
 		// FIXME:
-		source[1] -= item->document->getHeight();
+		source[1] -= item->document->getHeight().value("px");
 		source[1] *= -1;
 	}
 
diff --git a/src/ui/dialog/polar-arrange-tab.h b/src/ui/dialog/polar-arrange-tab.h
index 019b64511..bfed40bbd 100644
--- a/src/ui/dialog/polar-arrange-tab.h
+++ b/src/ui/dialog/polar-arrange-tab.h
@@ -10,8 +10,6 @@
 #ifndef INKSCAPE_UI_DIALOG_POLAR_ARRANGE_TAB_H
 #define INKSCAPE_UI_DIALOG_POLAR_ARRANGE_TAB_H
 
-#include <gtkmm.h>
-
 #include "ui/dialog/arrange-tab.h"
 
 #include "ui/widget/anchor-selector.h"
diff --git a/src/ui/dialog/tile.cpp b/src/ui/dialog/tile.cpp
index 1ed099120..a3cffb3d4 100644
--- a/src/ui/dialog/tile.cpp
+++ b/src/ui/dialog/tile.cpp
@@ -14,14 +14,14 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
+#include "ui/dialog/grid-arrange-tab.h"
+#include "ui/dialog/polar-arrange-tab.h"
+
 #include <glibmm/i18n.h>
 
 #include "tile.h"
 #include "verbs.h"
 
-#include "ui/dialog/grid-arrange-tab.h"
-#include "ui/dialog/polar-arrange-tab.h"
-
 namespace Inkscape {
 namespace UI {
 namespace Dialog {