From 7283a4ae33fcc9530450d6c73bb5906e6099f233 Mon Sep 17 00:00:00 2001 From: "ssu%netscape.com" Date: Tue, 9 May 2000 19:48:21 +0000 Subject: [PATCH] fixing bug #27580. affects only windows platforms. git-svn-id: svn://10.0.0.236/trunk@68870 18797224-902f-48f8-a5cc-f745e15eee43 --- .../wizard/windows/setuprsc/setuprsc.rc | 40 +++++++------------ 1 file changed, 14 insertions(+), 26 deletions(-) diff --git a/mozilla/xpinstall/wizard/windows/setuprsc/setuprsc.rc b/mozilla/xpinstall/wizard/windows/setuprsc/setuprsc.rc index 74b2f9ea1e0..06723066acb 100644 --- a/mozilla/xpinstall/wizard/windows/setuprsc/setuprsc.rc +++ b/mozilla/xpinstall/wizard/windows/setuprsc/setuprsc.rc @@ -53,8 +53,7 @@ END // DLG_WELCOME DIALOGEX 51, 56, 315, 205 -STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CLASS "SetupDlg" +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU FONT 8, "MS Sans Serif" BEGIN DEFPUSHBUTTON "&Next >",IDWIZNEXT,188,186,53,14 @@ -69,8 +68,7 @@ BEGIN END DLG_SETUP_TYPE DIALOGEX 51, 56, 315, 205 -STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CLASS "SetupDlg" +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU FONT 8, "MS Sans Serif" BEGIN CONTROL "",IDC_RADIO_ST0,"Button",BS_AUTORADIOBUTTON | @@ -99,13 +97,15 @@ BEGIN END DLG_SELECT_COMPONENTS DIALOGEX 51, 56, 315, 205 -STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CLASS "SetupDlg" +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU FONT 8, "MS Sans Serif" BEGIN - PUSHBUTTON "< &Back",IDWIZBACK,134,186,53,14 DEFPUSHBUTTON "&Next >",IDWIZNEXT,188,186,53,14 PUSHBUTTON "&Cancel",IDCANCEL,252,186,53,14 + LISTBOX IDC_LIST_COMPONENTS,101,42,204,67,LBS_OWNERDRAWFIXED | + LBS_HASSTRINGS | LBS_USETABSTOPS | LBS_NOINTEGRALHEIGHT | + WS_VSCROLL | WS_HSCROLL | WS_GROUP | WS_TABSTOP + PUSHBUTTON "< &Back",IDWIZBACK,134,186,53,14 LTEXT "",IDC_MESSAGE0,101,10,204,19,NOT WS_GROUP LTEXT "C&omponents:",IDC_STATIC,101,32,103,8 GROUPBOX "Description",IDC_STATIC,101,115,204,22 @@ -117,17 +117,13 @@ BEGIN WS_EX_CLIENTEDGE CONTROL "",IDC_STATIC,"Static",SS_ETCHEDHORZ,11,179,295,1, WS_EX_STATICEDGE - LISTBOX IDC_LIST_COMPONENTS,101,42,204,67,LBS_OWNERDRAWFIXED | - LBS_HASSTRINGS | LBS_USETABSTOPS | LBS_NOINTEGRALHEIGHT | - WS_VSCROLL | WS_HSCROLL | WS_GROUP | WS_TABSTOP LTEXT "",IDC_STATIC,201,32,103,8,0,WS_EX_RIGHT LTEXT "Total download size:",IDC_STATIC,105,148,92,9 LTEXT "Space Available:",IDC_STATIC,206,148,94,9 END DLG_WINDOWS_INTEGRATION DIALOGEX 51, 56, 315, 205 -STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CLASS "SetupDlg" +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU FONT 8, "MS Sans Serif" BEGIN CONTROL "Check0",IDC_CHECK0,"Button",BS_AUTOCHECKBOX | BS_TOP | @@ -150,8 +146,7 @@ BEGIN END DLG_PROGRAM_FOLDER DIALOGEX 51, 56, 315, 205 -STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CLASS "SetupDlg" +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU FONT 8, "MS Sans Serif" BEGIN EDITTEXT IDC_EDIT_PROGRAM_FOLDER,101,64,204,12,ES_AUTOHSCROLL @@ -170,8 +165,7 @@ BEGIN END DLG_LICENSE DIALOGEX 51, 56, 315, 205 -STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CLASS "SetupDlg" +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU FONT 8, "MS Sans Serif" BEGIN DEFPUSHBUTTON "&Accept",IDWIZNEXT,188,186,53,14 @@ -186,8 +180,7 @@ BEGIN END DLG_START_INSTALL DIALOGEX 51, 56, 315, 205 -STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CLASS "SetupDlg" +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU FONT 8, "MS Sans Serif" BEGIN EDITTEXT IDC_CURRENT_SETTINGS,101,67,204,106,ES_MULTILINE | @@ -208,7 +201,7 @@ END DLG_BROWSE_DIR DIALOGEX 147, 23, 190, 143 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Select a directory" -FONT 8, "MS Shell Dlg" +FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN EDITTEXT IDC_EDIT_DESTINATION,8,16,177,12,ES_AUTOHSCROLL | ES_OEMCONVERT | NOT WS_BORDER,WS_EX_CLIENTEDGE @@ -227,7 +220,6 @@ END DLG_RESTART DIALOG FIXED IMPURE 133, 69, 226, 110 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION -CLASS "SetupDlg" FONT 8, "MS Sans Serif" BEGIN LTEXT "Setup has finished copying files to your computer. Before you can use the program, you must restart Windows or your computer.\n\n Choose one of the following options and click OK to finish setup.", @@ -241,7 +233,6 @@ END DLG_MESSAGE DIALOG DISCARDABLE 0, 0, 236, 34 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE -CLASS "SetupDlg" FONT 8, "MS Sans Serif" BEGIN CTEXT "",IDC_MESSAGE,0,0,236,34,SS_CENTERIMAGE @@ -249,7 +240,6 @@ END DLG_EXTRACTING DIALOG DISCARDABLE 0, 0, 193, 73 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION -CLASS "SetupDlg" FONT 8, "MS Sans Serif" BEGIN CONTROL "",IDC_GAUGE_FILE,"GaugeFile",0x0,9,52,175,11 @@ -261,8 +251,7 @@ BEGIN END DLG_ADVANCED_SETTINGS DIALOGEX 51, 56, 315, 205 -STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CLASS "SetupDlg" +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU FONT 8, "MS Sans Serif" BEGIN COMBOBOX IDC_LIST_SITE_SELECTOR,101,49,206,124,CBS_DROPDOWNLIST | @@ -287,8 +276,7 @@ BEGIN END DLG_SELECT_ADDITIONAL_COMPONENTS DIALOGEX 51, 56, 315, 205 -STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CLASS "SetupDlg" +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU FONT 8, "MS Sans Serif" BEGIN PUSHBUTTON "< &Back",IDWIZBACK,134,186,53,14