X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Fcellrenderer_value.cpp;h=802a178da8a0c60e89b121419741976d970ba459;hb=756c0d29ac1742f231e6615f9a577e574e35a4af;hp=459a59508d4ca0d293eb8e7159304c1d5eeb0be6;hpb=b10a7e1fa5b5e41debef35a38d084f4260247fee;p=synfig.git diff --git a/synfig-studio/trunk/src/gtkmm/cellrenderer_value.cpp b/synfig-studio/trunk/src/gtkmm/cellrenderer_value.cpp index 459a595..802a178 100644 --- a/synfig-studio/trunk/src/gtkmm/cellrenderer_value.cpp +++ b/synfig-studio/trunk/src/gtkmm/cellrenderer_value.cpp @@ -6,6 +6,7 @@ ** ** \legal ** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley +** Copyright (c) 2007, 2008 Chris Moore ** ** This package is free software; you can redistribute it and/or ** modify it under the terms of the GNU General Public License as @@ -54,6 +55,8 @@ #include "dialog_color.h" #include +#include "general.h" + #endif using namespace synfig; @@ -124,7 +127,6 @@ public: } ~ValueBase_Entry() { - DEBUGPOINT(); } void on_editing_done() @@ -199,8 +201,11 @@ public: { if(valuewidget) return valuewidget->get_value(); - return synfig::ValueBase(); + + warning("%s:%d this code shouldn't be reached", __FILE__, __LINE__); + return *(new synfig::ValueBase()); } + const Glib::ustring &get_path() { return path; @@ -276,12 +281,13 @@ CellRenderer_ValueBase::CellRenderer_ValueBase(): property_attributes()=attr_list; property_foreground()=Glib::ustring("#7f7f7f"); - property_inconsistant()=false; + property_inconsistent()=false; } CellRenderer_ValueBase::~CellRenderer_ValueBase() { -// synfig::info("CellRenderer_ValueBase::~CellRenderer_ValueBase(): deleted"); + if (getenv("SYNFIG_DEBUG_DESTRUCTORS")) + synfig::info("CellRenderer_ValueBase::~CellRenderer_ValueBase(): Deleted"); } void @@ -396,7 +402,7 @@ CellRenderer_ValueBase::render_vfunc( if(data.get(etl::handle())) { if(data.get(etl::handle())->is_inline()) - property_text()=""; + property_text()=_(""); else property_text()=(Glib::ustring)data.get(etl::handle())->get_id(); } @@ -490,12 +496,12 @@ CellRenderer_ValueBase::color_edited(synfig::Color color, Glib::ustring path) Gtk::CellEditable* CellRenderer_ValueBase::start_editing_vfunc( - GdkEvent* event, + GdkEvent* event __attribute__ ((unused)), Gtk::Widget& widget, const Glib::ustring& path, - const Gdk::Rectangle& background_area, - const Gdk::Rectangle& cell_area, - Gtk::CellRendererState flags) + const Gdk::Rectangle& background_area __attribute__ ((unused)), + const Gdk::Rectangle& cell_area __attribute__ ((unused)), + Gtk::CellRendererState flags __attribute__ ((unused))) { // If we aren't editable, then there is nothing to do if(!property_editable()) @@ -543,13 +549,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());