github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-05-15 14:16:07 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

CtrlLib: MacMenu now using postcallback to invoke action to avoid cosmetic issues

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@13523 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2019-08-04 07:24:54 +00:00
parent 915686c643
commit bcd2ff37a8
3 changed files with 1 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

2
uppsrc/CtrlLib/MacMenu.mm
View file

@ -129,7 +129,7 @@ void CocoMenuBar::MenuAction(id sender)
for(const Item& m : item)
if(m.nsitem == sender) {
ResetCocoaMouse();
m.cb();
PostCallback(m.cb);
break;
}
}

4
uppsrc/Draw/Image.h
View file

@ -306,10 +306,6 @@ public:
int Find(const String& id) const { return map.Find(id); }
void Set(int i, const Image& img);
#ifdef _DEBUG
int GetBinSize() const;
#endif
ImageIml GetRaw(int mode, int i); // tries to get image for mode, can return Null
ImageIml GetRaw(int mode, const String& id); // tries to get image for mode by id, can return Null

14
uppsrc/Draw/Iml.cpp
View file

@ -141,20 +141,6 @@ Image Iml::Get(int i)
return m.image;
}
#ifdef _DEBUG
int Iml::GetBinSize() const
{
int size = 0;
for(int i = 0; i < map.GetCount(); i++) {
const Image::Init& init = img_init[i];
size += (int)strlen(name[i]) + 1 + 24;
for(int q = 0; q < init.scan_count; q++)
size += (int)strlen(init.scans[q]);
}
return size;
}
#endif
Iml::Iml(const char **name, int n)
: name(name)
{