comparison dwtest.c @ 2597:99fdcb7f2a2a

Don't reuse timerid since on iOS and Android it is not an index to a timer table... it is the actual handle to the timer object. After calling dw_timer_disconnect() on it, the object will be invalid so set the timerid variable to 0 which is an invalid handle.
author bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date Mon, 31 May 2021 16:53:11 +0000
parents 8253e17b20ad
children 1ee59f231f6c
comparison
equal deleted inserted replaced
2596:60ec91d23746 2597:99fdcb7f2a2a
118 container, 118 container,
119 container_mle, 119 container_mle,
120 pagebox, 120 pagebox,
121 containerbox, 121 containerbox,
122 textbox1, textbox2, textboxA, 122 textbox1, textbox2, textboxA,
123 gap_box,
124 buttonbox, 123 buttonbox,
125 buttonsbox, 124 buttonsbox,
126 buttonboxperm, 125 buttonboxperm,
127 cal, 126 cal,
128 scrollbox, 127 scrollbox,
168 { 167 {
169 case VK_LBUTTON : keyname = "VK_LBUTTON"; break; 168 case VK_LBUTTON : keyname = "VK_LBUTTON"; break;
170 case VK_RBUTTON : keyname = "VK_RBUTTON"; break; 169 case VK_RBUTTON : keyname = "VK_RBUTTON"; break;
171 case VK_CANCEL : keyname = "VK_CANCEL"; break; 170 case VK_CANCEL : keyname = "VK_CANCEL"; break;
172 case VK_MBUTTON : keyname = "VK_MBUTTON"; break; 171 case VK_MBUTTON : keyname = "VK_MBUTTON"; break;
173 /* case VK_BACK : keyname = "VK_BACK"; break;*/
174 case VK_TAB : keyname = "VK_TAB"; break; 172 case VK_TAB : keyname = "VK_TAB"; break;
175 case VK_CLEAR : keyname = "VK_CLEAR"; break; 173 case VK_CLEAR : keyname = "VK_CLEAR"; break;
176 case VK_RETURN : keyname = "VK_RETURN"; break; 174 case VK_RETURN : keyname = "VK_RETURN"; break;
177 /* case VK_MENU : keyname = "VK_MENU"; break;*/
178 case VK_PAUSE : keyname = "VK_PAUSE"; break; 175 case VK_PAUSE : keyname = "VK_PAUSE"; break;
179 case VK_CAPITAL : keyname = "VK_CAPITAL"; break; 176 case VK_CAPITAL : keyname = "VK_CAPITAL"; break;
180 case VK_ESCAPE : keyname = "VK_ESCAPE"; break; 177 case VK_ESCAPE : keyname = "VK_ESCAPE"; break;
181 case VK_SPACE : keyname = "VK_SPACE"; break; 178 case VK_SPACE : keyname = "VK_SPACE"; break;
182 case VK_PRIOR : keyname = "VK_PRIOR"; break; 179 case VK_PRIOR : keyname = "VK_PRIOR"; break;
240 case VK_SCROLL : keyname = "VK_SCROLL"; break; 237 case VK_SCROLL : keyname = "VK_SCROLL"; break;
241 case VK_LSHIFT : keyname = "VK_LSHIFT"; break; 238 case VK_LSHIFT : keyname = "VK_LSHIFT"; break;
242 case VK_RSHIFT : keyname = "VK_RSHIFT"; break; 239 case VK_RSHIFT : keyname = "VK_RSHIFT"; break;
243 case VK_LCONTROL: keyname = "VK_LCONTROL"; break; 240 case VK_LCONTROL: keyname = "VK_LCONTROL"; break;
244 case VK_RCONTROL: keyname = "VK_RCONTROL"; break; 241 case VK_RCONTROL: keyname = "VK_RCONTROL"; break;
245 /* case VK_LMENU : keyname = "VK_LMENU"; break; */
246 /* case VK_RMENU : keyname = "VK_RMENU"; break;*/
247 default: keyname = "<unknown>"; break; 242 default: keyname = "<unknown>"; break;
248 } 243 }
249 return keyname; 244 return keyname;
250 } 245 }
251 246
540 } 535 }
541 536
542 int DWSIGNAL beep_callback(HWND window, void *data) 537 int DWSIGNAL beep_callback(HWND window, void *data)
543 { 538 {
544 dw_timer_disconnect(timerid); 539 dw_timer_disconnect(timerid);
540 timerid = 0;
545 return TRUE; 541 return TRUE;
546 } 542 }
547 543
548 int DWSIGNAL keypress_callback(HWND window, char ch, int vk, int state, void *data, char *utf8) 544 int DWSIGNAL keypress_callback(HWND window, char ch, int vk, int state, void *data, char *utf8)
549 { 545 {