mirror of
https://github.com/ultimatepp/ultimatepp.git
synced 2026-07-11 22:03:01 -06:00
theide: Assist++, IconDes fix of DUPLICATE mingw macro problem
git-svn-id: svn://ultimatepp.org/upp/trunk@1295 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
parent
f9847fd30b
commit
8599cc1242
2 changed files with 5 additions and 0 deletions
|
|
@ -1,3 +1,7 @@
|
|||
#ifdef DUPLICATE
|
||||
#undef DUPLICATE
|
||||
#endif
|
||||
|
||||
KEY(INSERT_IMAGE, "Insert image..", K_INSERT)
|
||||
KEY(IMAGE, "Image..", 0)
|
||||
KEY(REMOVE_IMAGE, "Remove image", 0)
|
||||
|
|
|
|||
|
|
@ -289,6 +289,7 @@ void AssistEditor::GatherItems(const String& type, bool only_public, Index<Strin
|
|||
}
|
||||
CppItemInfo& f = assist_item.Add(im.name);
|
||||
f.typei = typei;
|
||||
f.scope = ntp;
|
||||
(CppItem&)f = im;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue