From f065f6432aa1a2c6950ef182e300c1351cda494f Mon Sep 17 00:00:00 2001 From: ehouse Date: Sun, 28 Mar 2004 01:20:32 +0000 Subject: [PATCH] changes for editing colors --- wince/resource.h | 57 ++++++++++++++++++++------ wince/xwords.vcp | 102 +++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 143 insertions(+), 16 deletions(-) diff --git a/wince/resource.h b/wince/resource.h index 405a9b52e..1019dc886 100755 --- a/wince/resource.h +++ b/wince/resource.h @@ -16,11 +16,14 @@ #define IDD_ASKBLANK 113 #define IDD_ASKPASS 116 #define IDD_OPTIONSDLG 117 -#define IDB_FLIPBUTTON 118 -#define IDB_VALUESBUTTON 119 -#define IDB_HINTBUTTON 120 -#define IDB_JUGGLEBUTTON 121 -#define IDB_ORIGIN 122 +#ifdef XWFEATURE_CE_EDITCOLORS +# define IDD_COLORSDLG 118 +#endif +#define IDB_FLIPBUTTON 119 +#define IDB_VALUESBUTTON 120 +#define IDB_HINTBUTTON 121 +#define IDB_JUGGLEBUTTON 122 +#define IDB_ORIGIN 123 #define FLIP_BUTTON_ID 1001 #define VALUE_BUTTON_ID 1002 @@ -79,10 +82,35 @@ #define IDC_BPICK 1050 #define IDC_PICKMSG 1051 #ifdef FEATURE_TRAY_EDIT -# define IDC_CPICK 1052 -# define IDC_PICKALL 1053 +# define IDC_CPICK 1052 +# define IDC_PICKALL 1053 #endif +#ifdef XWFEATURE_CE_EDITCOLORS +# define DLBLTR_BUTTON 1054 +# define DBLWRD_BUTTON 1055 +# define TPLLTR_BUTTON 1056 +# define TPLWRD_BUTTON 1057 +# define EMPCELL_BUTTON 1058 +# define TBACK_BUTTON 1059 +# define PLAYER1_BUTTON 1060 +# define PLAYER2_BUTTON 1061 +# define PLAYER3_BUTTON 1062 +# define PLAYER4_BUTTON 1063 +# define PLAYER1_LABEL 1064 +# define PLAYER2_LABEL 1065 +# define PLAYER3_LABEL 1066 +# define PLAYER4_LABEL 1067 +# define DLBLTR_LABEL 1068 +# define DBLWRD_LABEL 1069 +# define TPLLTR_LABEL 1070 +# define TPLWRD_LABEL 1071 +# define EMPTYCELL_LABEL 1072 +# define TILEBACK_LABEL 1073 +#endif + + + #define IDM_FILE_EXIT 40002 #define IDM_HELP_ABOUT 40003 #define ID_FILE_ABOUT 40004 @@ -102,9 +130,12 @@ #define ID_FILE_SAVEDGAMES 40018 #define ID_EDITTEXT 40019 #define ID_FILE_PREFERENCES 40020 -#define ID_FILE_BEAMDICT 40021 -#define ID_FILE_BEAMBOARDS 40022 -#define ID_GAME_RESENDMSGS 40023 +#ifdef XWFEATURE_CE_EDITCOLORS +# define ID_FILE_EDITCOLORS 40021 +#endif +#define ID_FILE_BEAMDICT 40022 +#define ID_FILE_BEAMBOARDS 40023 +#define ID_GAME_RESENDMSGS 40024 #define ID_COLORS_RES 9999 #define ID_BONUS_RES 9998 @@ -113,9 +144,9 @@ // #ifdef APSTUDIO_INVOKED #ifndef APSTUDIO_READONLY_SYMBOLS -#define _APS_NEXT_RESOURCE_VALUE 123 -#define _APS_NEXT_COMMAND_VALUE 40023 -#define _APS_NEXT_CONTROL_VALUE 1054 +#define _APS_NEXT_RESOURCE_VALUE 124 +#define _APS_NEXT_COMMAND_VALUE 40025 +#define _APS_NEXT_CONTROL_VALUE 1074 #define _APS_NEXT_SYMED_VALUE 101 #endif #endif diff --git a/wince/xwords.vcp b/wince/xwords.vcp index 5c1be81be..a3d58f037 100644 --- a/wince/xwords.vcp +++ b/wince/xwords.vcp @@ -82,10 +82,10 @@ LINK32=link.exe # PROP Target_Dir "" RSC=rc.exe # ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "DEBUG" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /r -# ADD RSC /l 0x409 /d "DEBUG" /d "ARM" /d "_ARM_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "$(CePlatform)" /d "XWFEATURE_STANDALONE_ONLY" /d "FEATURE_TRAY_EDIT" /r +# ADD RSC /l 0x409 /d "DEBUG" /d "ARM" /d "_ARM_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "$(CePlatform)" /d "XWFEATURE_STANDALONE_ONLY" /d "FEATURE_TRAY_EDIT" /d "XWFEATURE_CE_EDITCOLORS" /r CPP=clarm.exe # ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "UNICODE" /D "_UNICODE" /YX /M$(CECrtMTDebug) /c -# ADD CPP /nologo /W3 /Zi /Od /I "." /I "../common" /D "DEBUG" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "UNICODE" /D "_UNICODE" /D "POINTER_SUPPORT" /D "KEY_SUPPORT" /D "__LITTLE_ENDIAN" /D "XWFEATURE_STANDALONE_ONLY" /D "NODE_CAN_4" /D "FEATURE_TRAY_EDIT" /YX /M$(CECrtMTDebug) /c +# ADD CPP /nologo /W3 /Zi /Od /I "." /I "../common" /D "DEBUG" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "UNICODE" /D "_UNICODE" /D "POINTER_SUPPORT" /D "KEY_SUPPORT" /D "__LITTLE_ENDIAN" /D "XWFEATURE_STANDALONE_ONLY" /D "NODE_CAN_4" /D "FEATURE_TRAY_EDIT" /D "XWFEATURE_CE_EDITCOLORS" /YX /M$(CECrtMTDebug) /c MTL=midl.exe # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 @@ -94,7 +94,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 commctrl.lib coredll.lib aygshell.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /debug /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM -# ADD LINK32 winsock.lib commctrl.lib coredll.lib aygshell.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /debug /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM +# ADD LINK32 winsock.lib commctrl.lib coredll.lib commdlg.lib aygshell.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /debug /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM # SUBTRACT LINK32 /pdb:none !ELSEIF "$(CFG)" == "xwords - Win32 (WCE x86) Release" @@ -463,6 +463,101 @@ NODEP_CPP_CEBLA=\ ".\mempool.h"\ +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=.\ceclrsel.c + +!IF "$(CFG)" == "xwords - Win32 (WCE ARM) Release" + +DEP_CPP_CECLR=\ + "..\common\board.h"\ + "..\common\commmgr.h"\ + "..\common\comms.h"\ + "..\common\comtypes.h"\ + "..\common\dawg.h"\ + "..\common\dictnry.h"\ + "..\common\draw.h"\ + "..\common\game.h"\ + "..\common\mempool.h"\ + "..\common\model.h"\ + "..\common\server.h"\ + "..\common\xwstream.h"\ + ".\ceclrsel.h"\ + ".\cemain.h"\ + ".\stdafx.h"\ + ".\xptypes.h"\ + ".\xwords4.h"\ + + +!ELSEIF "$(CFG)" == "xwords - Win32 (WCE ARM) Debug" + +DEP_CPP_CECLR=\ + "..\common\board.h"\ + "..\common\commmgr.h"\ + "..\common\comms.h"\ + "..\common\comtypes.h"\ + "..\common\dawg.h"\ + "..\common\dictnry.h"\ + "..\common\draw.h"\ + "..\common\game.h"\ + "..\common\mempool.h"\ + "..\common\model.h"\ + "..\common\server.h"\ + "..\common\xwstream.h"\ + ".\ceclrsel.h"\ + ".\cemain.h"\ + ".\stdafx.h"\ + ".\xptypes.h"\ + ".\xwords4.h"\ + + +!ELSEIF "$(CFG)" == "xwords - Win32 (WCE x86) Release" + +DEP_CPP_CECLR=\ + "..\common\board.h"\ + "..\common\commmgr.h"\ + "..\common\comms.h"\ + "..\common\comtypes.h"\ + "..\common\dawg.h"\ + "..\common\dictnry.h"\ + "..\common\draw.h"\ + "..\common\game.h"\ + "..\common\mempool.h"\ + "..\common\model.h"\ + "..\common\server.h"\ + "..\common\xwstream.h"\ + ".\ceclrsel.h"\ + ".\cemain.h"\ + ".\stdafx.h"\ + ".\xptypes.h"\ + ".\xwords4.h"\ + + +!ELSEIF "$(CFG)" == "xwords - Win32 (WCE x86) Debug" + +DEP_CPP_CECLR=\ + "..\common\board.h"\ + "..\common\commmgr.h"\ + "..\common\comms.h"\ + "..\common\comtypes.h"\ + "..\common\dawg.h"\ + "..\common\dictnry.h"\ + "..\common\draw.h"\ + "..\common\game.h"\ + "..\common\mempool.h"\ + "..\common\model.h"\ + "..\common\server.h"\ + "..\common\xwstream.h"\ + ".\ceclrsel.h"\ + ".\cemain.h"\ + ".\stdafx.h"\ + ".\xptypes.h"\ + ".\xwords4.h"\ + + !ENDIF # End Source File @@ -813,6 +908,7 @@ DEP_CPP_CEMAI=\ "..\common\xwstream.h"\ ".\ceaskpwd.h"\ ".\ceblank.h"\ + ".\ceclrsel.h"\ ".\cedefines.h"\ ".\cedict.h"\ ".\ceginfo.h"\