Index: setup/res.rc
===================================================================
RCS file: /cvs/cygwin-apps/setup/res.rc,v
retrieving revision 2.68
diff -u -p -r2.68 res.rc
--- setup/res.rc	30 Nov 2005 22:48:31 -0000	2.68
+++ setup/res.rc	22 Jan 2006 20:28:16 -0000
@@ -189,18 +189,21 @@ STYLE DS_MODALFRAME | DS_CENTER | WS_CHI
 CAPTION "Cygwin Setup"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT           "Installing...",IDC_INS_ACTION,45,55,205,8,NOT WS_GROUP
-    LTEXT           "(PKG)",IDC_INS_PKG,45,70,205,8,NOT WS_GROUP
-    LTEXT           "(FILE)",IDC_INS_FILE,45,85,205,8,NOT WS_GROUP
+    LTEXT           "Installing...",IDC_INS_ACTION,7,55,303,8,
+                    NOT WS_GROUP | SS_LEFTNOWORDWRAP
+    LTEXT           "(PKG)",IDC_INS_PKG,7,70,303,8,
+                    NOT WS_GROUP | SS_LEFTNOWORDWRAP
+    LTEXT           "(FILE)",IDC_INS_FILE,7,85,303,8,
+                    NOT WS_GROUP | SS_LEFTNOWORDWRAP
     CONTROL         "Progress1",IDC_INS_DISKFULL,"msctls_progress32",
-                    PBS_SMOOTH | WS_BORDER,95,130,155,10
+                    PBS_SMOOTH | WS_BORDER,60,130,250,10
     CONTROL         "Progress1",IDC_INS_IPROGRESS,"msctls_progress32",
-                    PBS_SMOOTH | WS_BORDER,95,115,155,10
+                    PBS_SMOOTH | WS_BORDER,60,115,250,10
     CONTROL         "Progress1",IDC_INS_PPROGRESS,"msctls_progress32",
-                    PBS_SMOOTH | WS_BORDER,95,100,155,10
-    LTEXT           "Package:",IDC_INS_BL_PACKAGE,45,100,47,8,NOT WS_GROUP
-    LTEXT           "Total:",IDC_INS_BL_TOTAL,45,115,48,8,NOT WS_GROUP
-    LTEXT           "Disk:",IDC_INS_BL_DISK,45,130,47,8,NOT WS_GROUP
+                    PBS_SMOOTH | WS_BORDER,60,100,250,10
+    LTEXT           "Package:",IDC_INS_BL_PACKAGE,7,100,47,8,NOT WS_GROUP
+    LTEXT           "Total:",IDC_INS_BL_TOTAL,7,115,48,8,NOT WS_GROUP
+    LTEXT           "Disk:",IDC_INS_BL_DISK,7,130,47,8,NOT WS_GROUP
     ICON            IDI_CYGWIN,IDC_HEADICON,290,0,21,20
     CONTROL         "",IDC_HEADSEPARATOR,"Static",SS_BLACKFRAME | SS_SUNKEN,0,28,
                     317,1
Index: setup/threebar.cc
===================================================================
RCS file: /cvs/cygwin-apps/setup/threebar.cc,v
retrieving revision 2.10
diff -u -p -r2.10 threebar.cc
--- setup/threebar.cc	5 May 2005 22:48:36 -0000	2.10
+++ setup/threebar.cc	22 Jan 2006 20:28:22 -0000
@@ -34,9 +34,9 @@
   Sizing information.
  */
 static ControlAdjuster::ControlInfo ThreeBarControlsInfo[] = {
-  {IDC_INS_ACTION, 		CP_LEFT,    CP_TOP},
-  {IDC_INS_PKG, 		CP_LEFT,    CP_TOP},
-  {IDC_INS_FILE, 		CP_LEFT,    CP_TOP},
+  {IDC_INS_ACTION, 		CP_STRETCH, CP_TOP},
+  {IDC_INS_PKG, 		CP_STRETCH, CP_TOP},
+  {IDC_INS_FILE, 		CP_STRETCH, CP_TOP},
   {IDC_INS_DISKFULL, 		CP_STRETCH, CP_TOP},
   {IDC_INS_IPROGRESS, 		CP_STRETCH, CP_TOP},
   {IDC_INS_PPROGRESS,		CP_STRETCH, CP_TOP},