Refactoring: no real changes.

[wxWidgets.git] / include / wx / msw / private.h

diff --git a/include/wx/msw/private.h b/include/wx/msw/private.h
index 3e5465eec32254df85bd303d0ed0fd30ad59384c..b092c66a516a718c9999729f5651cdae805a188b 100644 (file)
--- 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 _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
 
 #if defined (__WXWINCE__)
     #include <wingdi.h>     // RGB, COLORREF

+    #define ERRFALSE(x)

     #include <winuser.h>    // Global Namespaces ::GetKeyState, ::GetWindowRect
     #include <winuser.h>    // Global Namespaces ::GetKeyState, ::GetWindowRect

+    #include "wx/msw/winundef.h"

 #endif
 
 
 #endif
 
 


@@ -32,9 +29,6 @@
     #include "wx/msw/microwin.h"
 #endif
 
     #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"
 
 // Include fixes for MSLU:
 #include "wx/msw/mslu.h"
 


@@ -562,6 +556,7 @@ WXDLLEXPORT void wxDrawLine(HDC hdc, int x1, int y1, int x2, int y2);
 #ifdef __WXWINCE__
 #include <winbase.h>
 
 #ifdef __WXWINCE__
 #include <winbase.h>
 

+#if _WIN32_WCE <= 211

 #define GlobalAlloc LocalAlloc
 #define GlobalFree LocalFree
 #define GlobalLock(mem) mem
 #define GlobalAlloc LocalAlloc
 #define GlobalFree LocalFree
 #define GlobalLock(mem) mem


@@ -571,6 +566,7 @@ WXDLLEXPORT void wxDrawLine(HDC hdc, int x1, int y1, int x2, int y2);
 #define GHND LPTR
 #define GMEM_MOVEABLE 0
 #define GMEM_SHARE 0
 #define GHND LPTR
 #define GMEM_MOVEABLE 0
 #define GMEM_SHARE 0

+#endif

 
 #if 0
 
 
 #if 0