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

GlobalLock/Unlock() are available under CE, no need to redefine them, it is already done in eVC 4 headers

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26611 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2004-04-04 13:02:56 +00:00
parent 14d3c9f7b4
commit 2aaf17c223
1 changed files with 2 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -16,14 +16,6 @@
#include "wx/msw/wrapwin.h" #include "wx/msw/wrapwin.h"
#if defined (__WXWINCE__)
#include <wingdi.h> // RGB, COLORREF
#define ERRFALSE(x)
#include <winuser.h> // Global Namespaces ::GetKeyState, ::GetWindowRect
#include "wx/msw/winundef.h"
#endif
#ifdef __WXMICROWIN__ #ifdef __WXMICROWIN__
// Extra prototypes and symbols not defined by MicroWindows // Extra prototypes and symbols not defined by MicroWindows
#include "wx/msw/microwin.h" #include "wx/msw/microwin.h"
@@ -390,7 +382,6 @@ private:
DECLARE_NO_COPY_CLASS(SelectInHDC) DECLARE_NO_COPY_CLASS(SelectInHDC)
}; };
#ifndef __WXWINCE__
// when working with global pointers (which is unfortunately still necessary // when working with global pointers (which is unfortunately still necessary
// sometimes, e.g. for clipboard) it is important to unlock them exactly as // sometimes, e.g. for clipboard) it is important to unlock them exactly as
// many times as we lock them which just asks for using a "smart lock" class // many times as we lock them which just asks for using a "smart lock" class
@@ -399,7 +390,7 @@ class GlobalPtr
public: public:
GlobalPtr(HGLOBAL hGlobal) : m_hGlobal(hGlobal) GlobalPtr(HGLOBAL hGlobal) : m_hGlobal(hGlobal)
{ {
m_ptr = ::GlobalLock(hGlobal); m_ptr = GlobalLock(hGlobal);
if ( !m_ptr ) if ( !m_ptr )
{ {
wxLogLastError(_T("GlobalLock")); wxLogLastError(_T("GlobalLock"));
@@ -408,7 +399,7 @@ public:
~GlobalPtr() ~GlobalPtr()
{ {
if ( !::GlobalUnlock(m_hGlobal) ) if ( !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
@@ -429,7 +420,6 @@ private:
DECLARE_NO_COPY_CLASS(GlobalPtr) DECLARE_NO_COPY_CLASS(GlobalPtr)
}; };
#endif
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
// macros to make casting between WXFOO and FOO a bit easier: the GetFoo() // macros to make casting between WXFOO and FOO a bit easier: the GetFoo()
@@ -554,58 +544,6 @@ WXDLLEXPORT extern wxSize wxGetHiconSize(HICON hicon);
// Lines are drawn differently for WinCE and regular WIN32 // Lines are drawn differently for WinCE and regular WIN32
WXDLLEXPORT void wxDrawLine(HDC hdc, int x1, int y1, int x2, int y2); WXDLLEXPORT void wxDrawLine(HDC hdc, int x1, int y1, int x2, int y2);
// LocalAlloc should be used on WinCE
#ifdef __WXWINCE__
#include <winbase.h>
#if _WIN32_WCE <= 211
#define GlobalAlloc LocalAlloc
#define GlobalFree LocalFree
#define GlobalLock(mem) mem
#define GlobalUnlock(mem)
#define GlobalSize LocalSize
#define GPTR LPTR
#define GHND LPTR
#define GMEM_MOVEABLE 0
#define GMEM_SHARE 0
#endif
#if 0
HLOCAL
WINAPI
LocalAlloc (
UINT fuFlags,
UINT cbBytes
);
HLOCAL
WINAPI
LocalFree (
HLOCAL hMem
);
#ifndef LMEM_FIXED
#define LMEM_FIXED 0x0000
#define LMEM_MOVEABLE 0x0002
#define LMEM_NOCOMPACT 0x0010 /**** Used for Moveable Memory ***/
#define LMEM_NODISCARD 0x0020 /**** Ignored *****/
#define LMEM_ZEROINIT 0x0040
#define LMEM_MODIFY 0x0080 /*** Used only in LocalReAlloc() **/
#define LMEM_DISCARDABLE 0x0F00 /**** Ignored ****/
#define LMEM_VALID_FLAGS 0x0F72
#define LMEM_INVALID_HANDLE 0x8000
#define LHND (LMEM_MOVEABLE | LMEM_ZEROINIT)
#define LPTR (LMEM_FIXED | LMEM_ZEROINIT)
#endif
#endif
// 0
#endif
// __WXWINCE__
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// 32/64 bit helpers // 32/64 bit helpers
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------