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

.rainbow

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@11672 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2018-01-09 14:25:15 +00:00
parent 587a04b4e2
commit e28c547a09
3 changed files with 15 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

13
rainbow/SDL20GL/Keys.h
View file

@ -108,3 +108,16 @@ K_CTRL_EQUAL = K_CTRL|0xbb|K_DELTA,
K_CTRL_APOSTROPHE= K_CTRL|0xde|K_DELTA,
K_BREAK = SDLK_PAUSE + K_DELTA, // Is it really?
K_PLUS = SDLK_PLUS,
K_MINUS = SDLK_MINUS,
K_COMMA = SDLK_COMMA,
K_PERIOD = SDLK_PERIOD,
K_SEMICOLON = SDLK_SEMICOLON,
K_SLASH = SDLK_SLASH,
K_GRAVE = SDLK_CARET,
K_LBRACKET = SDLK_LEFTBRACKET,
K_BACKSLASH = SDLK_BACKSLASH,
K_RBRACKET = SDLK_RIGHTBRACKET,
K_QUOTEDBL = SDLK_QUOTEDBL,

2
rainbow/SDL20GL/Top.cpp
View file

@ -42,7 +42,7 @@ void TopWindow::SyncCaption()
frame->sizeable = sizeable;
frame->RefreshLayout();
frame->Refresh();
frame->close <<= Proxy(WhenClose);
frame->close << [=] { WhenClose(); };
frame->icon = icon;
frame->Enable(IsEnabled());
}

2
rainbow/SDL20GL/Wnd.cpp
View file

@ -124,7 +124,7 @@ Ctrl *Ctrl::GetActiveCtrl()
// Vector<Callback> Ctrl::hotkey;
int Ctrl::RegisterSystemHotKey(dword key, Callback cb)
int Ctrl::RegisterSystemHotKey(dword key, Function<void ()> cb)
{
/* ASSERT(key >= K_DELTA);
int q = hotkey.GetCount();