forks
/
arsd
mirror of https://github.com/adamdruppe/arsd.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Added try-catch to get meet WndProc nothrow requirement, changed sleep to use Duration

This commit is contained in:
cal 2012-10-06 14:18:59 -08:00
parent fd7bfd5c25
commit 8ef905c906
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
simpledisplay.d
View File

@ -441,13 +441,17 @@ version(Windows) {
alias HWND NativeWindowHandle; alias HWND NativeWindowHandle;
extern(Windows) extern(Windows)
int WndProc(HWND hWnd, UINT iMessage, WPARAM wParam, LPARAM lParam) { int WndProc(HWND hWnd, UINT iMessage, WPARAM wParam, LPARAM lParam) nothrow {
if(hWnd in windowObjects) { try {
auto window = windowObjects[hWnd]; if(hWnd in windowObjects) {
return window.windowProcedure(hWnd, iMessage, wParam, lParam); auto window = windowObjects[hWnd];
} else { return window.windowProcedure(hWnd, iMessage, wParam, lParam);
return DefWindowProc(hWnd, iMessage, wParam, lParam); } else {
} return DefWindowProc(hWnd, iMessage, wParam, lParam);
}
} catch (Exception e) {
assert(false, "Exception caught in WndProc");
}
} }
mixin template NativeScreenPainterImplementation() { mixin template NativeScreenPainterImplementation() {
@ -772,7 +776,7 @@ version(Windows) {
if(!done && handlePulse !is null) if(!done && handlePulse !is null)
handlePulse(); handlePulse();
Thread.sleep(pulseTimeout * 10000); Thread.sleep(dur!"msecs"(pulseTimeout));
} }
} else { } else {
while((ret = GetMessage(&message, hwnd, 0, 0)) != 0) { while((ret = GetMessage(&message, hwnd, 0, 0)) != 0) {