X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Fstate_fill.cpp;h=60c929a6c74b1e12ed221daf9daa6cac43315260;hb=9459638ad6797b8139f1e9f0715c96076dbf0890;hp=b09951ae2a6b55dd5caf3c096f7fd40fdd072d03;hpb=837b63e9fb829d66d43f4f169861f8979f76820d;p=synfig.git

diff --git a/synfig-studio/trunk/src/gtkmm/state_fill.cpp b/synfig-studio/trunk/src/gtkmm/state_fill.cpp
index b09951a..60c929a 100644
--- a/synfig-studio/trunk/src/gtkmm/state_fill.cpp
+++ b/synfig-studio/trunk/src/gtkmm/state_fill.cpp
@@ -40,6 +40,8 @@
 #include "canvasview.h"
 #include <synfigapp/main.h>
 
+#include "general.h"
+
 #endif
 
 /* === U S I N G =========================================================== */
@@ -102,7 +104,7 @@ StateFill_Context::StateFill_Context(CanvasView *canvas_view):
 	canvas_view(canvas_view),
 	is_working(*canvas_view)
 {
-	synfig::info("Enterted Fill State");
+	synfig::info("Entered Fill State");
 	canvas_view->work_area->set_cursor(Gdk::CROSSHAIR);
 
 	App::toolbox->refresh();
@@ -116,7 +118,7 @@ StateFill_Context::~StateFill_Context()
 }
 
 Smach::event_result
-StateFill_Context::event_stop_handler(const Smach::event& x)
+StateFill_Context::event_stop_handler(const Smach::event& /*x*/)
 {
 	synfig::info("STATE FILL: Received Stop Event");
 	throw Smach::egress_exception();
@@ -125,7 +127,7 @@ StateFill_Context::event_stop_handler(const Smach::event& x)
 }
 
 Smach::event_result
-StateFill_Context::event_refresh_handler(const Smach::event& x)
+StateFill_Context::event_refresh_handler(const Smach::event& /*x*/)
 {
 	synfig::info("STATE FILL: Received Refresh Event");
 	canvas_view->work_area->queue_render_preview();
@@ -145,10 +147,10 @@ StateFill_Context::event_workarea_layer_clicked_handler(const Smach::event& x)
 	}
 
 
-	//synfigapp::Action::Handle action(synfigapp::Action::create("value_desc_set"));
+	//synfigapp::Action::Handle action(synfigapp::Action::create("ValueDescSet"));
 	synfigapp::ValueDesc value_desc(event.layer,"color");
 
-	if(!get_canvas_interface()->change_value(value_desc,ValueBase(synfigapp::Main::get_foreground_color())))
+	if(!get_canvas_interface()->change_value(value_desc,ValueBase(synfigapp::Main::get_fill_color())))
 	{
 		get_canvas_view()->get_ui_interface()->warning(_("Unable to set layer color"));
 		return Smach::RESULT_ERROR;
@@ -163,8 +165,8 @@ StateFill_Context::event_workarea_layer_clicked_handler(const Smach::event& x)
 	//action->set_param("layer",event.layer);
 	//if(!action->set_param("param",String("color")))
 	//	synfig::error("LayerParamConnect didn't like \"param\"");
-	if(!action->set_param("new_value",ValueBase(synfigapp::Main::get_foreground_color())))
-		synfig::error("LayerParamConnect didn't like \"foreground_color\"");
+	if(!action->set_param("new_value",ValueBase(synfigapp::Main::get_fill_color())))
+		synfig::error("LayerParamConnect didn't like \"fill_color\"");
 
 	if(!get_canvas_interface()->get_instance()->perform_action(action))
 	{