From 4e492a948aeca99c9f5ed385ef9226a9637fc48d Mon Sep 17 00:00:00 2001 From: Perry Rapp Date: Wed, 9 Mar 2005 00:15:12 +0000 Subject: [PATCH] BUG: [ 1143619 ] Unicode chars in filename display as '_' Remove ES_OEMCONVERT from edit boxes in IDD_EDITOR_HEADERBAR. Src: Merge.rc Src/Languages: Merge*.rc --- Src/Languages/Brazilian/MergeBrazilian.rc | 4 ++-- Src/Languages/Bulgarian/MergeBulgarian.rc | 4 ++-- Src/Languages/Catalan/MergeCatalan.rc | 4 ++-- Src/Languages/ChineseSimplified/MergeChineseSimplified.rc | 4 ++-- Src/Languages/ChineseTraditional/MergeChineseTraditional.rc | 4 ++-- Src/Languages/Czech/MergeCzech.rc | 4 ++-- Src/Languages/Danish/MergeDanish.rc | 4 ++-- Src/Languages/Dutch/MergeDutch.rc | 4 ++-- Src/Languages/French/MergeFrench.rc | 4 ++-- Src/Languages/German/MergeGerman.rc | 4 ++-- Src/Languages/Hungarian/MergeHungarian.rc | 4 ++-- Src/Languages/Italian/MergeItalian.rc | 4 ++-- Src/Languages/Japanese/MergeJapanese.rc | 4 ++-- Src/Languages/Korean/MergeKorean.rc | 4 ++-- Src/Languages/Norwegian/MergeNorwegian.rc | 4 ++-- Src/Languages/Polish/MergePolish.rc | 4 ++-- Src/Languages/Russian/MergeRussian.rc | 4 ++-- Src/Languages/Slovak/MergeSlovak.rc | 4 ++-- Src/Languages/Spanish/MergeSpanish.rc | 4 ++-- Src/Languages/Swedish/MergeSwedish.rc | 4 ++-- Src/Languages/Swedish/MergeSwedish_LastTranslation.rc | 4 ++-- Src/Merge.rc | 4 ++-- Src/readme.txt | 4 ++++ 23 files changed, 48 insertions(+), 44 deletions(-) diff --git a/Src/Languages/Brazilian/MergeBrazilian.rc b/Src/Languages/Brazilian/MergeBrazilian.rc index 3a411b154..8ef94d51f 100644 --- a/Src/Languages/Brazilian/MergeBrazilian.rc +++ b/Src/Languages/Brazilian/MergeBrazilian.rc @@ -766,10 +766,10 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN EDITTEXT IDC_STATIC_TITLE_LEFT,0,2,160,12,ES_AUTOHSCROLL | - ES_OEMCONVERT | ES_READONLY | NOT WS_BORDER | NOT + ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP,WS_EX_STATICEDGE EDITTEXT IDC_STATIC_TITLE_RIGHT,163,2,160,12,ES_AUTOHSCROLL | - ES_OEMCONVERT | ES_READONLY | NOT WS_BORDER | NOT + ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP,WS_EX_STATICEDGE END diff --git a/Src/Languages/Bulgarian/MergeBulgarian.rc b/Src/Languages/Bulgarian/MergeBulgarian.rc index 50ba2a4f4..a6036782c 100644 --- a/Src/Languages/Bulgarian/MergeBulgarian.rc +++ b/Src/Languages/Bulgarian/MergeBulgarian.rc @@ -764,10 +764,10 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN EDITTEXT IDC_STATIC_TITLE_LEFT,0,2,160,12,ES_AUTOHSCROLL | - ES_OEMCONVERT | ES_READONLY | NOT WS_BORDER | NOT + ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP,WS_EX_STATICEDGE EDITTEXT IDC_STATIC_TITLE_RIGHT,163,2,160,12,ES_AUTOHSCROLL | - ES_OEMCONVERT | ES_READONLY | NOT WS_BORDER | NOT + ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP,WS_EX_STATICEDGE END diff --git a/Src/Languages/Catalan/MergeCatalan.rc b/Src/Languages/Catalan/MergeCatalan.rc index fe3528ded..025ba99c8 100644 --- a/Src/Languages/Catalan/MergeCatalan.rc +++ b/Src/Languages/Catalan/MergeCatalan.rc @@ -764,10 +764,10 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN EDITTEXT IDC_STATIC_TITLE_LEFT,0,2,160,12,ES_AUTOHSCROLL | - ES_OEMCONVERT | ES_READONLY | NOT WS_BORDER | NOT + ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP,WS_EX_STATICEDGE EDITTEXT IDC_STATIC_TITLE_RIGHT,163,2,160,12,ES_AUTOHSCROLL | - ES_OEMCONVERT | ES_READONLY | NOT WS_BORDER | NOT + ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP,WS_EX_STATICEDGE END diff --git a/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc b/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc index 028baa645..c12a56f6b 100644 --- a/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc +++ b/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc @@ -753,10 +753,10 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN EDITTEXT IDC_STATIC_TITLE_LEFT,0,2,160,12,ES_AUTOHSCROLL | - ES_OEMCONVERT | ES_READONLY | NOT WS_BORDER | NOT + ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP,WS_EX_STATICEDGE EDITTEXT IDC_STATIC_TITLE_RIGHT,163,2,160,12,ES_AUTOHSCROLL | - ES_OEMCONVERT | ES_READONLY | NOT WS_BORDER | NOT + ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP,WS_EX_STATICEDGE END diff --git a/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc b/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc index c3124ddd1..3b5cda0e9 100644 --- a/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc +++ b/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc @@ -753,10 +753,10 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN EDITTEXT IDC_STATIC_TITLE_LEFT,0,2,160,12,ES_AUTOHSCROLL | - ES_OEMCONVERT | ES_READONLY | NOT WS_BORDER | NOT + ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP,WS_EX_STATICEDGE EDITTEXT IDC_STATIC_TITLE_RIGHT,163,2,160,12,ES_AUTOHSCROLL | - ES_OEMCONVERT | ES_READONLY | NOT WS_BORDER | NOT + ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP,WS_EX_STATICEDGE END diff --git a/Src/Languages/Czech/MergeCzech.rc b/Src/Languages/Czech/MergeCzech.rc index 4a250534d..0b8f33783 100644 --- a/Src/Languages/Czech/MergeCzech.rc +++ b/Src/Languages/Czech/MergeCzech.rc @@ -764,10 +764,10 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN EDITTEXT IDC_STATIC_TITLE_LEFT,0,2,160,12,ES_AUTOHSCROLL | - ES_OEMCONVERT | ES_READONLY | NOT WS_BORDER | NOT + ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP,WS_EX_STATICEDGE EDITTEXT IDC_STATIC_TITLE_RIGHT,163,2,160,12,ES_AUTOHSCROLL | - ES_OEMCONVERT | ES_READONLY | NOT WS_BORDER | NOT + ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP,WS_EX_STATICEDGE END diff --git a/Src/Languages/Danish/MergeDanish.rc b/Src/Languages/Danish/MergeDanish.rc index f5f36d0b0..45d2dca15 100644 --- a/Src/Languages/Danish/MergeDanish.rc +++ b/Src/Languages/Danish/MergeDanish.rc @@ -764,10 +764,10 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN EDITTEXT IDC_STATIC_TITLE_LEFT,0,2,160,12,ES_AUTOHSCROLL | - ES_OEMCONVERT | ES_READONLY | NOT WS_BORDER | NOT + ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP,WS_EX_STATICEDGE EDITTEXT IDC_STATIC_TITLE_RIGHT,163,2,160,12,ES_AUTOHSCROLL | - ES_OEMCONVERT | ES_READONLY | NOT WS_BORDER | NOT + ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP,WS_EX_STATICEDGE END diff --git a/Src/Languages/Dutch/MergeDutch.rc b/Src/Languages/Dutch/MergeDutch.rc index 0ced849a9..759365de5 100644 --- a/Src/Languages/Dutch/MergeDutch.rc +++ b/Src/Languages/Dutch/MergeDutch.rc @@ -765,10 +765,10 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN EDITTEXT IDC_STATIC_TITLE_LEFT,0,2,160,12,ES_AUTOHSCROLL | - ES_OEMCONVERT | ES_READONLY | NOT WS_BORDER | NOT + ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP,WS_EX_STATICEDGE EDITTEXT IDC_STATIC_TITLE_RIGHT,163,2,160,12,ES_AUTOHSCROLL | - ES_OEMCONVERT | ES_READONLY | NOT WS_BORDER | NOT + ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP,WS_EX_STATICEDGE END diff --git a/Src/Languages/French/MergeFrench.rc b/Src/Languages/French/MergeFrench.rc index 038508d6b..8c943e8b3 100644 --- a/Src/Languages/French/MergeFrench.rc +++ b/Src/Languages/French/MergeFrench.rc @@ -765,10 +765,10 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN EDITTEXT IDC_STATIC_TITLE_LEFT,0,2,160,12,ES_AUTOHSCROLL | - ES_OEMCONVERT | ES_READONLY | NOT WS_BORDER | NOT + ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP,WS_EX_STATICEDGE EDITTEXT IDC_STATIC_TITLE_RIGHT,163,2,160,12,ES_AUTOHSCROLL | - ES_OEMCONVERT | ES_READONLY | NOT WS_BORDER | NOT + ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP,WS_EX_STATICEDGE END diff --git a/Src/Languages/German/MergeGerman.rc b/Src/Languages/German/MergeGerman.rc index 0f57328f8..39759c56f 100644 --- a/Src/Languages/German/MergeGerman.rc +++ b/Src/Languages/German/MergeGerman.rc @@ -772,10 +772,10 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN EDITTEXT IDC_STATIC_TITLE_LEFT,0,2,160,12,ES_AUTOHSCROLL | - ES_OEMCONVERT | ES_READONLY | NOT WS_BORDER | NOT + ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP,WS_EX_STATICEDGE EDITTEXT IDC_STATIC_TITLE_RIGHT,163,2,160,12,ES_AUTOHSCROLL | - ES_OEMCONVERT | ES_READONLY | NOT WS_BORDER | NOT + ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP,WS_EX_STATICEDGE END diff --git a/Src/Languages/Hungarian/MergeHungarian.rc b/Src/Languages/Hungarian/MergeHungarian.rc index 09fcad606..fab38458d 100644 --- a/Src/Languages/Hungarian/MergeHungarian.rc +++ b/Src/Languages/Hungarian/MergeHungarian.rc @@ -765,10 +765,10 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN EDITTEXT IDC_STATIC_TITLE_LEFT,0,2,160,12,ES_AUTOHSCROLL | - ES_OEMCONVERT | ES_READONLY | NOT WS_BORDER | NOT + ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP,WS_EX_STATICEDGE EDITTEXT IDC_STATIC_TITLE_RIGHT,163,2,160,12,ES_AUTOHSCROLL | - ES_OEMCONVERT | ES_READONLY | NOT WS_BORDER | NOT + ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP,WS_EX_STATICEDGE END diff --git a/Src/Languages/Italian/MergeItalian.rc b/Src/Languages/Italian/MergeItalian.rc index fefd92d9c..7a0f4452f 100644 --- a/Src/Languages/Italian/MergeItalian.rc +++ b/Src/Languages/Italian/MergeItalian.rc @@ -765,10 +765,10 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN EDITTEXT IDC_STATIC_TITLE_LEFT,0,2,160,12,ES_AUTOHSCROLL | - ES_OEMCONVERT | ES_READONLY | NOT WS_BORDER | NOT + ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP,WS_EX_STATICEDGE EDITTEXT IDC_STATIC_TITLE_RIGHT,163,2,160,12,ES_AUTOHSCROLL | - ES_OEMCONVERT | ES_READONLY | NOT WS_BORDER | NOT + ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP,WS_EX_STATICEDGE END diff --git a/Src/Languages/Japanese/MergeJapanese.rc b/Src/Languages/Japanese/MergeJapanese.rc index 9f5d55741..e9f307a7d 100644 --- a/Src/Languages/Japanese/MergeJapanese.rc +++ b/Src/Languages/Japanese/MergeJapanese.rc @@ -766,10 +766,10 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN EDITTEXT IDC_STATIC_TITLE_LEFT,0,2,160,12,ES_AUTOHSCROLL | - ES_OEMCONVERT | ES_READONLY | NOT WS_BORDER | NOT + ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP,WS_EX_STATICEDGE EDITTEXT IDC_STATIC_TITLE_RIGHT,163,2,160,12,ES_AUTOHSCROLL | - ES_OEMCONVERT | ES_READONLY | NOT WS_BORDER | NOT + ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP,WS_EX_STATICEDGE END diff --git a/Src/Languages/Korean/MergeKorean.rc b/Src/Languages/Korean/MergeKorean.rc index 01f922827..0b100609b 100644 --- a/Src/Languages/Korean/MergeKorean.rc +++ b/Src/Languages/Korean/MergeKorean.rc @@ -763,10 +763,10 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN EDITTEXT IDC_STATIC_TITLE_LEFT,0,2,160,12,ES_AUTOHSCROLL | - ES_OEMCONVERT | ES_READONLY | NOT WS_BORDER | NOT + ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP,WS_EX_STATICEDGE EDITTEXT IDC_STATIC_TITLE_RIGHT,163,2,160,12,ES_AUTOHSCROLL | - ES_OEMCONVERT | ES_READONLY | NOT WS_BORDER | NOT + ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP,WS_EX_STATICEDGE END diff --git a/Src/Languages/Norwegian/MergeNorwegian.rc b/Src/Languages/Norwegian/MergeNorwegian.rc index b8d3a9f36..ea087b41b 100644 --- a/Src/Languages/Norwegian/MergeNorwegian.rc +++ b/Src/Languages/Norwegian/MergeNorwegian.rc @@ -763,10 +763,10 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN EDITTEXT IDC_STATIC_TITLE_LEFT,0,2,160,12,ES_AUTOHSCROLL | - ES_OEMCONVERT | ES_READONLY | NOT WS_BORDER | NOT + ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP,WS_EX_STATICEDGE EDITTEXT IDC_STATIC_TITLE_RIGHT,163,2,160,12,ES_AUTOHSCROLL | - ES_OEMCONVERT | ES_READONLY | NOT WS_BORDER | NOT + ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP,WS_EX_STATICEDGE END diff --git a/Src/Languages/Polish/MergePolish.rc b/Src/Languages/Polish/MergePolish.rc index a5d918979..040464dfd 100644 --- a/Src/Languages/Polish/MergePolish.rc +++ b/Src/Languages/Polish/MergePolish.rc @@ -764,10 +764,10 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN EDITTEXT IDC_STATIC_TITLE_LEFT,0,2,160,12,ES_AUTOHSCROLL | - ES_OEMCONVERT | ES_READONLY | NOT WS_BORDER | NOT + ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP,WS_EX_STATICEDGE EDITTEXT IDC_STATIC_TITLE_RIGHT,163,2,160,12,ES_AUTOHSCROLL | - ES_OEMCONVERT | ES_READONLY | NOT WS_BORDER | NOT + ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP,WS_EX_STATICEDGE END diff --git a/Src/Languages/Russian/MergeRussian.rc b/Src/Languages/Russian/MergeRussian.rc index 1e6ebebd3..b4b4c6d77 100644 --- a/Src/Languages/Russian/MergeRussian.rc +++ b/Src/Languages/Russian/MergeRussian.rc @@ -774,10 +774,10 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN EDITTEXT IDC_STATIC_TITLE_LEFT,0,2,160,12,ES_AUTOHSCROLL | - ES_OEMCONVERT | ES_READONLY | NOT WS_BORDER | NOT + ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP,WS_EX_STATICEDGE EDITTEXT IDC_STATIC_TITLE_RIGHT,163,2,160,12,ES_AUTOHSCROLL | - ES_OEMCONVERT | ES_READONLY | NOT WS_BORDER | NOT + ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP,WS_EX_STATICEDGE END diff --git a/Src/Languages/Slovak/MergeSlovak.rc b/Src/Languages/Slovak/MergeSlovak.rc index 01ba315fe..7a6368c51 100644 --- a/Src/Languages/Slovak/MergeSlovak.rc +++ b/Src/Languages/Slovak/MergeSlovak.rc @@ -764,10 +764,10 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN EDITTEXT IDC_STATIC_TITLE_LEFT,0,2,160,12,ES_AUTOHSCROLL | - ES_OEMCONVERT | ES_READONLY | NOT WS_BORDER | NOT + ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP,WS_EX_STATICEDGE EDITTEXT IDC_STATIC_TITLE_RIGHT,163,2,160,12,ES_AUTOHSCROLL | - ES_OEMCONVERT | ES_READONLY | NOT WS_BORDER | NOT + ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP,WS_EX_STATICEDGE END diff --git a/Src/Languages/Spanish/MergeSpanish.rc b/Src/Languages/Spanish/MergeSpanish.rc index 1c209eab9..4aebc3671 100644 --- a/Src/Languages/Spanish/MergeSpanish.rc +++ b/Src/Languages/Spanish/MergeSpanish.rc @@ -763,10 +763,10 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN EDITTEXT IDC_STATIC_TITLE_LEFT,0,2,160,12,ES_AUTOHSCROLL | - ES_OEMCONVERT | ES_READONLY | NOT WS_BORDER | NOT + ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP,WS_EX_STATICEDGE EDITTEXT IDC_STATIC_TITLE_RIGHT,163,2,160,12,ES_AUTOHSCROLL | - ES_OEMCONVERT | ES_READONLY | NOT WS_BORDER | NOT + ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP,WS_EX_STATICEDGE END diff --git a/Src/Languages/Swedish/MergeSwedish.rc b/Src/Languages/Swedish/MergeSwedish.rc index 57963a154..8c3ce9c95 100644 --- a/Src/Languages/Swedish/MergeSwedish.rc +++ b/Src/Languages/Swedish/MergeSwedish.rc @@ -763,10 +763,10 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN EDITTEXT IDC_STATIC_TITLE_LEFT,0,2,160,12,ES_AUTOHSCROLL | - ES_OEMCONVERT | ES_READONLY | NOT WS_BORDER | NOT + ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP,WS_EX_STATICEDGE EDITTEXT IDC_STATIC_TITLE_RIGHT,163,2,160,12,ES_AUTOHSCROLL | - ES_OEMCONVERT | ES_READONLY | NOT WS_BORDER | NOT + ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP,WS_EX_STATICEDGE END diff --git a/Src/Languages/Swedish/MergeSwedish_LastTranslation.rc b/Src/Languages/Swedish/MergeSwedish_LastTranslation.rc index acf85d471..434658adf 100644 --- a/Src/Languages/Swedish/MergeSwedish_LastTranslation.rc +++ b/Src/Languages/Swedish/MergeSwedish_LastTranslation.rc @@ -590,10 +590,10 @@ STYLE WS_CHILD FONT 8, "MS Sans Serif", 0, 0, 0x1 BEGIN EDITTEXT IDC_STATIC_TITLE_LEFT,0,2,160,12,ES_AUTOHSCROLL | - ES_OEMCONVERT | ES_READONLY | NOT WS_BORDER | NOT + ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP,WS_EX_STATICEDGE EDITTEXT IDC_STATIC_TITLE_RIGHT,163,2,160,12,ES_AUTOHSCROLL | - ES_OEMCONVERT | ES_READONLY | NOT WS_BORDER | NOT + ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP,WS_EX_STATICEDGE END diff --git a/Src/Merge.rc b/Src/Merge.rc index ad1363c26..a5d6a9568 100644 --- a/Src/Merge.rc +++ b/Src/Merge.rc @@ -765,10 +765,10 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN EDITTEXT IDC_STATIC_TITLE_LEFT,0,2,160,12,ES_AUTOHSCROLL | - ES_OEMCONVERT | ES_READONLY | NOT WS_BORDER | NOT + ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP,WS_EX_STATICEDGE EDITTEXT IDC_STATIC_TITLE_RIGHT,163,2,160,12,ES_AUTOHSCROLL | - ES_OEMCONVERT | ES_READONLY | NOT WS_BORDER | NOT + ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP,WS_EX_STATICEDGE END diff --git a/Src/readme.txt b/Src/readme.txt index e84a3148b..5fa83a5db 100644 --- a/Src/readme.txt +++ b/Src/readme.txt @@ -1,6 +1,10 @@ 2005-03-08 Perry Cosmetic: Added & doxygen'd comments, and prefixed members with m_. Src: FilepathEdit.cpp FilepathEdit.h + BUG: [ 1143619 ] Unicode chars in filename display as '_' + Remove ES_OEMCONVERT from edit boxes in IDD_EDITOR_HEADERBAR. + Src: Merge.rc + Src/Languages: Merge*.rc 2005-03-08 WinMerge experimental release 2.3.1.6 (cvs) -- 2.11.0