From 19aa3a5d4b1a24c747826c6aeb3acaa5673d03b3 Mon Sep 17 00:00:00 2001 From: Simon Tatham Date: Fri, 21 May 2021 09:10:53 +0100 Subject: [PATCH] Remove leftover Windows CE cruft. Thanks to Kaz Kylheku for pointing out that commit ff3e762fd007883 didn't do a complete job: I removed the code under '#ifdef _WIN32_WCE' in windows.c, but missed sections under the same ifdef in puzzles.h and puzzles.rc, together with an entire header file resource.h that was only included by code under those ifdefs. --- puzzles.h | 8 ------- puzzles.rc | 64 ------------------------------------------------------ resource.h | 20 ----------------- 3 files changed, 92 deletions(-) delete mode 100644 resource.h diff --git a/puzzles.h b/puzzles.h index d46a70e..fd3f67f 100644 --- a/puzzles.h +++ b/puzzles.h @@ -83,14 +83,6 @@ enum { #define REQUIRE_NUMPAD ( 1 << 11 ) /* end of `flags' word definitions */ -#ifdef _WIN32_WCE - /* Pocket PC devices have small, portrait screen that requires more vivid colours */ - #define SMALL_SCREEN - #define PORTRAIT_SCREEN - #define VIVID_COLOURS - #define STYLUS_BASED -#endif - #define IGNOREARG(x) ( (x) = (x) ) typedef struct frontend frontend; diff --git a/puzzles.rc b/puzzles.rc index 4574f52..d566478 100644 --- a/puzzles.rc +++ b/puzzles.rc @@ -10,67 +10,3 @@ 200 RCDATA { 0 } #endif #endif - -#ifdef _WIN32_WCE - -#include -#include - -#define SHMENUBAR RCDATA -#define I_IMAGENONE (-2) -#define IDC_STATIC (-1) - -#include "resource.h" - -IDR_MENUBAR1 MENU DISCARDABLE -BEGIN - POPUP "Game" - BEGIN - MENUITEM "Dummy", 0 - END - POPUP "Type" - BEGIN - MENUITEM "Dummy", 0 - END -END - -IDR_MENUBAR1 SHMENUBAR DISCARDABLE -BEGIN - IDR_MENUBAR1, 2, - I_IMAGENONE, ID_GAME, TBSTATE_ENABLED, - TBSTYLE_DROPDOWN | TBSTYLE_AUTOSIZE, IDS_CAP_GAME, 0, 0, - I_IMAGENONE, ID_TYPE, TBSTATE_ENABLED, - TBSTYLE_DROPDOWN | TBSTYLE_AUTOSIZE, IDS_CAP_TYPE, 0, 1, -END - -STRINGTABLE DISCARDABLE -BEGIN - IDS_CAP_GAME "Game" - IDS_CAP_TYPE "Type" -END - -IDD_ABOUT DIALOG DISCARDABLE 0, 0, 0, 0 -STYLE WS_POPUP -FONT 8, "Tahoma" -BEGIN - LTEXT "", IDC_ABOUT_CAPTION, 4, 4, 150, 8 - LTEXT "", IDC_ABOUT_LINE, 4, 16, 150, 1, WS_BORDER - LTEXT "", IDC_ABOUT_GAME, 4, 22, 150, 8 - LTEXT "from Simon Tatham's Portable Puzzle Collection", - IDC_STATIC, 4, 36, 150, 8, SS_LEFTNOWORDWRAP - LTEXT "Pocket PC port by Darek Olszewski", - IDC_STATIC, 4, 46, 150, 8 - LTEXT "", IDC_ABOUT_VERSION, 4, 60, 150, 8 -END - -IDD_CONFIG DIALOG DISCARDABLE 0, 0, 0, 0 -STYLE WS_POPUP -FONT 8, "Tahoma" -BEGIN - LTEXT "", IDC_CONFIG_CAPTION, 4, 4, 150, 8 - LTEXT "", IDC_CONFIG_LINE, 4, 16, 150, 1, WS_BORDER -END - -IDR_PADTOOLBAR BITMAP DISCARDABLE "padtoolbar.bmp" - -#endif /* _WIN32_WCE */ diff --git a/resource.h b/resource.h deleted file mode 100644 index f0bfa16..0000000 --- a/resource.h +++ /dev/null @@ -1,20 +0,0 @@ - -#define IDR_MENUBAR1 101 - -#define ID_GAME 40005 -#define ID_TYPE 40006 - -#define IDS_CAP_GAME 40105 -#define IDS_CAP_TYPE 40106 - -#define IDD_ABOUT 2000 -#define IDC_ABOUT_CAPTION 2001 -#define IDC_ABOUT_LINE 2002 -#define IDC_ABOUT_GAME 2003 -#define IDC_ABOUT_VERSION 2004 - -#define IDD_CONFIG 2100 -#define IDC_CONFIG_CAPTION 2101 -#define IDC_CONFIG_LINE 2102 - -#define IDR_PADTOOLBAR 4000