Remove .gitignore do nothing is ignored.

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

diff --git a/synfig-studio/trunk/src/gtkmm/state_fill.cpp b/synfig-studio/trunk/src/gtkmm/state_fill.cpp
index 28bfa40..60c929a 100644 (file)
--- 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();
@@ -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))
        {