Mercurial > mm7

comparison OSWindow.cpp @ 1830:5ea627a263dd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Clicking works again
author Nomad
date Fri, 11 Oct 2013 10:41:12 +0200
parents 0c75c3e7e436
children 8cd321994943
comparison
equal deleted inserted replaced
1829:e4e27261d84e 1830:5ea627a263dd
55 UI_OnMouseRightClick(0); 55 UI_OnMouseRightClick(0);
56 return true; 56 return true;
57 } 57 }
58 58
59 59
60 bool _507B98_ctrl_pressed = false;
60 bool OSWindow::WinApiMessageProc(UINT msg, WPARAM wparam, LPARAM lparam, LRESULT *result) 61 bool OSWindow::WinApiMessageProc(UINT msg, WPARAM wparam, LPARAM lparam, LRESULT *result)
61 { 62 {
62 switch (msg) 63 switch (msg)
63 { 64 {
64 case WM_KEYUP: 65 case WM_KEYUP:
65 { 66 {
67 if (wparam == VK_CONTROL)
68 _507B98_ctrl_pressed = false;
69
66 OnKey(wparam); 70 OnKey(wparam);
67 return *result = 0, true; 71 return *result = 0, true;
68 } 72 }
69 73
70 case WM_SIZING: return *result = 1, true; 74 case WM_SIZING: return *result = 1, true;
204 if ( wparam == VK_RETURN ) 208 if ( wparam == VK_RETURN )
205 { 209 {
206 if ( !viewparams->field_4C ) 210 if ( !viewparams->field_4C )
207 UI_OnKeyDown(wparam); 211 UI_OnKeyDown(wparam);
208 return 0; 212 return 0;
213 }
214 if (wparam == VK_CONTROL)
215 {
216 _507B98_ctrl_pressed = true;
217 return false;
209 } 218 }
210 if ( wparam == VK_ESCAPE ) 219 if ( wparam == VK_ESCAPE )
211 { 220 {
212 pMessageQueue_50CBD0->AddMessage(UIMSG_Escape, window_SpeakInHouse != 0, 0); 221 pMessageQueue_50CBD0->AddMessage(UIMSG_Escape, window_SpeakInHouse != 0, 0);
213 return 0; 222 return 0;