new trim cursors from chrisg, fix up hotspots for said cursors, make Editor cursors...

[ardour.git] / gtk2_ardour / export_dialog.h

diff --git a/gtk2_ardour/export_dialog.h b/gtk2_ardour/export_dialog.h
index 5a1d7839caaddf180ac6ce317b6eedbbbb046a2c..93d3b21654b86c4ba037309a8b5d2c87387317d6 100644 (file)
--- a/gtk2_ardour/export_dialog.h
+++ b/gtk2_ardour/export_dialog.h
@@ -21,9 +21,8 @@
 #ifndef __export_dialog_h__
 #define __export_dialog_h__
 
-#include <boost/shared_ptr.hpp>
+#include <boost/scoped_ptr.hpp>
 
-#include "ardour/export_handler.h"
 #include "ardour/export_profile_manager.h"
 
 #include "public_editor.h"
@@ -35,10 +34,9 @@
 
 #include <gtkmm.h>
 
-#include "i18n.h"
-
 namespace ARDOUR {
        class ExportStatus;
+       class ExportHandler;
 }
 
 class ExportTimespanSelector;
@@ -48,7 +46,7 @@ class ExportDialog : public ArdourDialog {
 
   public:
 
-       explicit ExportDialog (PublicEditor & editor, Glib::ustring title = _("Export"));
+       explicit ExportDialog (PublicEditor & editor, Glib::ustring title);
        ~ExportDialog ();
 
        void set_session (ARDOUR::Session* s);
@@ -75,10 +73,10 @@ class ExportDialog : public ArdourDialog {
        // Must initialize all the shared_ptrs below
        virtual void init_components ();
 
-       boost::shared_ptr<ExportPresetSelector>   preset_selector;
-       boost::shared_ptr<ExportTimespanSelector> timespan_selector;
-       boost::shared_ptr<ExportChannelSelector>  channel_selector;
-       boost::shared_ptr<ExportFileNotebook>     file_notebook;
+       boost::scoped_ptr<ExportPresetSelector>   preset_selector;
+       boost::scoped_ptr<ExportTimespanSelector> timespan_selector;
+       boost::scoped_ptr<ExportChannelSelector>  channel_selector;
+       boost::scoped_ptr<ExportFileNotebook>     file_notebook;
 
        Gtk::VBox                                 warning_widget;
        Gtk::VBox                                 progress_widget;
@@ -107,6 +105,7 @@ class ExportDialog : public ArdourDialog {
 
        PublicEditor &  editor;
        StatusPtr       status;
+       PBD::ScopedConnection abort_connection;
 
        /*** GUI components ***/