Fix for unhiding the other version of the base class HitTest

[wxWidgets.git] / include / wx / thread.h

diff --git a/include/wx/thread.h b/include/wx/thread.h
index 7d61023195c87411d40633569bb66ce3c6825f77..6c92c2c425dbf76af09aa966e6aa7da9a97cef4e 100644 (file)
--- a/include/wx/thread.h
+++ b/include/wx/thread.h
@@ -209,7 +209,7 @@ private:
 
 // in order to avoid any overhead under platforms where critical sections are
 // just mutexes make all wxCriticalSection class functions inline
 
 // in order to avoid any overhead under platforms where critical sections are
 // just mutexes make all wxCriticalSection class functions inline

-#if !defined(__WXMSW__)
+#if !defined(__WXMSW__) && !defined(__WXMAC__)

     #define wxCRITSECT_IS_MUTEX 1
 
     #define wxCRITSECT_INLINE inline
     #define wxCRITSECT_IS_MUTEX 1
 
     #define wxCRITSECT_INLINE inline


@@ -261,6 +261,8 @@ private:
 
         wxCritSectBuffer m_buffer;
     };
 
         wxCritSectBuffer m_buffer;
     };

+#elif defined(__WXMAC__)
+    void *m_critRegion ;

 #endif // Unix&OS2/Win32
 
     DECLARE_NO_COPY_CLASS(wxCriticalSection)
 #endif // Unix&OS2/Win32
 
     DECLARE_NO_COPY_CLASS(wxCriticalSection)


@@ -279,7 +281,7 @@ private:
 #undef wxCRITSECT_IS_MUTEX
 
 // wxCriticalSectionLocker is the same to critical sections as wxMutexLocker is
 #undef wxCRITSECT_IS_MUTEX
 
 // wxCriticalSectionLocker is the same to critical sections as wxMutexLocker is

-// to th mutexes
+// to mutexes

 class WXDLLIMPEXP_BASE wxCriticalSectionLocker
 {
 public:
 class WXDLLIMPEXP_BASE wxCriticalSectionLocker
 {
 public:


@@ -403,7 +405,7 @@ private:
 };
 
 // ----------------------------------------------------------------------------
 };
 
 // ----------------------------------------------------------------------------

-// wxThread: class encpasulating a thread of execution
+// wxThread: class encapsulating a thread of execution

 // ----------------------------------------------------------------------------
 
 // there are two different kinds of threads: joinable and detached (default)
 // ----------------------------------------------------------------------------
 
 // there are two different kinds of threads: joinable and detached (default)