From c260fcd615791615b33f55459dabe38e64ee3471 Mon Sep 17 00:00:00 2001 From: Jasper van de Gronde Date: Fri, 15 Apr 2011 09:17:08 +0200 Subject: No more PrintWin32, including no special cases for non-Unicode Windows anymore. (bzr r9508.1.82) --- 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..b510f6902 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -100,9 +100,8 @@ #include #ifdef WIN32 +#include #include "registrytool.h" -#include "extension/internal/win32.h" -using Inkscape::Extension::Internal::PrintWin32; #endif // WIN32 #include "extension/init.h" @@ -702,9 +701,6 @@ main(int argc, char **argv) } #ifdef WIN32 -#ifndef REPLACEARGS_ANSI - if ( PrintWin32::is_os_wide() ) -#endif // REPLACEARGS_ANSI { // If the call fails, we'll need to convert charsets needToRecodeParams = !replaceArgs( argc, argv ); -- cgit v1.2.3 From f3756ff85a32f4b2a0771d0ac3bd78a69535395f Mon Sep 17 00:00:00 2001 From: Alex Valavanis 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 -#include +#include #ifdef HAVE_IEEEFP_H #include @@ -51,10 +51,6 @@ #include #include #include -#include -#include -#include -#include #include "gc-core.h" -- cgit v1.2.3 From 3638efba5bec8a6afc9211aa6bbe289767d20b38 Mon Sep 17 00:00:00 2001 From: "Jon A. Cruz" 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 From b0b8046a08a7d4d1cd21b5a0a531d9cfe7167f44 Mon Sep 17 00:00:00 2001 From: Gellule Xg Date: Mon, 27 Jun 2011 20:50:49 -1000 Subject: If GTK built with QUARTZ backend, no need to expect DISPLAY to be set to start the GUI version. Fixed bugs: - https://launchpad.net/bugs/251982 (bzr r10380.1.1) --- 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 26774fd66..1614e97f7 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -641,7 +641,7 @@ main(int argc, char **argv) gboolean use_gui; -#ifndef WIN32 +#if !defined(WIN32) && !defined(GDK_WINDOWING_QUARTZ) use_gui = (g_getenv("DISPLAY") != NULL); #else use_gui = TRUE; -- cgit v1.2.3 From eed6e9c2c229b10911a23976c47da79fc70a5b87 Mon Sep 17 00:00:00 2001 From: "Johan B. C. Engelen" Date: Sun, 17 Jul 2011 21:47:09 +0200 Subject: - rename SPItem::i2d_affine to i2dt_affine, to clarify that it is item-to-desktop, not item-to-document. This should make it easier to spot bugs. - tag some instances where the document-to-desktop transform has been hardcoded (bzr r10466) --- 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 1614e97f7..ace99f519 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1321,7 +1321,7 @@ sp_do_export_png(SPDocument *doc) // write object bbox to area doc->ensureUpToDate(); Geom::OptRect areaMaybe; - static_cast(o_area)->invoke_bbox( areaMaybe, static_cast(o_area)->i2d_affine(), TRUE); + static_cast(o_area)->invoke_bbox( areaMaybe, static_cast(o_area)->i2dt_affine(), TRUE); if (areaMaybe) { area = *areaMaybe; } else { -- cgit v1.2.3 From 72cc39b9f0b340548f395c7f61ca9662b34aea09 Mon Sep 17 00:00:00 2001 From: Krzysztof Kosi??ski Date: Sat, 27 Aug 2011 11:04:37 +0200 Subject: Refactor SPItem bounding box methods: remove NRRect usage and make code using them more obvious. Fix filter region computation. (bzr r10582.1.1) --- src/main.cpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'src/main.cpp') diff --git a/src/main.cpp b/src/main.cpp index ace99f519..501a3e5d2 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1195,8 +1195,8 @@ do_query_dimension (SPDocument *doc, bool extent, Geom::Dim2 const axis, const g doc->ensureUpToDate(); SPItem *item = ((SPItem *) o); - // "true" SVG bbox for scripting - Geom::OptRect area = item->getBounds(item->i2doc_affine()); + // visual bbox in document coords for scripting + Geom::OptRect area = item->documentVisualBounds(); if (area) { Inkscape::SVGOStringStream os; if (extent) { @@ -1226,7 +1226,7 @@ do_query_all_recurse (SPObject *o) { SPItem *item = ((SPItem *) o); if (o->getId() && SP_IS_ITEM(item)) { - Geom::OptRect area = item->getBounds(item->i2doc_affine()); + Geom::OptRect area = item->documentVisualBounds(); if (area) { Inkscape::SVGOStringStream os; os << o->getId(); @@ -1320,8 +1320,7 @@ sp_do_export_png(SPDocument *doc) // write object bbox to area doc->ensureUpToDate(); - Geom::OptRect areaMaybe; - static_cast(o_area)->invoke_bbox( areaMaybe, static_cast(o_area)->i2dt_affine(), TRUE); + Geom::OptRect areaMaybe = static_cast(o_area)->desktopVisualBounds(); if (areaMaybe) { area = *areaMaybe; } else { -- cgit v1.2.3 From 2633767789e4264b13ef91a684accf734fb4e94f Mon Sep 17 00:00:00 2001 From: "Jon A. Cruz" Date: Wed, 26 Oct 2011 21:55:51 -0700 Subject: Fixing more broken and split doc comments. (bzr r10697) --- 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 501a3e5d2..63fd4a454 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1,4 +1,4 @@ -/** \file +/* * Inkscape - an ambitious vector drawing program * * Authors: -- cgit v1.2.3