From: Fraser Waters Date: Sat, 22 Feb 2014 14:08:18 +0000 (+0000) Subject: Change bool to IntPtr. X-Git-Tag: 2.0-0~172^2~1^2~9 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9ed32e4445d343c5eac4a002fba7ef6fbaba31a5;p=platform%2Fcore%2Fcsapi%2Fopentk.git Change bool to IntPtr. WindowProc returns an IntPtr not a bool, so let Handle* functions return IntPtr?. If they return a value we return that, if they return null we call DefWindowProc and return the result from that. --- diff --git a/Source/OpenTK/Platform/Windows/WinGLNative.cs b/Source/OpenTK/Platform/Windows/WinGLNative.cs index 5e41c25..2a74fac 100644 --- a/Source/OpenTK/Platform/Windows/WinGLNative.cs +++ b/Source/OpenTK/Platform/Windows/WinGLNative.cs @@ -388,15 +388,15 @@ namespace OpenTK.Platform.Windows } } - private bool HandleSetCursor(IntPtr handle, WindowMessage message, IntPtr wParam, IntPtr lParam) + private IntPtr? HandleSetCursor(IntPtr handle, WindowMessage message, IntPtr wParam, IntPtr lParam) { if (cursor != MouseCursor.Default) { Functions.SetCursor(curson_handle); - return true; + return new IntPtr(1); } - return false; + return null; } void HandleChar(IntPtr handle, WindowMessage message, IntPtr wParam, IntPtr lParam) @@ -666,7 +666,7 @@ namespace OpenTK.Platform.Windows IntPtr WindowProcedure(IntPtr handle, WindowMessage message, IntPtr wParam, IntPtr lParam) { - bool result = false; + IntPtr? result = null; switch (message) { @@ -791,10 +791,9 @@ namespace OpenTK.Platform.Windows #endregion } - if (result) + if (result.HasValue) { - // Return TRUE - return new IntPtr(1); + return result.Value; } else {