projects
/
synfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Show a 'zoom to fit' icon in the zoomdial as well as a 'zoom 100%' icon.
[synfig.git]
/
synfig-studio
/
trunk
/
src
/
gtkmm
/
iconcontroller.cpp
diff --git
a/synfig-studio/trunk/src/gtkmm/iconcontroller.cpp
b/synfig-studio/trunk/src/gtkmm/iconcontroller.cpp
index
912487e
..
d7dcde5
100644
(file)
--- a/
synfig-studio/trunk/src/gtkmm/iconcontroller.cpp
+++ b/
synfig-studio/trunk/src/gtkmm/iconcontroller.cpp
@@
-334,6
+334,11
@@
studio::get_tree_pixbuf(synfig::ValueBase::Type type)
return _tree_pixbuf_table_value_type[int(type)];
}
return _tree_pixbuf_table_value_type[int(type)];
}
+#ifdef WIN32
+#define TEMPORARY_DELETE_MACRO DELETE
+#undef DELETE
+#endif
+
Gtk::StockID
studio::get_action_stock_id(const synfigapp::Action::BookEntry& action)
{
Gtk::StockID
studio::get_action_stock_id(const synfigapp::Action::BookEntry& action)
{
@@
-354,6
+359,11
@@
studio::get_action_stock_id(const synfigapp::Action::BookEntry& action)
return stock_id;
}
return stock_id;
}
+#ifdef WIN32
+#define DELETE TEMPORARY_DELETE_MACRO
+#undef TEMPORARY_DELETE_MACRO
+#endif
+
Gtk::StockID
studio::layer_icon(const synfig::String &layer)
{
Gtk::StockID
studio::layer_icon(const synfig::String &layer)
{