Remove .gitignore do nothing is ignored.

[synfig.git] / synfig-studio / trunk / src / gtkmm / state_eyedrop.cpp

diff --git a/synfig-studio/trunk/src/gtkmm/state_eyedrop.cpp b/synfig-studio/trunk/src/gtkmm/state_eyedrop.cpp
index bf56d1b..6fb940d 100644 (file)
--- a/synfig-studio/trunk/src/gtkmm/state_eyedrop.cpp
+++ b/synfig-studio/trunk/src/gtkmm/state_eyedrop.cpp
@@ -2,19 +2,20 @@
 /*!    \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 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::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);
@@ -84,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()
 {
@@ -94,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();
 }
 
@@ -108,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();
@@ -117,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();
@@ -132,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;
        }