From: Jon A. Cruz Date: Wed, 15 Dec 2010 06:52:32 +0000 (-0800) Subject: Win32 post-GSoC fixups. X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=6162a8278ea4c335a186141dabe74b7b3155924f;p=inkscape.git Win32 post-GSoC fixups. --- diff --git a/src/extension/internal/emf-win32-inout.cpp b/src/extension/internal/emf-win32-inout.cpp index 7d379477b..293e9b7d8 100644 --- a/src/extension/internal/emf-win32-inout.cpp +++ b/src/extension/internal/emf-win32-inout.cpp @@ -125,17 +125,17 @@ emf_print_document_to_file(SPDocument *doc, gchar const *filename) mod->base = SP_ITEM(doc->getRoot()); mod->arena = NRArena::create(); mod->dkey = sp_item_display_key_new(1); - mod->root = sp_item_invoke_show(mod->base, mod->arena, mod->dkey, SP_ITEM_SHOW_DISPLAY); + mod->root = mod->base->invoke_show(mod->arena, mod->dkey, SP_ITEM_SHOW_DISPLAY); /* Print document */ ret = mod->begin(doc); if (ret) { g_free(oldoutput); throw Inkscape::Extension::Output::save_failed(); } - sp_item_invoke_print(mod->base, &context); + mod->base->invoke_print(&context); ret = mod->finish(); /* Release arena */ - sp_item_invoke_hide(mod->base, mod->dkey); + mod->base->invoke_hide(mod->dkey); mod->base = NULL; mod->root = NULL; nr_object_unref((NRObject *) mod->arena); diff --git a/src/extension/internal/emf-win32-print.cpp b/src/extension/internal/emf-win32-print.cpp index 58249620b..6be48e44c 100644 --- a/src/extension/internal/emf-win32-print.cpp +++ b/src/extension/internal/emf-win32-print.cpp @@ -149,7 +149,7 @@ PrintEmfWin32::begin (Inkscape::Extension::Print *mod, SPDocument *doc) d.y1 = _height; } else { SPItem* doc_item = SP_ITEM(doc->getRoot()); - sp_item_invoke_bbox(doc_item, &d, doc_item->i2d_affine(), TRUE); + doc_item->invoke_bbox(&d, doc_item->i2d_affine(), TRUE); } d.x0 *= IN_PER_PX; diff --git a/src/jabber_whiteboard/dialog/choose-desktop.cpp b/src/jabber_whiteboard/dialog/choose-desktop.cpp index d46fd0161..bdcabd17f 100644 --- a/src/jabber_whiteboard/dialog/choose-desktop.cpp +++ b/src/jabber_whiteboard/dialog/choose-desktop.cpp @@ -31,8 +31,8 @@ void ChooseDesktop::cancelCallback() } void ChooseDesktop::doubleClickCallback( - const Gtk::TreeModel::Path &path, - Gtk::TreeViewColumn *col) + const Gtk::TreeModel::Path & /*path*/, + Gtk::TreeViewColumn * /*col*/) { response(Gtk::RESPONSE_OK); hide(); @@ -71,7 +71,7 @@ bool ChooseDesktop::doSetup() SPDesktop *desktop = (SPDesktop *)*p; Gtk::TreeModel::Row row = *(desktopListStore->append()); - row[desktopColumns.nameColumn] = (desktop->doc())->name; + row[desktopColumns.nameColumn] = desktop->doc()->getName(); row[desktopColumns.desktopColumn] = (SPDesktop *)*p; p++; } diff --git a/src/ui/dialog/filedialogimpl-win32.cpp b/src/ui/dialog/filedialogimpl-win32.cpp index 65bb49f13..ca3a99561 100644 --- a/src/ui/dialog/filedialogimpl-win32.cpp +++ b/src/ui/dialog/filedialogimpl-win32.cpp @@ -937,15 +937,15 @@ bool FileOpenDialogImplWin32::set_svg_preview() // write object bbox to area Geom::OptRect maybeArea(area); - svgDoc->ensureUpToDate (); - static_cast<(SPItem *)>(svgDoc->root)->invoke_bbox( maybeArea, - static_cast<(SPItem *)>(svgDoc->root)->i2d_affine(), TRUE); + svgDoc->ensureUpToDate(); + static_cast(svgDoc->root)->invoke_bbox( maybeArea, + static_cast(svgDoc->root)->i2d_affine(), TRUE); NRArena *const arena = NRArena::create(); - unsigned const key = sp_item_display_key_new(1); + unsigned const key = SPItem::display_key_new(1); - NRArenaItem *root = sp_item_invoke_show((SPItem*)(svgDoc->root), + NRArenaItem *root = static_cast(svgDoc->root)->invoke_show( arena, key, SP_ITEM_SHOW_DISPLAY); NRGC gc(NULL); @@ -982,7 +982,7 @@ bool FileOpenDialogImplWin32::set_svg_preview() // Tidy up svgDoc->doUnref(); - sp_item_invoke_hide((SPItem*)(svgDoc->root), key); + static_cast(svgDoc->root)->invoke_hide(key); nr_object_unref((NRObject *) arena); // Create the GDK pixbuf