Fixed wxPalette memory leak when loading BMP files

[wxWidgets.git] / src / msw / thread.cpp

diff --git a/src/msw/thread.cpp b/src/msw/thread.cpp
index 67cab0e1b81a720c10073752144d25078287c33c..c3703a04564e5a50aebbd31bb01b3cec1526a569 100644 (file)
--- a/src/msw/thread.cpp
+++ b/src/msw/thread.cpp
@@ -440,6 +440,10 @@ bool wxThread::IsMain()
     return ::GetCurrentThreadId() == s_idMainThread;
 }
 
     return ::GetCurrentThreadId() == s_idMainThread;
 }
 

+#ifdef Yield
+#undef Yield
+#endif
+

 void wxThread::Yield()
 {
     // 0 argument to Sleep() is special
 void wxThread::Yield()
 {
     // 0 argument to Sleep() is special


@@ -660,7 +664,7 @@ bool wxThread::IsAlive() const
            (p_internal->GetState() == STATE_PAUSED);
 }
 
            (p_internal->GetState() == STATE_PAUSED);
 }
 

-bool wxThread::TestDestroy() const
+bool wxThread::TestDestroy()

 {
     wxCriticalSectionLocker lock((wxCriticalSection &)m_critsect);
 
 {
     wxCriticalSectionLocker lock((wxCriticalSection &)m_critsect);