Must strip menu codes from labels before measuring (fixes bug 1400552)

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

diff --git a/src/msw/thread.cpp b/src/msw/thread.cpp
index 2b7b332195248bb470e5111f94a9f3111e6c535c..602968aca608372e4cd2a834f85eef9807770a45 100644 (file)
--- a/src/msw/thread.cpp
+++ b/src/msw/thread.cpp
@@ -10,10 +10,6 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma implementation "thread.h"
-#endif
-

 // ----------------------------------------------------------------------------
 // headers
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // headers
 // ----------------------------------------------------------------------------


@@ -705,7 +701,7 @@ wxThreadInternal::WaitForTerminate(wxCriticalSection& cs,
             }
         }
 
             }
         }
 

-#if defined(__WXWINCE__) && !defined(QS_ALLPOSTMESSAGE)
+#if !defined(QS_ALLPOSTMESSAGE)

 #define QS_ALLPOSTMESSAGE 0
 #endif
 
 #define QS_ALLPOSTMESSAGE 0
 #endif
 


@@ -888,10 +884,9 @@ unsigned long wxThread::GetCurrentId()
     return (unsigned long)::GetCurrentThreadId();
 }
 
     return (unsigned long)::GetCurrentThreadId();
 }
 

-bool wxThread::SetConcurrency(size_t level)
+bool wxThread::SetConcurrency(size_t WXUNUSED_IN_WINCE(level))

 {
 #ifdef __WXWINCE__
 {
 #ifdef __WXWINCE__

-    wxUnusedVar(level);

     return false;
 #else
     wxASSERT_MSG( IsMain(), _T("should only be called from the main thread") );
     return false;
 #else
     wxASSERT_MSG( IsMain(), _T("should only be called from the main thread") );