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

correct WinCE compilation after last change: can't use global scope with GlobalLock/Unlock() there

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@52167 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2008-02-28 02:52:26 +00:00
parent c73e37e26b
commit 82d1a19568
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
include/wx/msw/private.h
View File

@@ -597,7 +597,7 @@ private:
HDCMapModeChanger wxMAKE_UNIQUE_NAME(wxHDCMapModeChanger)(hdc, mm) HDCMapModeChanger wxMAKE_UNIQUE_NAME(wxHDCMapModeChanger)(hdc, mm)
#endif // __WXWINCE__/!__WXWINCE__ #endif // __WXWINCE__/!__WXWINCE__
// smart buffeer using GlobalAlloc/GlobalFree() // smart pointer using GlobalAlloc/GlobalFree()
class GlobalPtr class GlobalPtr
{ {
public: public:
@@ -643,7 +643,10 @@ public:
void Init(HGLOBAL hGlobal) void Init(HGLOBAL hGlobal)
{ {
m_hGlobal = hGlobal; m_hGlobal = hGlobal;
m_ptr = ::GlobalLock(hGlobal);
// NB: GlobalLock() is a macro, not a function, hence don't use the
// global scope operator with it (and neither with GlobalUnlock())
m_ptr = GlobalLock(hGlobal);
if ( !m_ptr ) if ( !m_ptr )
wxLogLastError(_T("GlobalLock")); wxLogLastError(_T("GlobalLock"));
} }
@@ -656,7 +659,7 @@ public:
~GlobalPtrLock() ~GlobalPtrLock()
{ {
if ( m_hGlobal && !::GlobalUnlock(m_hGlobal) ) if ( m_hGlobal && !GlobalUnlock(m_hGlobal) )
{ {
#ifdef __WXDEBUG__ #ifdef __WXDEBUG__
// this might happen simply because the block became unlocked // this might happen simply because the block became unlocked