From 80b73824e16f0a9f781d0f62f364eff1589f98ea Mon Sep 17 00:00:00 2001
From: ehouse <ehouse@0782aaa5-4710-0410-8820-a96bf9123855>
Date: Sat, 7 Jun 2008 14:42:20 +0000
Subject: [PATCH] Cleanup: fix for win32; remove constants that belong in
 cegcc; etc.

---
 xwords4/wince/Makefile   | 10 ++++++----
 xwords4/wince/cedebug.c  |  1 +
 xwords4/wince/cesvdgms.c |  2 ++
 xwords4/wince/debhacks.h | 12 ------------
 4 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/xwords4/wince/Makefile b/xwords4/wince/Makefile
index b21bae49f..e83690fc4 100644
--- a/xwords4/wince/Makefile
+++ b/xwords4/wince/Makefile
@@ -57,11 +57,12 @@ CELIBS = -L${CEOPT_ROOT}/${CE_ARCH}/lib/ -lws2
 endif
 TARGET_OS_DEF = -DTARGET_OS_WINCE
 STANDALONE = -DXWFEATURE_STANDALONE_ONLY
-CFLAGS += -D_WIN32_WCE=400 -D_WIN32_IE=0x0400 -DUNDER_CE -DMY_COLOR_SEL \
+COLOR_SEL = -DMY_COLOR_SEL
+CFLAGS += -D_WIN32_WCE=400 -D_WIN32_IE=0x0400 -DUNDER_CE \
 	$(STANDALONE) $(USE_RAW_MINGW) -DDRAW_LINK_DIRECT \
     -DXWFEATURE_TURNCHANGENOTIFY \
 	-fdollars-in-identifiers -D__W32API_USE_DLLIMPORT__
-RESFLAGS += -DMY_COLOR_SEL -D_WIN32_WCE=400 
+RESFLAGS += -D_WIN32_WCE=400 
 LFLAGS += -Wl,--major-subsystem-version,4,--minor-subsystem-version,20
 ifdef HAVE_COMMCTRL
 CELIBS += -lcommctrl -laygshell
@@ -78,6 +79,7 @@ WINDRES = i586-mingw32msvc-windres
 STRIP = i586-mingw32msvc-strip
 TARGET_OS_DEF = -DTARGET_OS_WIN32
 CELIBS += -lws2_32 
+
 CFLAGS += -DCANT_DO_CMDBAR -DDRAW_LINK_DIRECT -DXWFEATURE_TURNCHANGENOTIFY
 #CFLAGS += -DFORCE_HEIGHT=240 -DFORCE_WIDTH=320
 endif
@@ -87,7 +89,7 @@ CFLAGS += -DARM -I./ -I../common -I../relay
 
 CFLAGS += -Wall -Wunused-parameter
 
-CFLAGS += $(BLUETOOTH) $(RELAY) $(STANDALONE)
+CFLAGS += $(BLUETOOTH) $(RELAY) $(STANDALONE) $(COLOR_SEL)
 
 SVNDEF = -DSVN_REV='\"$(SVNREV)\"'
 CFLAGS += $(SVNDEF)
@@ -164,7 +166,7 @@ XW_BOTH_DEFINES = \
 
 CFLAGS += $(XW_BOTH_DEFINES) -DARM
 RESFLAGS += $(XW_BOTH_DEFINES) $(STANDALONE) $(BLUETOOTH) $(RELAY) \
-	-D_WIN32 -D_WIN32_IE=0x0400 
+	-D_WIN32 -D_WIN32_IE=0x0400 $(COLOR_SEL)
 
 ####################################################################
 # Rules start here
diff --git a/xwords4/wince/cedebug.c b/xwords4/wince/cedebug.c
index 030813cfb..aa7a3bc68 100644
--- a/xwords4/wince/cedebug.c
+++ b/xwords4/wince/cedebug.c
@@ -72,6 +72,7 @@ messageToStr( UINT message )
         CASE_STR( WM_CTLCOLOREDIT );
         CASE_STR( WM_NCDESTROY );
         CASE_STR( WM_NOTIFY );
+        CASE_STR( WM_NCHITTEST );
     default:
         str = "<unknown>";
     }
diff --git a/xwords4/wince/cesvdgms.c b/xwords4/wince/cesvdgms.c
index 537b3677b..1c98aa2aa 100644
--- a/xwords4/wince/cesvdgms.c
+++ b/xwords4/wince/cesvdgms.c
@@ -20,7 +20,9 @@
 #include <windowsx.h>
 #include "stdafx.h" 
 #include <commdlg.h>
+#ifdef _win32_wce
 #include <aygshell.h>
+#endif
 
 #include "cemain.h" 
 #include "cesvdgms.h" 
diff --git a/xwords4/wince/debhacks.h b/xwords4/wince/debhacks.h
index 1e162eb83..1e9327252 100644
--- a/xwords4/wince/debhacks.h
+++ b/xwords4/wince/debhacks.h
@@ -67,18 +67,6 @@ BOOL DH(ResetEvent)(HANDLE);
 
 #endif /* USE_RAW_MINGW */
 
-
-#ifdef _WIN32_WCE
-/* from http://forums.microsoft.com/MSDN/ShowPost.aspx?PostID=1733046&SiteID=1 */
-# define SHMBOF_NODEFAULT    0x00000001 // do not do default handling of this key
-# define SHMBOF_NOTIFY       0x00000002 // send us the WM_* messages for this key
-# define SHCMBM_OVERRIDEKEY  (WM_USER + 403)
-
-
-# define VK_TBACK VK_ESCAPE
-#endif
-
-
 #if 0
  /* http://forums.microsoft.com/MSDN/ShowPost.aspx?PostID=1591512&SiteID=1 */
 #define IM_SPELL 0