From bbcb9cc63cabec9b1cbbd06c9c3e8ff219fbe164 Mon Sep 17 00:00:00 2001 From: "ftang%netscape.com" Date: Fri, 4 Sep 1998 03:45:51 +0000 Subject: [PATCH] add FE_GetCharSetID from 4.5 tree git-svn-id: svn://10.0.0.236/trunk@9321 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/cmd/winfe/intlwin.cpp | 22 ++++++++++++++++++++++ mozilla/cmd/xfe/xfe.c | 19 +++++++++++++++++++ 2 files changed, 41 insertions(+) diff --git a/mozilla/cmd/winfe/intlwin.cpp b/mozilla/cmd/winfe/intlwin.cpp index f2658b3eeb0..24f7a8d9546 100755 --- a/mozilla/cmd/winfe/intlwin.cpp +++ b/mozilla/cmd/winfe/intlwin.cpp @@ -1105,6 +1105,28 @@ extern "C" void FE_FreeSingleByteTable(void **hres) ::FreeResource((HGLOBAL) hres); } + +extern "C" INTLCharSetID FE_GetCharSetID(INTL_CharSetID_Selector selector) +{ + INTLCharSetID charsetID = CS_DEFAULT; + + switch (selector) + { + case INTL_FileNameCsidSel: + case INTL_DefaultTextWidgetCsidSel: + charsetID = (INTLCharSetID) CIntlWin::GetSystemLocaleCsid(); + break; + default: + break; + } +#ifdef DEBUG_ricardob + XP_ASSERT(CS_DEFAULT != charsetID); +#endif + + return charsetID; +} + + /*--------------------------------------------------------------------------*/ #define MAXNUMOFCSIDLIST 64 diff --git a/mozilla/cmd/xfe/xfe.c b/mozilla/cmd/xfe/xfe.c index aeae8498de0..96d8aac0652 100644 --- a/mozilla/cmd/xfe/xfe.c +++ b/mozilla/cmd/xfe/xfe.c @@ -2884,6 +2884,25 @@ INTL_ResourceCharSet(void) return fe_LocaleCharSetName; } + +INTLCharSetID +FE_GetCharSetID(INTL_CharSetID_Selector selector) +{ + INTLCharSetID charsetID = CS_DEFAULT; + + switch (selector) + { + case INTL_FileNameCsidSel: + case INTL_DefaultTextWidgetCsidSel: + charsetID = (INTLCharSetID) fe_LocaleCharSetID; + break; + default: + break; + } + XP_ASSERT(CS_DEFAULT != charsetID); + + return charsetID; +} void INTL_Relayout(MWContext *pContext) {