diff options
| author | Andrew Higginson <at.higginson@gmail.com> | 2011-12-27 21:04:47 +0000 |
|---|---|---|
| committer | Andrew <at.higginson@gmail.com> | 2011-12-27 21:04:47 +0000 |
| commit | 80960b623a99aae1402ab651b2974ef544ed3b03 (patch) | |
| tree | ba49d42c2789e9e11f805e2d5263e10f9fedeef8 /src/file.h | |
| parent | try to fix bug (diff) | |
| parent | GDL: Cherry-pick upstream patch 73852 (2011-03-23) - Add missing return value. (diff) | |
| download | inkscape-80960b623a99aae1402ab651b2974ef544ed3b03.tar.gz inkscape-80960b623a99aae1402ab651b2974ef544ed3b03.zip | |
merged with trunk so I can build again...
(bzr r10092.1.36)
Diffstat (limited to 'src/file.h')
| -rw-r--r-- | src/file.h | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/src/file.h b/src/file.h index 4a2b1f91f..620eee074 100644 --- a/src/file.h +++ b/src/file.h @@ -1,5 +1,5 @@ -#ifndef __SP_FILE_H__ -#define __SP_FILE_H__ +#ifndef SEEN_SP_FILE_H +#define SEEN_SP_FILE_H /* * File/Print operations @@ -16,12 +16,11 @@ */ #include <gtkmm.h> -#include <glib/gslist.h> -#include <gtk/gtkwidget.h> +#include <glib.h> +#include <gtk/gtk.h> -#include "ui/dialog/ocaldialogs.h" -#include "extension/extension-forward.h" #include "extension/system.h" +#include "ui/dialog/ocaldialogs.h" struct SPDesktop; struct SPDocument; @@ -130,7 +129,7 @@ void sp_file_import (Gtk::Window &parentWindow); /** * Imports a resource */ -void file_import(SPDocument *in_doc, const Glib::ustring &uri, +SPObject* file_import(SPDocument *in_doc, const Glib::ustring &uri, Inkscape::Extension::Extension *key); /*###################### @@ -189,11 +188,6 @@ would be useful as instance methods */ void sp_file_print (Gtk::Window& parentWindow); -/** - * - */ -void sp_file_print_preview (gpointer object, gpointer data); - /*##################### ## U T I L I T Y #####################*/ @@ -204,7 +198,7 @@ void sp_file_print_preview (gpointer object, gpointer data); void sp_file_vacuum (); -#endif +#endif // SEEN_SP_FILE_H /* |