Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

build fix for wxMac with wxUSE_THREADS==0

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@54797 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett
2008-07-28 16:58:25 +00:00
parent b65ce02c69
commit 9c521e0003
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/common/strconv.cpp
View File

@@ -2803,7 +2803,9 @@ public:
ubuf = (UniChar*) (buf ? buf : tbuf) ; ubuf = (UniChar*) (buf ? buf : tbuf) ;
#endif #endif
{ {
#if wxUSE_THREADS
wxMutexLocker lock( m_MB2WC_guard ); wxMutexLocker lock( m_MB2WC_guard );
#endif
status = TECConvertText( status = TECConvertText(
m_MB2WC_converter, (ConstTextPtr) psz, byteInLen, &byteInLen, m_MB2WC_converter, (ConstTextPtr) psz, byteInLen, &byteInLen,
(TextPtr) ubuf, byteBufferLen, &byteOutLen); (TextPtr) ubuf, byteBufferLen, &byteOutLen);
@@ -2859,7 +2861,9 @@ public:
#endif #endif
{ {
#if wxUSE_THREADS
wxMutexLocker lock( m_WC2MB_guard ); wxMutexLocker lock( m_WC2MB_guard );
#endif
status = TECConvertText( status = TECConvertText(
m_WC2MB_converter, (ConstTextPtr) ubuf, byteInLen, &byteInLen, m_WC2MB_converter, (ConstTextPtr) ubuf, byteInLen, &byteInLen,
(TextPtr) (buf ? buf : tbuf), byteBufferLen, &byteOutLen); (TextPtr) (buf ? buf : tbuf), byteBufferLen, &byteOutLen);
@@ -2905,9 +2909,10 @@ public:
protected : protected :
mutable TECObjectRef m_MB2WC_converter; mutable TECObjectRef m_MB2WC_converter;
mutable TECObjectRef m_WC2MB_converter; mutable TECObjectRef m_WC2MB_converter;
#if wxUSE_THREADS
mutable wxMutex m_MB2WC_guard; mutable wxMutex m_MB2WC_guard;
mutable wxMutex m_WC2MB_guard; mutable wxMutex m_WC2MB_guard;
#endif
TextEncodingBase m_char_encoding; TextEncodingBase m_char_encoding;
TextEncodingBase m_unicode_encoding; TextEncodingBase m_unicode_encoding;
@@ -2969,7 +2974,9 @@ public :
UniChar *dcubuf = (UniChar*) malloc( dcubuflen ) ; UniChar *dcubuf = (UniChar*) malloc( dcubuflen ) ;
{ {
#if wxUSE_THREADS
wxMutexLocker lock( m_WC2MB_guard ); wxMutexLocker lock( m_WC2MB_guard );
#endif
ConvertFromUnicodeToText( m_uni , byteInLen , ubuf , ConvertFromUnicodeToText( m_uni , byteInLen , ubuf ,
kUnicodeDefaultDirectionMask, 0, NULL, NULL, NULL, dcubuflen , &dcubufread , &dcubufwritten , dcubuf ) ; kUnicodeDefaultDirectionMask, 0, NULL, NULL, NULL, dcubuflen , &dcubufread , &dcubufwritten , dcubuf ) ;
@@ -3029,7 +3036,9 @@ public :
UniChar *dcubuf = (UniChar*) malloc( dcubuflen ) ; UniChar *dcubuf = (UniChar*) malloc( dcubuflen ) ;
{ {
#if wxUSE_THREADS
wxMutexLocker lock( m_MB2WC_guard ); wxMutexLocker lock( m_MB2WC_guard );
#endif
status = TECConvertText( status = TECConvertText(
m_MB2WC_converter, (ConstTextPtr) psz, byteInLen, &byteInLen, m_MB2WC_converter, (ConstTextPtr) psz, byteInLen, &byteInLen,
(TextPtr) dcubuf, dcubuflen, &byteOutLen); (TextPtr) dcubuf, dcubuflen, &byteOutLen);