X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Fcanvasview.cpp;h=93381d495adf024a907ab9eb65f418465d1b8440;hb=0412ed084660fbab6760d60e1432f8fc161fbc69;hp=4a631a2ae572739851d25136af841f1473d30e41;hpb=321dd0dc08be2ef279c589c1cd2df79dcb6dd682;p=synfig.git

diff --git a/synfig-studio/trunk/src/gtkmm/canvasview.cpp b/synfig-studio/trunk/src/gtkmm/canvasview.cpp
index 4a631a2..93381d4 100644
--- a/synfig-studio/trunk/src/gtkmm/canvasview.cpp
+++ b/synfig-studio/trunk/src/gtkmm/canvasview.cpp
@@ -44,24 +44,60 @@
 #include <gtk/gtktreestore.h>
 #include <gtk/gtkversion.h>
 
+#include <synfig/valuenode_reference.h>
+#include <synfig/valuenode_subtract.h>
+#include <synfig/valuenode_linear.h>
+#include <synfig/valuenode_timedswap.h>
+#include <synfig/valuenode_scale.h>
 #include <synfig/valuenode_dynamiclist.h>
+#include <synfig/valuenode_twotone.h>
+#include <synfig/valuenode_stripes.h>
 #include <synfig/layer.h>
 
 #include <synfigapp/uimanager.h>
 #include <synfigapp/canvasinterface.h>
 #include <synfigapp/selectionmanager.h>
+//#include <synfigapp/action_setwaypoint.h>
+//#include <synfigapp/action_deletewaypoint.h>
 
 #include <sigc++/retype_return.h>
 #include <sigc++/retype.h>
+//#include <sigc++/hide.h>
 
 #include "canvasview.h"
 #include "instance.h"
 #include "app.h"
+#include "cellrenderer_value.h"
 #include "cellrenderer_timetrack.h"
+#include "workarea.h"
+#include "dialog_color.h"
 #include "eventkey.h"
 
+#include "state_polygon.h"
+#include "state_bline.h"
+#include "state_normal.h"
+#include "state_eyedrop.h"
+#include "state_draw.h"
+
+#include "ducktransform_scale.h"
+#include "ducktransform_translate.h"
+#include "ducktransform_rotate.h"
+
+#include "event_mouse.h"
+#include "event_layerclick.h"
+
+#include "toolbox.h"
+
+#include "dialog_preview.h"
+#include "dialog_soundselect.h"
+
+#include "preview.h"
+#include "audiocontainer.h"
 #include "widget_timeslider.h"
 
+#include <synfigapp/main.h>
+#include <synfigapp/inputdevice.h>
+
 #endif
 
 /* === U S I N G =========================================================== */
@@ -517,13 +553,13 @@ public:
 	}
 
 	//! Sets which value_nodes should be selected
-	virtual void set_selected_children(const ChildrenList &children_list)
+	virtual void set_selected_children(const ChildrenList &/*children_list*/)
 	{
 		return;
 	}
 
 	//! Sets which value_node should be selected. Empty handle if none.
-	virtual void set_selected_child(const ChildrenList::value_type &child)
+	virtual void set_selected_child(const ChildrenList::value_type &/*child*/)
 	{
 		return;
 	}
@@ -574,12 +610,12 @@ public:
 		return get_selected_layer_parameters().front();
 	}
 
-	void set_selected_layer_parameters(const LayerParamList &layer_param_list)
+	void set_selected_layer_parameters(const LayerParamList &/*layer_param_list*/)
 	{
 		return;
 	}
 
-	void set_selected_layer_param(const LayerParam &layer_param)
+	void set_selected_layer_param(const LayerParam &/*layer_param*/)
 	{
 		return;
 	}
@@ -1682,7 +1718,7 @@ CanvasView::popup_layer_menu(synfig::Layer::Handle layer)
 
 	//parammenu.items().push_back(Gtk::Menu_Helpers::MenuElem(_("New Layer"),*newlayers));
 
-	if(layer->get_name()=="paste_canvas")
+	if(layer->get_name()=="PasteCanvas")
 	{
 		menu->items().push_back(Gtk::Menu_Helpers::MenuElem(_("Select All Children"),
 			sigc::bind(
@@ -1701,7 +1737,7 @@ CanvasView::popup_layer_menu(synfig::Layer::Handle layer)
 }
 
 void
-CanvasView::register_layer_type(synfig::Layer::Book::value_type &lyr,std::map<synfig::String,Gtk::Menu*>* category_map)
+CanvasView::register_layer_type(synfig::Layer::Book::value_type &/*lyr*/,std::map<synfig::String,Gtk::Menu*>* /*category_map*/)
 {
 /*	if(lyr.second.category==_("Do Not Use"))
 		return;
@@ -1721,7 +1757,7 @@ CanvasView::register_layer_type(synfig::Layer::Book::value_type &lyr,std::map<sy
 }
 
 void
-CanvasView::build_new_layer_menu(Gtk::Menu &menu)
+CanvasView::build_new_layer_menu(Gtk::Menu &/*menu*/)
 {
 /*
 	std::map<synfig::String,Gtk::Menu*> category_map;
@@ -2043,7 +2079,7 @@ CanvasView::add_actions_to_menu(Gtk::Menu *menu, const synfigapp::Action::ParamL
 }
 
 bool
-CanvasView::on_layer_user_click(int button, Gtk::TreeRow row, LayerTree::ColumnID column_id)
+CanvasView::on_layer_user_click(int button, Gtk::TreeRow /*row*/, LayerTree::ColumnID /*column_id*/)
 {
 	switch(button)
 	{
@@ -2110,7 +2146,7 @@ CanvasView::on_layer_user_click(int button, Gtk::TreeRow row, LayerTree::ColumnI
 				build_new_layer_menu(*newlayers);
 
 				parammenu.items().push_back(Gtk::Menu_Helpers::MenuElem("New Layer",*newlayers));
-				if(!multiple_selected && layer->get_name()=="paste_canvas")
+				if(!multiple_selected && layer->get_name()=="PasteCanvas")
 				{
 					parammenu.items().push_back(Gtk::Menu_Helpers::MenuElem(_("Select All Children"),
 						sigc::bind(
@@ -2590,7 +2626,7 @@ CanvasView::rebuild_ducks_layer_(synfig::TransformStack& transform_stack, Canvas
 
 		// If this is a paste canvas layer, then we need to
 		// descend into it
-		if(layer_name=="paste_canvas")
+		if(layer_name=="PasteCanvas")
 		{
 			Vector scale;
 			scale[0]=scale[1]=exp(layer->get_param("zoom").get(Real()));
@@ -2785,7 +2821,9 @@ CanvasView::play()
 		if(!work_area->sync_render_preview())
 			break;
 
-		studio::App::iteration(false);
+		// wait for the workarea to refresh itself
+		while (studio::App::events_pending())
+			studio::App::iteration(false);
 
 		if(get_cancel_status())
 			return;
@@ -2973,7 +3011,7 @@ CanvasView::on_waypoint_delete()
 }
 
 void
-CanvasView::on_drop_drag_data_received(const Glib::RefPtr<Gdk::DragContext>& context, int x, int y, const Gtk::SelectionData& selection_data_, guint info, guint time)
+CanvasView::on_drop_drag_data_received(const Glib::RefPtr<Gdk::DragContext>& context, int /*x*/, int /*y*/, const Gtk::SelectionData& selection_data_, guint /*info*/, guint time)
 {
 	// We will make this true once we have a solid drop
 	bool success(false);
@@ -3006,7 +3044,7 @@ CanvasView::on_drop_drag_data_received(const Glib::RefPtr<Gdk::DragContext>& con
 			if(!get_instance()->perform_action(action))
 				break;
 
-			// Ok, we have successfuly imported at least one item.
+			// Ok, we have successfully imported at least one item.
 			success=true;
 		} while(0); // END of "STRING"