Removed a bunch more DEBUGPOINT()s.

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

diff --git a/synfig-studio/trunk/src/gtkmm/cellrenderer_value.cpp b/synfig-studio/trunk/src/gtkmm/cellrenderer_value.cpp
index 45490c1..98487b6 100644 (file)
--- a/synfig-studio/trunk/src/gtkmm/cellrenderer_value.cpp
+++ b/synfig-studio/trunk/src/gtkmm/cellrenderer_value.cpp
@@ -54,6 +54,8 @@
 #include "dialog_color.h"
 #include <gtkmm/textview.h>
 
+#include "general.h"
+
 #endif
 
 using namespace synfig;
@@ -65,11 +67,6 @@ using namespace studio;
 
 #define DIGITS         15
 
-#define use_colorspace_gamma() App::use_colorspace_gamma
-#define colorspace_gamma()     (2.2f)
-#define gamma_in(x)            pow((float)x,1.0f/colorspace_gamma())
-#define gamma_out(x)   pow((float)x,colorspace_gamma())
-
 /* === G L O B A L S ======================================================= */
 
 class studio::ValueBase_Entry : public Gtk::EventBox, public Gtk::CellEditable
@@ -129,7 +126,6 @@ public:
        }
        ~ValueBase_Entry()
        {
-               DEBUGPOINT();
        }
 
        void on_editing_done()
@@ -154,7 +150,7 @@ public:
                if(parent)parent->grab_focus();
                Gtk::CellEditable::on_remove_widget();
        }
-       void start_editing_vfunc(GdkEvent *event)
+       void start_editing_vfunc(GdkEvent */*event*/)
        {
                valuewidget->signal_activate().connect(sigc::mem_fun(*this, &studio::ValueBase_Entry::editing_done));
                show();
@@ -281,7 +277,7 @@ CellRenderer_ValueBase::CellRenderer_ValueBase():
        property_attributes()=attr_list;
 
        property_foreground()=Glib::ustring("#7f7f7f");
-       property_inconsistant()=false;
+       property_inconsistent()=false;
 }
 
 CellRenderer_ValueBase::~CellRenderer_ValueBase()
@@ -401,7 +397,7 @@ CellRenderer_ValueBase::render_vfunc(
                if(data.get(etl::handle<synfig::Canvas>()))
                {
                        if(data.get(etl::handle<synfig::Canvas>())->is_inline())
-                               property_text()="<Inline Canvas>";
+                               property_text()=_("<Inline Canvas>");
                        else
                                property_text()=(Glib::ustring)data.get(etl::handle<synfig::Canvas>())->get_id();
                }
@@ -548,13 +544,11 @@ CellRenderer_ValueBase::start_editing_vfunc(
                        synfig::String string;
                        string=data.get(string);
                        if(get_paragraph(string))
-                       {
                                signal_edited_(path,ValueBase(string));
-                       }
                        return NULL;
                }
-               if(get_param_desc().get_hint()!="filename")
-                       return CellRendererText::start_editing_vfunc(event,widget,path,background_area,cell_area,flags);
+               // if(get_param_desc().get_hint()!="filename")
+                       // return CellRendererText::start_editing_vfunc(event,widget,path,background_area,cell_area,flags);
        default:
                {
                        assert(get_canvas());