X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Finstance.cpp;h=89981ad678ba622222fd038052e476cee393bf43;hb=75d9450af83a2fc392104c537aab2aed2f3d1142;hp=f10b08f9b71d5af90db0b0033f03ebfdc191a423;hpb=bd8367952ea2be0ab1e94922922409bf5f9a0be8;p=synfig.git

diff --git a/synfig-studio/trunk/src/gtkmm/instance.cpp b/synfig-studio/trunk/src/gtkmm/instance.cpp
index f10b08f..89981ad 100644
--- a/synfig-studio/trunk/src/gtkmm/instance.cpp
+++ b/synfig-studio/trunk/src/gtkmm/instance.cpp
@@ -54,6 +54,8 @@
 #include <sys/stat.h>
 #include <errno.h>
 
+#include "general.h"
+
 #endif
 
 using namespace std;
@@ -72,7 +74,7 @@ int studio::Instance::instance_count_=0;
 
 /* === M E T H O D S ======================================================= */
 
-Instance::Instance(Canvas::Handle canvas):
+Instance::Instance(synfig::Canvas::Handle canvas):
 	synfigapp::Instance		(canvas),
 //	canvas_tree_store_		(Gtk::TreeStore::create(CanvasTreeModel())),
 //	canvas_tree_store_		(Gtk::TreeStore::create()),
@@ -120,7 +122,7 @@ Instance::get_visible_canvases()const
 }
 
 handle<Instance>
-Instance::create(Canvas::Handle canvas)
+Instance::create(synfig::Canvas::Handle canvas)
 {
 	// Construct a new instance
 	handle<Instance> instance(new Instance(canvas));
@@ -144,7 +146,7 @@ Instance::create(Canvas::Handle canvas)
 }
 
 handle<CanvasView>
-Instance::find_canvas_view(Canvas::Handle canvas)
+Instance::find_canvas_view(etl::handle<synfig::Canvas> canvas)
 {
 	if(!canvas)
 		return 0;
@@ -162,7 +164,7 @@ Instance::find_canvas_view(Canvas::Handle canvas)
 }
 
 void
-Instance::focus(Canvas::Handle canvas)
+Instance::focus(etl::handle<synfig::Canvas> canvas)
 {
 	handle<CanvasView> canvas_view=find_canvas_view(canvas);
 	assert(canvas_view);
@@ -368,7 +370,7 @@ Instance::close()
 
 
 void
-Instance::insert_canvas(Gtk::TreeRow row,Canvas::Handle canvas)
+Instance::insert_canvas(Gtk::TreeRow row, synfig::Canvas::Handle canvas)
 {
 	CanvasTreeModel canvas_tree_model;
 	assert(canvas);
@@ -480,7 +482,7 @@ Instance::dialog_cvs_commit()
 	}
 	catch(...)
 	{
-		App::dialog_error_blocking(_("Error"),_("An error has occured when trying to COMMIT"));
+		App::dialog_error_blocking(_("Error"),_("An error has occurred when trying to COMMIT"));
 	}
 	update_all_titles();
 }
@@ -505,7 +507,7 @@ Instance::dialog_cvs_add()
 	}
 	catch(...)
 	{
-		App::dialog_error_blocking(_("Error"),_("An error has occured when trying to ADD"));
+		App::dialog_error_blocking(_("Error"),_("An error has occurred when trying to ADD"));
 	}
 	update_all_titles();
 }
@@ -546,7 +548,7 @@ Instance::dialog_cvs_update()
 	}
 	catch(...)
 	{
-		App::dialog_error_blocking(_("Error"),_("An error has occured when trying to UPDATE"));
+		App::dialog_error_blocking(_("Error"),_("An error has occurred when trying to UPDATE"));
 	}
 	//update_all_titles();
 }
@@ -582,7 +584,7 @@ Instance::dialog_cvs_revert()
 	}
 	catch(...)
 	{
-		App::dialog_error_blocking(_("Error"),_("An error has occured when trying to UPDATE"));
+		App::dialog_error_blocking(_("Error"),_("An error has occurred when trying to UPDATE"));
 	}
 	//update_all_titles();
 }
@@ -918,7 +920,7 @@ Instance::add_actions_to_menu(Gtk::Menu *menu, const synfigapp::Action::ParamLis
 }
 
 void
-Instance::process_action(String name, synfigapp::Action::ParamList param_list)
+Instance::process_action(synfig::String name, synfigapp::Action::ParamList param_list)
 {
 	assert(synfigapp::Action::book().count(name));