X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Fworkarea.cpp;h=01b9a0a328a41ddd33ecbda1f942f3098c7fa2f0;hb=215f2742c34cedf77a8cd0ffdef8f8b6e95efdfe;hp=56ee2dc61b373fcaeb30aa8cad1c2f5fcc4d13dd;hpb=9cf07d9e2e127980c2edbfea4f92d0fa02f13310;p=synfig.git

diff --git a/synfig-studio/trunk/src/gtkmm/workarea.cpp b/synfig-studio/trunk/src/gtkmm/workarea.cpp
index 56ee2dc..01b9a0a 100644
--- a/synfig-studio/trunk/src/gtkmm/workarea.cpp
+++ b/synfig-studio/trunk/src/gtkmm/workarea.cpp
@@ -262,7 +262,7 @@ public:
 	}
 
 
-	virtual bool start_frame(synfig::ProgressCallback *cb)
+	virtual bool start_frame(synfig::ProgressCallback */*cb*/)
 	{
 		synfig::Mutex::Lock lock(mutex);
 
@@ -506,7 +506,7 @@ public:
 	}
 
 
-	virtual bool start_frame(synfig::ProgressCallback *cb)
+	virtual bool start_frame(synfig::ProgressCallback */*cb*/)
 	{
 		return true;
 	}
@@ -787,7 +787,7 @@ WorkArea::WorkArea(etl::loose_handle<synfigapp::CanvasInterface> canvas_interfac
 		if(!data.empty())
 		{
 			if(!load_sketch(data))
-				load_sketch(dirname(canvas->get_file_name())+ETL_DIRECTORY_SEPERATOR+basename(data));
+				load_sketch(dirname(canvas->get_file_name())+ETL_DIRECTORY_SEPARATOR+basename(data));
 		}
 	}
 
@@ -1781,7 +1781,7 @@ WorkArea::on_drawing_area_event(GdkEvent *event)
 }
 
 bool
-WorkArea::on_hruler_event(GdkEvent *event)
+WorkArea::on_hruler_event(GdkEvent */*event*/)
 {
 /*
 	switch(event->type)
@@ -1838,7 +1838,7 @@ WorkArea::on_hruler_event(GdkEvent *event)
 }
 
 bool
-WorkArea::on_vruler_event(GdkEvent *event)
+WorkArea::on_vruler_event(GdkEvent */*event*/)
 {
 /*
 	switch(event->type)
@@ -1932,7 +1932,7 @@ WorkArea::screen_to_comp_coords(synfig::Point pos)const
 }
 
 synfig::Point
-WorkArea::comp_to_screen_coords(synfig::Point pos)const
+WorkArea::comp_to_screen_coords(synfig::Point /*pos*/)const
 {
 	synfig::warning("WorkArea::comp_to_screen_coords: Not yet implemented");
 	return synfig::Point();
@@ -2119,6 +2119,8 @@ WorkArea::set_quality(int x)
 }
 
 
+namespace studio
+{
 class WorkAreaProgress : public synfig::ProgressCallback
 {
 	WorkArea *work_area;
@@ -2156,6 +2158,7 @@ public:
 		return cb->amount_complete(current,total);
 	}
 };
+}
 
 bool
 studio::WorkArea::async_update_preview()
@@ -2254,7 +2257,7 @@ studio::WorkArea::async_update_finished()
 	if(!async_renderer)
 		return;
 
-	// If we completed successfuly, then
+	// If we completed successfully, then
 	// we aren't dirty anymore
 	if(async_renderer->has_success())
 	{
@@ -2366,7 +2369,7 @@ again:
 	// it is being displayed correctly
 	drawing_area->queue_draw();
 
-	// If we completed successfuly, then
+	// If we completed successfully, then
 	// we aren't dirty anymore
 	if(ret)
 	{
@@ -2534,7 +2537,12 @@ studio::WorkArea::queue_render_preview()
 	{
 		//synfig::info("queue_render_preview(): (re)queuing...");
 		//render_idle_func_id=g_idle_add_full(G_PRIORITY_DEFAULT,__render_preview,this,NULL);
-		render_idle_func_id=g_timeout_add_full(G_PRIORITY_DEFAULT,queue_time,__render_preview,this,NULL);
+		render_idle_func_id=g_timeout_add_full(
+			G_PRIORITY_DEFAULT,	// priority - 
+			queue_time,			// interval - the time between calls to the function, in milliseconds (1/1000ths of a second)
+			__render_preview,	// function - function to call
+			this,				// data     - data to pass to function
+			NULL);				// notify   - function to call when the idle is removed, or NULL
 		queued=true;
 	}
 /*	else if(rendering)