This is the first c++ification commit from me. It handles sp-line, sp-polyline, sp...

[inkscape.git] / src / ui / dialog / filedialog.cpp

diff --git a/src/ui/dialog/filedialog.cpp b/src/ui/dialog/filedialog.cpp
index b1ea5dfee7d0648850b6948928bd7be3e50e937c..68c0926aa6c9b331ec5268cafcd458f487f14187 100644 (file)
--- a/src/ui/dialog/filedialog.cpp
+++ b/src/ui/dialog/filedialog.cpp
@@ -1,7 +1,7 @@
-/**
- * Implementation of the file dialog interfaces defined in filedialog.h
- *
- * Authors:
+/** @file
+ * @brief Implementation of the file dialog interfaces defined in filedialog.h
+ */
+/* Authors:
  *   Bob Jamison
  *   Joel Holdsworth
  *   Other dudes from The Inkscape Organization
@@ -105,16 +105,17 @@ Glib::ustring FileOpenDialog::getFilename()
  * Public factory method.  Used in file.cpp
  */
 FileSaveDialog *FileSaveDialog::create(Gtk::Window& parentWindow,
-                                                                          const Glib::ustring &path,
+                                       const Glib::ustring &path,
                                        FileDialogType fileTypes,
                                        const char *title,
                                        const Glib::ustring &default_key,
-                                       const gchar *docTitle)
+                                       const gchar *docTitle,
+                                       const Inkscape::Extension::FileSaveMethod save_method)
 {
 #ifdef WIN32
-    FileSaveDialog *dialog = new FileSaveDialogImplWin32(parentWindow, path, fileTypes, title, default_key, docTitle);
+    FileSaveDialog *dialog = new FileSaveDialogImplWin32(parentWindow, path, fileTypes, title, default_key, docTitle, save_method);
 #else
-    FileSaveDialog *dialog = new FileSaveDialogImplGtk(parentWindow, path, fileTypes, title, default_key, docTitle);
+    FileSaveDialog *dialog = new FileSaveDialogImplGtk(parentWindow, path, fileTypes, title, default_key, docTitle, save_method);
 #endif
     return dialog;
 }
@@ -165,11 +166,13 @@ 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
  */
- FileExportDialog *FileExportDialog::create(Gtk::Window& parentWindow,
-                                                                                  const Glib::ustring &path,
+FileExportDialog *FileExportDialog::create(Gtk::Window& parentWindow,
+                                           const Glib::ustring &path,
                                            FileDialogType fileTypes,
                                            const char *title,
                                            const Glib::ustring &default_key)
@@ -178,6 +181,8 @@ void FileSaveDialog::appendExtension(Glib::ustring& path, Inkscape::Extension::O
     return dialog;
 }
 
+#endif // NEW_EXPORT_DIALOG
+
 
 } //namespace Dialog
 } //namespace UI
@@ -194,4 +199,4 @@ void FileSaveDialog::appendExtension(Glib::ustring& path, Inkscape::Extension::O
   fill-column:99
   End:
 */
-// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4 :
+// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99 :