INTEGRATION: CWS crashreprc3 (1.2.12); FILE MERGED

2003/07/17 11:23:49 ssa 1.2.12.1: #i16748# dont set any font on CJK systems, Win98 cannot substitute

1 files changed, 28 insertions, 15 deletions

diff --git a/crashrep/source/win32/rctemplate.txt b/crashrep/source/win32/rctemplate.txt
index 63896e21e4c2..b4958efb5afa 100755
--- a/crashrep/source/win32/rctemplate.txt
+++ b/crashrep/source/win32/rctemplate.txt
@@ -6,6 +6,7 @@ LANGUAGE %LANGUAGE% , %SUBLANGUAGE%
 
 #if ( %LANGUAGE% == LANG_KOREAN ) || ( %LANGUAGE% == LANG_CHINESE ) || ( %LANGUAGE% == LANG_JAPANESE )
 #define FONTSIZE 9
+#define LANG_CJK
 #else
 #define FONTSIZE 8
 #endif
@@ -16,23 +17,27 @@ LANGUAGE %LANGUAGE% , %SUBLANGUAGE%
 //
 
 IDD_WELCOME_PAGE DIALOGEX 0, 41, 327, 195
-STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD
+STYLE DS_SETFONT | DS_CONTROL | WS_CHILD
 EXSTYLE WS_EX_CONTROLPARENT
+#ifndef LANG_CJK
 FONT FONTSIZE, "MS Shell Dlg", 0, 0, 0x0
+#endif
 BEGIN
     CONTROL         "",IDC_RICHEDIT21,"RICHEDIT20W",TCS_RAGGEDRIGHT | ES_READONLY |
                     TCS_MULTISELECT | WS_VSCROLL,7,7,313,151
 END
 
 IDD_REPORT_PAGE DIALOGEX 0, 41, 327, 195
-STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD
+STYLE DS_SETFONT | DS_CONTROL | WS_CHILD
 EXSTYLE WS_EX_CONTROLPARENT
+#ifndef LANG_CJK
 FONT FONTSIZE, "MS Shell Dlg", 0, 0, 0x0
+#endif
 BEGIN
     LTEXT           "1",IDC_REPORT_INTRO,7,7,313,48
-    LTEXT           "2",IDC_ENTER_TITLE,7,58,233,8
+    LTEXT           "2",IDC_ENTER_TITLE,7,58,320,8
     EDITTEXT        IDC_EDIT_TITLE,7,68,235,14,ES_AUTOHSCROLL
-    LTEXT           "3",IDC_ENTER_DESCRIPTION,7,86,316,8
+    LTEXT           "3",IDC_ENTER_DESCRIPTION,7,86,320,8
     EDITTEXT        IDC_EDIT_DESCRIPTION,7,97,235,49,ES_MULTILINE | 
                     ES_WANTRETURN | WS_VSCROLL
     CONTROL         "4",IDC_ALLOW_CONTACT,"Button",BS_AUTOCHECKBOX | 
@@ -40,34 +45,38 @@ BEGIN
     LTEXT           "4a",IDC_LABEL_EMAIL,18,162,226,
                     8
     EDITTEXT        IDC_EDIT_EMAIL,17,173,224,14,ES_AUTOHSCROLL
-    PUSHBUTTON      "5",IDC_SHOW_REPORT,249,94,74,14
-    PUSHBUTTON      "6",IDC_OPTIONS,249,116,74,14
-    PUSHBUTTON      "7",IDC_SAVE_REPORT,249,138,74,14
+    PUSHBUTTON      "5",IDC_SHOW_REPORT,249,97,74,14
+    PUSHBUTTON      "6",IDC_OPTIONS,249,115,74,14
+    PUSHBUTTON      "7",IDC_SAVE_REPORT,249,134,74,14
 END
 
 IDD_DIALOG_FRAME DIALOGEX 0, 0, 331, 265
 STYLE DS_SETFONT | DS_MODALFRAME | DS_SETFOREGROUND | 
-    DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
+    DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "1"
+#ifndef LANG_CJK
 FONT FONTSIZE, "MS Shell Dlg", 400, 0, 0x1
+#endif
 BEGIN
     LTEXT           "",IDC_STATIC,0,0,331,40
     CONTROL         "",IDC_HEADER,"RICHEDIT20W",TCS_VERTICAL | TCS_MULTISELECT | ES_READONLY,
                     7,7,316,33
-    PUSHBUTTON      "1",IDBACK,155,244,50,14
-    PUSHBUTTON      "2",IDNEXT,214,244,50,14
-    PUSHBUTTON      "3",IDFINISH,214,244,50,14
-    PUSHBUTTON      "4",IDCANCEL,273,244,50,14
+    PUSHBUTTON      "1",IDBACK,125,244,60,14
+    PUSHBUTTON      "2",IDNEXT,194,244,60,14
+    PUSHBUTTON      "3",IDFINISH,194,244,60,14
+    PUSHBUTTON      "4",IDCANCEL,263,244,60,14
     CONTROL         "",IDC_STATIC,"Static",SS_ETCHEDHORZ,0,40,331,1
     CONTROL         "",IDC_STATIC,"Static",SS_ETCHEDHORZ,0,237,331,1
 END
 
 IDD_PREVIEW_FRAME DIALOGEX 0, 0, 251, 185
 STYLE DS_SETFONT | DS_MODALFRAME | DS_SETFOREGROUND | 
-    DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU | 
+    DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU | 
     WS_SIZEBOX
 CAPTION "1"
+#ifndef LANG_CJK
 FONT FONTSIZE, "MS Shell Dlg", 400, 0, 0x1
+#endif
 BEGIN
     CONTROL         "",IDC_EDIT_PREVIEW,"RICHEDIT20W",ES_MULTILINE | 
                     ES_AUTOVSCROLL | WS_VSCROLL | ES_AUTOHSCROLL | WS_HSCROLL |
@@ -80,10 +89,12 @@ END
 
 
 IDD_OPTIONS_FRAME DIALOGEX 0, 0, 295, 182
-STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | 
+STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | 
     WS_SYSMENU
 CAPTION "1"
+#ifndef LANG_CJK
 FONT FONTSIZE, "MS Shell Dlg", 400, 0, 0x1
+#endif
 BEGIN
     GROUPBOX        "1",IDC_PROXY_SETTINGS,7,7,222,92
     CONTROL         "2",IDC_RADIO_SYSTEM,"Button",BS_AUTORADIOBUTTON,15,27,
@@ -105,10 +116,12 @@ BEGIN
 END
 
 IDD_SENDING_STATUS DIALOGEX 0, 0, 216, 73
-STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | 
+STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | 
     WS_SYSMENU
 CAPTION "1"
+#ifndef LANG_CJK
 FONT FONTSIZE, "MS Shell Dlg", 400, 0, 0x1
+#endif
 BEGIN
     PUSHBUTTON      "2",IDCANCEL,159,52,50,14
     LTEXT           "3",IDC_SENDING_REPORT_STATUS,7,7,202,34