X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;ds=sidebyside;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Ficoncontroller.cpp;h=200c6ff702bae63763112e725d7819083458aefa;hb=282b5162f219e2114a59a00743180b45c238680f;hp=1c1ed5918f4d10bd0611927740a13f072570e74e;hpb=756c0d29ac1742f231e6615f9a577e574e35a4af;p=synfig.git

diff --git a/synfig-studio/trunk/src/gtkmm/iconcontroller.cpp b/synfig-studio/trunk/src/gtkmm/iconcontroller.cpp
index 1c1ed59..200c6ff 100644
--- a/synfig-studio/trunk/src/gtkmm/iconcontroller.cpp
+++ b/synfig-studio/trunk/src/gtkmm/iconcontroller.cpp
@@ -162,6 +162,8 @@ IconController::IconController(const synfig::String& /*basepath*/)
 	INIT_STOCK_ICON(grid_snap_enable,"grid_snap_enable_icon."IMAGE_EXT,_("Enable Grid Snap"));
 	INIT_STOCK_ICON(grid_snap_disable,"grid_snap_disable_icon."IMAGE_EXT,_("Disable Grid Snap"));
 	INIT_STOCK_ICON(duplicate,"duplicate_icon."IMAGE_EXT,_("Duplicate"));
+	INIT_STOCK_ICON(encapsulate,"encapsulate_icon."IMAGE_EXT,_("Encapsulate"));
+	INIT_STOCK_ICON(select_all_child_layers,"select_all_child_layers_icon."IMAGE_EXT,_("Select All Child Layers"));
 
 	INIT_STOCK_ICON(clear_undo,"clear_undo_icon."IMAGE_EXT,_("Clear Undo Stack"));
 	INIT_STOCK_ICON(clear_redo,"clear_redo_icon."IMAGE_EXT,_("Clear Redo Stack"));
@@ -331,7 +333,8 @@ studio::get_tree_pixbuf(synfig::ValueBase::Type type)
 	//return Gtk::Button().render_icon(value_icon(type),Gtk::ICON_SIZE_SMALL_TOOLBAR);
 	return _tree_pixbuf_table_value_type[int(type)];
 }
-
+#define TEMPORARY_DELETE_MACRO DELETE
+#undef DELETE
 Gtk::StockID
 studio::get_action_stock_id(const synfigapp::Action::BookEntry& action)
 {
@@ -351,6 +354,8 @@ studio::get_action_stock_id(const synfigapp::Action::BookEntry& action)
 															  action.task);
 	return stock_id;
 }
+#define DELETE TEMPORARY_DELETE_MACRO
+#undef TEMPORARY_DELETE_MACRO
 
 Gtk::StockID
 studio::layer_icon(const synfig::String &layer)