Merged revisions 6293,6296-6306,6308 via svnmerge from

[ardour.git] / libs / gtkmm2 / gtk / gtkmm / cellrenderer_generation.h

diff --git a/libs/gtkmm2/gtk/gtkmm/cellrenderer_generation.h b/libs/gtkmm2/gtk/gtkmm/cellrenderer_generation.h
index 309fba4b070601260300c2d0c5fdb8a119a0e309..8c8cc2924a25f7d379e6c1909415d7c829c0ba6d 100644 (file)
--- a/libs/gtkmm2/gtk/gtkmm/cellrenderer_generation.h
+++ b/libs/gtkmm2/gtk/gtkmm/cellrenderer_generation.h
@@ -24,6 +24,7 @@
 #include <gtkmm/cellrenderertext.h>
 #include <gtkmm/cellrendererpixbuf.h>
 #include <gtkmm/cellrenderertoggle.h>
+#include <gtkmm/cellrendereraccel.h>
 
 namespace Gtk
 {
@@ -38,7 +39,12 @@ CellRenderer* generate_cellrenderer(bool editable = false)
   CellRendererText* pCellRenderer = new CellRendererText(); //the default - template specializations will use other renderers.
   //CellRendererText can render both strings and numerical values.
 
+#ifdef GLIBMM_PROPERTIES_ENABLED
   pCellRenderer->property_editable() = editable;
+#else
+  pCellRenderer->set_property("editable", editable);
+#endif
+
   return pCellRenderer;
 }
 
@@ -51,6 +57,9 @@ CellRenderer* generate_cellrenderer<bool>(bool editable);
 template<>
 CellRenderer* generate_cellrenderer< Glib::RefPtr<Gdk::Pixbuf> >(bool editable);
 
+template<>
+CellRenderer* generate_cellrenderer<AccelKey>(bool editable);
+
 #endif
 
 } //CellRenderer_Generation