X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Fstate_eyedrop.cpp;h=6fb940d85a644f44084da74fb2d70363753b29c0;hb=af939bbc5a7e4330cac04f9b3f59583b95ca4eff;hp=e32f494ab9b5ad063b4498362f1a1694e365fadb;hpb=ce408de81ca266b1f334ee9bc6c8fb7ba1492ed4;p=synfig.git

diff --git a/synfig-studio/trunk/src/gtkmm/state_eyedrop.cpp b/synfig-studio/trunk/src/gtkmm/state_eyedrop.cpp
index e32f494..6fb940d 100644
--- a/synfig-studio/trunk/src/gtkmm/state_eyedrop.cpp
+++ b/synfig-studio/trunk/src/gtkmm/state_eyedrop.cpp
@@ -2,7 +2,7 @@
 /*!	\file state_eyedrop.cpp
 **	\brief Template File
 **
-**	$Id: state_eyedrop.cpp,v 1.1.1.1 2005/01/07 03:34:36 darco Exp $
+**	$Id$
 **
 **	\legal
 **	Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
@@ -40,6 +40,8 @@
 #include "canvasview.h"
 #include <synfigapp/main.h>
 
+#include "general.h"
+
 #endif
 
 /* === U S I N G =========================================================== */
@@ -61,7 +63,7 @@ class studio::StateEyedrop_Context
 public:
 	StateEyedrop_Context(CanvasView *canvas_view);
 	~StateEyedrop_Context();
-	
+
 	Smach::event_result event_stop_handler(const Smach::event& x);
 
 	Smach::event_result event_refresh_handler(const Smach::event& x);
@@ -85,7 +87,7 @@ StateEyedrop::StateEyedrop():
 	insert(event_def(EVENT_STOP,&StateEyedrop_Context::event_stop_handler));
 	insert(event_def(EVENT_REFRESH,&StateEyedrop_Context::event_refresh_handler));
 	insert(event_def(EVENT_WORKAREA_MOUSE_BUTTON_DOWN,&StateEyedrop_Context::event_workarea_mouse_button_down_handler));
-}	
+}
 
 StateEyedrop::~StateEyedrop()
 {
@@ -95,9 +97,9 @@ StateEyedrop_Context::StateEyedrop_Context(CanvasView *canvas_view):
 	canvas_view(canvas_view),
 	is_working(*canvas_view)
 {
-	synfig::info("Enterted Eyedrop State");
+	synfig::info("Entered Eyedrop State");
 	canvas_view->work_area->set_cursor(Gdk::Cursor(Gdk::CROSSHAIR));
-	
+
 	App::toolbox->refresh();
 }
 
@@ -109,7 +111,7 @@ StateEyedrop_Context::~StateEyedrop_Context()
 }
 
 Smach::event_result
-StateEyedrop_Context::event_stop_handler(const Smach::event& x)
+StateEyedrop_Context::event_stop_handler(const Smach::event& /*x*/)
 {
 	synfig::info("STATE EYEDROP: Received Stop Event");
 	throw Smach::egress_exception();
@@ -118,7 +120,7 @@ StateEyedrop_Context::event_stop_handler(const Smach::event& x)
 }
 
 Smach::event_result
-StateEyedrop_Context::event_refresh_handler(const Smach::event& x)
+StateEyedrop_Context::event_refresh_handler(const Smach::event& /*x*/)
 {
 	synfig::info("STATE EYEDROP: Received Refresh Event");
 	canvas_view->work_area->queue_render_preview();
@@ -133,7 +135,7 @@ StateEyedrop_Context::event_workarea_mouse_button_down_handler(const Smach::even
 	if(event.button==BUTTON_LEFT)
 	{
 		Color color(canvas_view->get_canvas()->get_context().get_color(event.pos));
-		synfigapp::Main::set_foreground_color(color);
+		synfigapp::Main::set_outline_color(color);
 		studio::App::dialog_color->set_color(color);
 		return Smach::RESULT_ACCEPT;
 	}