From 73c4349b14de2ce9c574ab8b4f590caf609d6424 Mon Sep 17 00:00:00 2001 From: Eric Kohl Date: Sat, 27 Nov 2004 13:33:40 +0000 Subject: [PATCH] Enlarge the timezone combobox so that more timezones are displayed. svn path=/trunk/; revision=11830 --- reactos/lib/syssetup/syssetup_Cz.rc | 8 ++++---- reactos/lib/syssetup/syssetup_De.rc | 8 ++++---- reactos/lib/syssetup/syssetup_En.rc | 8 ++++---- reactos/lib/syssetup/syssetup_Fr.rc | 8 ++++---- reactos/lib/syssetup/wizard.c | 12 ++++++------ 5 files changed, 22 insertions(+), 22 deletions(-) diff --git a/reactos/lib/syssetup/syssetup_Cz.rc b/reactos/lib/syssetup/syssetup_Cz.rc index 4feb6e8cd86..db32f08a17f 100644 --- a/reactos/lib/syssetup/syssetup_Cz.rc +++ b/reactos/lib/syssetup/syssetup_Cz.rc @@ -114,11 +114,11 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "Date and Time", IDC_STATIC, 53, 7, 253, 8 CONTROL "", IDC_DATEPICKER, "SysDateTimePick32", - DTS_LONGDATEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 53, 29, 137, 14 + DTS_LONGDATEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 53, 17, 137, 14 CONTROL "", IDC_TIMEPICKER, "SysDateTimePick32", - DTS_TIMEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 200, 29, 54, 14 - LTEXT "Timezone", IDC_STATIC, 53, 80, 253, 8 - COMBOBOX IDC_TIMEZONELIST, 53, 96, 201, 42, + DTS_TIMEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 200, 17, 54, 14 + LTEXT "Timezone", IDC_STATIC, 53, 42, 253, 8 + COMBOBOX IDC_TIMEZONELIST, 53, 52, 201, 93, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP AUTOCHECKBOX "Automatically adjust clock for &daylight saving changes", IDC_AUTODAYLIGHT, 53, 124, 201, 10 diff --git a/reactos/lib/syssetup/syssetup_De.rc b/reactos/lib/syssetup/syssetup_De.rc index d1bd18f202a..3b071ba1de6 100644 --- a/reactos/lib/syssetup/syssetup_De.rc +++ b/reactos/lib/syssetup/syssetup_De.rc @@ -116,11 +116,11 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "Datum und Zeit", IDC_STATIC, 53, 7, 253, 8 CONTROL "", IDC_DATEPICKER, "SysDateTimePick32", - DTS_LONGDATEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 53, 29, 137, 14 + DTS_LONGDATEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 53, 17, 137, 14 CONTROL "", IDC_TIMEPICKER, "SysDateTimePick32", - DTS_TIMEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 200, 29, 54, 14 - LTEXT "Zeitzone", IDC_STATIC, 53, 80, 253, 8 - COMBOBOX IDC_TIMEZONELIST, 53, 96, 201, 42, + DTS_TIMEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 200, 17, 54, 14 + LTEXT "Zeitzone", IDC_STATIC, 53, 42, 253, 8 + COMBOBOX IDC_TIMEZONELIST, 53, 52, 201, 93, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP AUTOCHECKBOX "&Uhr automatisch auf Sommer-/Winterzeit umstellen", IDC_AUTODAYLIGHT, 53, 124, 201, 10 diff --git a/reactos/lib/syssetup/syssetup_En.rc b/reactos/lib/syssetup/syssetup_En.rc index fa30fa925a8..11d2a58c526 100644 --- a/reactos/lib/syssetup/syssetup_En.rc +++ b/reactos/lib/syssetup/syssetup_En.rc @@ -116,11 +116,11 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "Date and Time", IDC_STATIC, 53, 7, 253, 8 CONTROL "", IDC_DATEPICKER, "SysDateTimePick32", - DTS_LONGDATEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 53, 29, 137, 14 + DTS_LONGDATEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 53, 17, 137, 14 CONTROL "", IDC_TIMEPICKER, "SysDateTimePick32", - DTS_TIMEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 200, 29, 54, 14 - LTEXT "Timezone", IDC_STATIC, 53, 80, 253, 8 - COMBOBOX IDC_TIMEZONELIST, 53, 96, 201, 42, + DTS_TIMEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 200, 17, 54, 14 + LTEXT "Timezone", IDC_STATIC, 53, 42, 253, 8 + COMBOBOX IDC_TIMEZONELIST, 53, 52, 201, 93, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP AUTOCHECKBOX "Automatically adjust clock for &daylight saving changes", IDC_AUTODAYLIGHT, 53, 124, 201, 10 diff --git a/reactos/lib/syssetup/syssetup_Fr.rc b/reactos/lib/syssetup/syssetup_Fr.rc index 206be903366..f27b8e67f24 100644 --- a/reactos/lib/syssetup/syssetup_Fr.rc +++ b/reactos/lib/syssetup/syssetup_Fr.rc @@ -117,11 +117,11 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "Date and Time", IDC_STATIC, 53, 7, 253, 8 CONTROL "", IDC_DATEPICKER, "SysDateTimePick32", - DTS_LONGDATEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 53, 29, 137, 14 + DTS_LONGDATEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 53, 17, 137, 14 CONTROL "", IDC_TIMEPICKER, "SysDateTimePick32", - DTS_TIMEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 200, 29, 54, 14 - LTEXT "Timezone", IDC_STATIC, 53, 80, 253, 8 - COMBOBOX IDC_TIMEZONELIST, 53, 96, 201, 42, + DTS_TIMEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 200, 17, 54, 14 + LTEXT "Timezone", IDC_STATIC, 53, 42, 253, 8 + COMBOBOX IDC_TIMEZONELIST, 53, 52, 201, 93, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP AUTOCHECKBOX "Automatically adjust clock for &daylight saving changes", IDC_AUTODAYLIGHT, 53, 124, 201, 10 diff --git a/reactos/lib/syssetup/wizard.c b/reactos/lib/syssetup/wizard.c index 5d8ca3b3cc1..d6934b3bcbc 100644 --- a/reactos/lib/syssetup/wizard.c +++ b/reactos/lib/syssetup/wizard.c @@ -16,7 +16,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -/* $Id: wizard.c,v 1.15 2004/11/24 23:09:46 ekohl Exp $ +/* $Id: wizard.c,v 1.16 2004/11/27 13:33:40 ekohl Exp $ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS system libraries @@ -145,16 +145,15 @@ GplDlgProc(HWND hwndDlg, SendMessageA(GetDlgItem(hwndDlg, IDC_GPL_TEXT), WM_SETTEXT, 0, (LPARAM) GplText); HeapFree(GetProcessHeap(), 0, GplText); SetFocus(GetDlgItem(hwndDlg, IDOK)); - return FALSE; - break; + return FALSE; case WM_CLOSE: EndDialog(hwndDlg, IDCANCEL); break; case WM_COMMAND: - if (HIWORD(wParam) == BN_CLICKED && IDOK == LOWORD(wParam)) - { + if (HIWORD(wParam) == BN_CLICKED && IDOK == LOWORD(wParam)) + { EndDialog(hwndDlg, IDOK); } break; @@ -251,7 +250,7 @@ AckPageDlgProc(HWND hwndDlg, { Projects = NULL; ProjectsSize = 256; - do + do { Projects = HeapAlloc(GetProcessHeap(), 0, ProjectsSize * sizeof(WCHAR)); if (NULL == Projects) @@ -573,6 +572,7 @@ SetKeyboardLayoutName(HWND hwnd) #endif } + static VOID RunInputLocalePage(HWND hwnd) {