From 5ea12405c08cf077c003a598d65a99fbb962d767 Mon Sep 17 00:00:00 2001
From: ehouse <ehouse@0782aaa5-4710-0410-8820-a96bf9123855>
Date: Sat, 27 Sep 2008 15:58:07 +0000
Subject: [PATCH] clean up tile-picker dlg

---
 wince/xwords4.rc | 39 ++++++++++++++++++++++++++++++---------
 1 file changed, 30 insertions(+), 9 deletions(-)

diff --git a/wince/xwords4.rc b/wince/xwords4.rc
index 7432a51fc..721526aa3 100755
--- a/wince/xwords4.rc
+++ b/wince/xwords4.rc
@@ -349,29 +349,50 @@ BEGIN
 #endif
 END
 
-IDD_ASKBLANK DIALOG DISCARDABLE  0, 0, 80, 90
+#define ASKB_DLG_WIDTH 80
+#define ASKB_COLLEFT 5
+#define ASKB_LABELTOP 0
+#define ASKB_LABELHT 36
+#define ASKB_LABELWIDTH 40
+#define ASKB_COMBOLEFT (ASKB_COLLEFT+ASKB_LABELWIDTH)
+#define ASKB_EDITTOP (ASKB_LABELTOP + ASKB_LABELHT)
+#define ASKB_EDITHT 24
+#define ASKB_PUTTOP (ASKB_EDITTOP+ASKB_EDITHT)
+#define WCE_BOTTOM (ASKB_PUTTOP + BUTTON_HT + 4)
+#ifdef _WIN32_WCE
+# define ASKB_DLG_HEIGHT WCE_BOTTOM
+#else
+# define ASKB_DLG_HEIGHT (WCE_BOTTOM + REPOS_BUTTON_HT + 4)
+#endif
+
+
+IDD_ASKBLANK DIALOG DISCARDABLE  0, 0, ASKB_DLG_WIDTH, ASKB_DLG_HEIGHT
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | DS_CENTER
 CAPTION "Tile picker"
 FONT 8, "System"
 BEGIN
-    LTEXT           "Enter a letter for this blank tile.",IDC_BPICK,8,8,50,18
+    LTEXT           "Enter a letter for this blank tile.",IDC_BPICK,
+                    ASKB_COLLEFT,ASKB_LABELTOP,ASKB_LABELWIDTH,ASKB_LABELHT
 #ifdef FEATURE_TRAY_EDIT
-    LTEXT           "Pick a tile for your tray.",IDC_CPICK,8,8,50,18
-    PUSHBUTTON      "Put back",IDC_BACKUP,8,70,28,14
+    LTEXT           "Pick a tile for your tray.",IDC_CPICK,
+                    ASKB_COLLEFT,ASKB_LABELTOP,ASKB_LABELWIDTH,ASKB_LABELHT
+    EDITTEXT        IDC_PICKMSG,ASKB_COLLEFT,ASKB_EDITTOP,80,ASKB_EDITHT,
+                    ES_MULTILINE | ES_READONLY
 
-    EDITTEXT        IDC_PICKMSG,8,28,80,30,ES_MULTILINE | ES_READONLY
+    PUSHBUTTON      "Put back",IDC_BACKUP,ASKB_COLLEFT,ASKB_PUTTOP,35,14
 #endif
 
 #ifdef _WIN32_WCE
-    LISTBOX         BLANKFACE_LIST,65,8,25,12,LISTBOX_CONTROL_FLAGS
+    LISTBOX         BLANKFACE_LIST,ASKB_COMBOLEFT,ASKB_COLLEFT,25,12,
+                    LISTBOX_CONTROL_FLAGS
     CONTROL "",     IDC_ASKBLANK_UPDOWN, UPDOWN_CLASS, SPINNER_CONTROL_FLAGS,
                     0, 0, 0, 0 
 #endif
-    COMBOBOX        BLANKFACE_LIST_PPC,60,5,25,12,
+    COMBOBOX        BLANKFACE_LIST_PPC,ASKB_COMBOLEFT,ASKB_COLLEFT,25,12,
                     CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
 #ifndef _WIN32_WCE
-    DEFPUSHBUTTON   "OK",IDOK,70,70,REPOS_BUTTON_WIDTH, BUTTON_HT
-    PUSHBUTTON      "Cancel",IDCANCEL,20,70,REPOS_BUTTON_WIDTH, BUTTON_HT
+    DEFPUSHBUTTON   "OK",IDOK,80,WCE_BOTTOM,REPOS_BUTTON_WIDTH, BUTTON_HT
+    PUSHBUTTON      "Cancel",IDCANCEL,20,WCE_BOTTOM,REPOS_BUTTON_WIDTH, BUTTON_HT
 #endif
 END