X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;ds=sidebyside;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Fcellrenderer_value.cpp;h=9c4a37200a877e94669cd72b0e1900b15dfbd6f8;hb=6784db1651239a30b80f9b798663a55c1450242f;hp=45490c1a1153cdba14d828c7e8a2dd59cae8725f;hpb=837b63e9fb829d66d43f4f169861f8979f76820d;p=synfig.git

diff --git a/synfig-studio/trunk/src/gtkmm/cellrenderer_value.cpp b/synfig-studio/trunk/src/gtkmm/cellrenderer_value.cpp
index 45490c1..9c4a372 100644
--- a/synfig-studio/trunk/src/gtkmm/cellrenderer_value.cpp
+++ b/synfig-studio/trunk/src/gtkmm/cellrenderer_value.cpp
@@ -65,11 +65,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
@@ -154,7 +149,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 +276,7 @@ CellRenderer_ValueBase::CellRenderer_ValueBase():
 	property_attributes()=attr_list;
 
 	property_foreground()=Glib::ustring("#7f7f7f");
-	property_inconsistant()=false;
+	property_inconsistent()=false;
 }
 
 CellRenderer_ValueBase::~CellRenderer_ValueBase()
@@ -548,13 +543,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());