mirror of
https://github.com/amyinspace/MagicSetEditor2.git
synced 2026-06-11 21:27:01 -04:00
Reverted resource references for combine_something, you can't use tool_image here, because on MSW that only works for .bmps'
Added dependency stuff to invalidate Choice images; Fixed 'duplicate' in symbol editor git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@197 0fc631ac-6414-0410-93d0-97cfa31319b6
This commit is contained in:
+1
-1
@@ -12,6 +12,6 @@
|
||||
|
||||
// what a waste of a source file...
|
||||
|
||||
AtomicInt Age::new_age(0);
|
||||
AtomicInt Age::new_age(2);
|
||||
|
||||
IMPLEMENT_DYNAMIC_ARG(AtomicIntEquiv, last_update_age, 0);
|
||||
|
||||
@@ -23,6 +23,11 @@ class Age {
|
||||
Age() {
|
||||
update();
|
||||
}
|
||||
/// Create a special age
|
||||
/** 0: dummy value, used for other purposes
|
||||
* 1: before 'beginning of time', the age conceptually just before program start
|
||||
* 2..: normal ages
|
||||
*/
|
||||
Age(AtomicIntEquiv age) : age(age) {}
|
||||
|
||||
/// Update the age to become the newest one
|
||||
|
||||
@@ -48,7 +48,6 @@ enum MenuID {
|
||||
, ID_EDIT_COPY = wxID_COPY
|
||||
, ID_EDIT_PASTE = wxID_PASTE
|
||||
, ID_EDIT_DELETE = 101
|
||||
, ID_EDIT_DUPLICATE = 102
|
||||
, ID_EDIT_FIND = wxID_FIND
|
||||
, ID_EDIT_FIND_NEXT = 103
|
||||
, ID_EDIT_REPLACE = wxID_REPLACE
|
||||
@@ -117,6 +116,7 @@ enum ChildMenuID {
|
||||
, ID_PART_OVERLAP = ID_PART + 4//PART_OVERLAP
|
||||
, ID_PART_BORDER = ID_PART + 5//PART_BORDER
|
||||
, ID_PART_MAX
|
||||
, ID_EDIT_DUPLICATE // duplicating symbol parts
|
||||
|
||||
// SymbolPointEditor toolbar/menu
|
||||
, ID_SEGMENT = 2101
|
||||
|
||||
Reference in New Issue
Block a user