diff options
| author | Maximilian Albert <maximilian.albert@gmail.com> | 2009-08-09 16:43:39 +0000 |
|---|---|---|
| committer | cilix42 <cilix42@users.sourceforge.net> | 2009-08-09 16:43:39 +0000 |
| commit | 9289c1726bbd97cb2befcfa19f21a79dd6a45d78 (patch) | |
| tree | f122f098fb7d42731b63a57896bb58e3dc450ef2 /src | |
| parent | Cleanup (remove unused variable; use generic function to determine the file e... (diff) | |
| download | inkscape-9289c1726bbd97cb2befcfa19f21a79dd6a45d78.tar.gz inkscape-9289c1726bbd97cb2befcfa19f21a79dd6a45d78.zip | |
Put #ifdefs around all code related to the so-called "new" ExportDialog (whatever that is)
(bzr r8456)
Diffstat (limited to 'src')
| -rw-r--r-- | src/file.cpp | 5 | ||||
| -rw-r--r-- | src/ui/dialog/filedialog.cpp | 4 | ||||
| -rw-r--r-- | src/ui/dialog/filedialog.h | 5 | ||||
| -rw-r--r-- | src/ui/dialog/filedialogimpl-gtkmm.cpp | 4 | ||||
| -rw-r--r-- | src/ui/dialog/filedialogimpl-gtkmm.h | 3 |
5 files changed, 16 insertions, 5 deletions
diff --git a/src/file.cpp b/src/file.cpp index 8f40d7e4b..420eaec63 100644 --- a/src/file.cpp +++ b/src/file.cpp @@ -1123,9 +1123,6 @@ sp_file_import(Gtk::Window &parentWindow) ## E X P O R T ######################*/ -//#define NEW_EXPORT_DIALOG - - #ifdef NEW_EXPORT_DIALOG @@ -1192,7 +1189,7 @@ sp_file_export_dialog(void *widget) if ( export_path_local.size() > 0) export_path = export_path_local; - //# Show the SaveAs dialog + //# Show the Export dialog Inkscape::UI::Dialog::FileExportDialog *exportDialogInstance = Inkscape::UI::Dialog::FileExportDialog::create( export_path, diff --git a/src/ui/dialog/filedialog.cpp b/src/ui/dialog/filedialog.cpp index 8e372c394..68c0926aa 100644 --- a/src/ui/dialog/filedialog.cpp +++ b/src/ui/dialog/filedialog.cpp @@ -166,6 +166,8 @@ void FileSaveDialog::appendExtension(Glib::ustring& path, Inkscape::Extension::O //# F I L E E X P O R T //######################################################################## +#ifdef NEW_EXPORT_DIALOG + /** * Public factory method. Used in file.cpp */ @@ -179,6 +181,8 @@ FileExportDialog *FileExportDialog::create(Gtk::Window& parentWindow, return dialog; } +#endif // NEW_EXPORT_DIALOG + } //namespace Dialog } //namespace UI diff --git a/src/ui/dialog/filedialog.h b/src/ui/dialog/filedialog.h index f7be86ef3..472c4ac0b 100644 --- a/src/ui/dialog/filedialog.h +++ b/src/ui/dialog/filedialog.h @@ -228,7 +228,9 @@ protected: }; //FileSaveDialog +//#define NEW_EXPORT_DIALOG +#ifdef NEW_EXPORT_DIALOG /** * This class provides an implementation-independent API for @@ -366,12 +368,13 @@ public: }; //FileExportDialog +#endif // NEW_EXPORT_DIALOG + } //namespace Dialog } //namespace UI } //namespace Inkscape - #endif /* __FILE_DIALOG_H__ */ /* diff --git a/src/ui/dialog/filedialogimpl-gtkmm.cpp b/src/ui/dialog/filedialogimpl-gtkmm.cpp index 3e681bd3b..e650cf842 100644 --- a/src/ui/dialog/filedialogimpl-gtkmm.cpp +++ b/src/ui/dialog/filedialogimpl-gtkmm.cpp @@ -1251,6 +1251,8 @@ void FileSaveDialogImplGtk::updateNameAndExtension() } +#ifdef NEW_EXPORT_DIALOG + //######################################################################## //# F I L E E X P O R T //######################################################################## @@ -1607,6 +1609,8 @@ FileExportDialogImpl::getFilename() return myFilename; } +#endif // NEW_EXPORT_DIALOG + } //namespace Dialog } //namespace UI diff --git a/src/ui/dialog/filedialogimpl-gtkmm.h b/src/ui/dialog/filedialogimpl-gtkmm.h index ac868fecc..65bb38971 100644 --- a/src/ui/dialog/filedialogimpl-gtkmm.h +++ b/src/ui/dialog/filedialogimpl-gtkmm.h @@ -357,6 +357,8 @@ private: +#ifdef NEW_EXPORT_DIALOG + //######################################################################## //# F I L E E X P O R T //######################################################################## @@ -573,6 +575,7 @@ private: Glib::ustring myFilename; }; +#endif // NEW_EXPORT_DIALOG } // namespace Dialog } // namespace UI |