X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5e9670446ab3bb894f2898167d7fd070af98fcaf..e9c0df38e7bdf9dcc527833c6ed7ae30155c24cc:/include/wx/msw/private.h

diff --git a/include/wx/msw/private.h b/include/wx/msw/private.h
index 41c090c595..3d2bf3cb87 100644
--- a/include/wx/msw/private.h
+++ b/include/wx/msw/private.h
@@ -14,16 +14,13 @@
 #ifndef _WX_PRIVATE_H_
 #define _WX_PRIVATE_H_
 
-#ifndef STRICT
-    #define STRICT 1
-#endif
-
-#include <windows.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
 
 
@@ -32,9 +29,6 @@
     #include "wx/msw/microwin.h"
 #endif
 
-// undefine conflicting symbols which were defined in windows.h
-#include "wx/msw/winundef.h"
-
 // Include fixes for MSLU:
 #include "wx/msw/mslu.h"
 
@@ -97,6 +91,8 @@ WXDLLEXPORT_DATA(extern HFONT) wxSTATUS_LINE_FONT;
 
 #define CASTWNDPROC (WndProcCast)
 
+
+
 // ---------------------------------------------------------------------------
 // some stuff for old Windows versions (FIXME: what does it do here??)
 // ---------------------------------------------------------------------------
@@ -555,15 +551,24 @@ WXDLLEXPORT extern wxWindow *wxGetWindowFromHWND(WXHWND hwnd);
 // Get the size of an icon
 WXDLLEXPORT extern wxSize wxGetHiconSize(HICON hicon);
 
+// Lines are drawn differently for WinCE and regular WIN32
+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