From faeb3cedce9ae68adf6acdfec6d9ee23fba9c5e5 Mon Sep 17 00:00:00 2001
From: Julian Smart <julian@anthemion.co.uk>
Date: Wed, 18 Jan 2006 16:56:07 +0000
Subject: [PATCH] Applied patch [ 1380544 ] wxCondition::WaitTimeout() return
 value when timeout occurs

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36977 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 include/wx/thrimpl.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/include/wx/thrimpl.cpp b/include/wx/thrimpl.cpp
index 54f6dd2bfd..c1f13ec3d9 100644
--- a/include/wx/thrimpl.cpp
+++ b/include/wx/thrimpl.cpp
@@ -133,7 +133,12 @@ wxCondError wxConditionInternal::Wait()
     wxSemaError err = m_semaphore.Wait();
     m_mutex.Lock();
 
-    return err == wxSEMA_NO_ERROR ? wxCOND_NO_ERROR : wxCOND_MISC_ERROR;
+    if ( err == wxSEMA_NO_ERROR )
+        return wxCOND_NO_ERROR;
+    else if ( err == wxSEMA_TIMEOUT )
+        return wxCOND_TIMEOUT;
+    else
+        return wxCOND_MISC_ERROR;
 }
 
 wxCondError wxConditionInternal::WaitTimeout(unsigned long milliseconds)
-- 
2.45.2