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

diff --git a/synfig-studio/trunk/src/gtkmm/state_fill.cpp b/synfig-studio/trunk/src/gtkmm/state_fill.cpp
index 062d716..60c929a 100644
--- a/synfig-studio/trunk/src/gtkmm/state_fill.cpp
+++ b/synfig-studio/trunk/src/gtkmm/state_fill.cpp
@@ -2,19 +2,20 @@
 /*!	\file state_fill.cpp
 **	\brief Template File
 **
-**	$Id: state_fill.cpp,v 1.1.1.1 2005/01/07 03:34:36 darco Exp $
+**	$Id$
 **
 **	\legal
-**	Copyright (c) 2002 Robert B. Quattlebaum Jr.
+**	Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
 **
-**	This software and associated documentation
-**	are CONFIDENTIAL and PROPRIETARY property of
-**	the above-mentioned copyright holder.
+**	This package is free software; you can redistribute it and/or
+**	modify it under the terms of the GNU General Public License as
+**	published by the Free Software Foundation; either version 2 of
+**	the License, or (at your option) any later version.
 **
-**	You may not copy, print, publish, or in any
-**	other way distribute this software without
-**	a prior written agreement with
-**	the copyright holder.
+**	This package is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+**	General Public License for more details.
 **	\endlegal
 */
 /* ========================================================================= */
@@ -39,6 +40,8 @@
 #include "canvasview.h"
 #include <synfigapp/main.h>
 
+#include "general.h"
+
 #endif
 
 /* === U S I N G =========================================================== */
@@ -60,7 +63,7 @@ class studio::StateFill_Context
 public:
 	StateFill_Context(CanvasView *canvas_view);
 	~StateFill_Context();
-	
+
 	Smach::event_result event_stop_handler(const Smach::event& x);
 
 	Smach::event_result event_refresh_handler(const Smach::event& x);
@@ -91,7 +94,7 @@ StateFill::StateFill():
 	insert(event_def(EVENT_STOP,&StateFill_Context::event_stop_handler));
 	insert(event_def(EVENT_REFRESH,&StateFill_Context::event_refresh_handler));
 	insert(event_def(EVENT_WORKAREA_LAYER_CLICKED,&StateFill_Context::event_workarea_layer_clicked_handler));
-}	
+}
 
 StateFill::~StateFill()
 {
@@ -101,9 +104,9 @@ 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();
 }
 
@@ -115,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();
@@ -124,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();
@@ -143,28 +146,28 @@ StateFill_Context::event_workarea_layer_clicked_handler(const Smach::event& x)
 		return Smach::RESULT_ACCEPT;
 	}
 
-	
-	//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;
 	}
 	/*
 	assert(action);
-	
-	action->set_param("canvas",get_canvas());			
-	action->set_param("canvas_interface",get_canvas_interface());			
+
+	action->set_param("canvas",get_canvas());
+	action->set_param("canvas_interface",get_canvas_interface());
 	action->set_param("value_desc",value_desc);
 	action->set_param("time",get_canvas_interface()->get_time());
-	//action->set_param("layer",event.layer);			
+	//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))
 	{
 		get_canvas_view()->get_ui_interface()->warning(_("Unable to set layer color"));