X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Fcellrenderer_value.cpp;h=fae690b4ab8ae57a763dc0dd3f71c45b2aa13964;hb=72dc78092947e9abef71cc98651a11495682bbaf;hp=6f226645489b998604a5701aecdcaf181ee9d5e9;hpb=d41e1e50cc9b6c49bdb4c556a9b30041c6a7570d;p=synfig.git diff --git a/synfig-studio/trunk/src/gtkmm/cellrenderer_value.cpp b/synfig-studio/trunk/src/gtkmm/cellrenderer_value.cpp index 6f22664..fae690b 100644 --- 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 +#include "general.h" + #endif using namespace synfig; @@ -124,7 +126,6 @@ public: } ~ValueBase_Entry() { - DEBUGPOINT(); } void on_editing_done() @@ -199,8 +200,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,7 +280,7 @@ CellRenderer_ValueBase::CellRenderer_ValueBase(): property_attributes()=attr_list; property_foreground()=Glib::ustring("#7f7f7f"); - property_inconsistant()=false; + property_inconsistent()=false; } CellRenderer_ValueBase::~CellRenderer_ValueBase() @@ -396,7 +400,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 +494,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())