From 8ef905c906bb32b2898a1495d63f4845d141f417 Mon Sep 17 00:00:00 2001
From: cal <callumenator@gmail.com>
Date: Sat, 6 Oct 2012 14:18:59 -0800
Subject: [PATCH] Added try-catch to get meet WndProc nothrow requirement,
 changed sleep to use Duration

---
 simpledisplay.d | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

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