From d03a34179725af99b0c3c305d22d5c751c6d0127 Mon Sep 17 00:00:00 2001 From: Francois Gouget Date: Sun, 23 Jul 2000 19:32:45 +0000 Subject: [PATCH] Removed obsolete references to the Languages array. --- programs/clock/language.c | 10 ---------- programs/notepad/language.c | 11 ----------- programs/progman/string.c | 15 --------------- 3 files changed, 36 deletions(-) diff --git a/programs/clock/language.c b/programs/clock/language.c index 823e98e6bb1..5f4d85f6c61 100644 --- a/programs/clock/language.c +++ b/programs/clock/language.c @@ -150,12 +150,6 @@ VOID LANGUAGE_SelectByNumber(UINT num) if (Globals.hMainMenu) DestroyMenu(Globals.hMainMenu); Globals.hMainMenu = hMainMenu; -#ifdef WINELIB - /* Update system menus */ - for (i = 0; Languages[i].name && lstrcmp(szLanguage, Languages[i].name);) i++; - if (Languages[i].name) Options.language = i; -#endif - /* specific for Clock: */ LANGUAGE_UpdateMenuCheckmarks(); @@ -180,10 +174,6 @@ VOID LANGUAGE_Init(VOID) { CHAR szBuffer[MAX_PATHNAME_LEN]; - #ifdef WINELIB - Globals.lpszLanguage = (LPSTR)Languages[Options.language].name; - #endif - if (Globals.lpszLanguage == "En") { PROFILE_GetWineIniString("programs", "language", "En", szBuffer, sizeof(szBuffer)); diff --git a/programs/notepad/language.c b/programs/notepad/language.c index 8593986c22b..5378c6f54d4 100644 --- a/programs/notepad/language.c +++ b/programs/notepad/language.c @@ -127,13 +127,6 @@ VOID LANGUAGE_SelectByNumber(UINT num) /* Destroy old menu */ if (Globals.hMainMenu) DestroyMenu(Globals.hMainMenu); Globals.hMainMenu = hMainMenu; - -#ifdef WINELIB - /* Update system menus */ - for (i = 0; Languages[i].name && lstrcmp(lang, Languages[i].name);) i++; - if (Languages[i].name) Options.language = i; - -#endif } VOID LANGUAGE_DefaultHandle(WPARAM wParam) @@ -145,9 +138,6 @@ VOID LANGUAGE_DefaultHandle(WPARAM wParam) VOID LANGUAGE_Init(VOID) { - #ifdef WINELIB - Globals.lpszLanguage = Languages[Options.language].name; - #else CHAR buffer[MAX_PATHNAME_LEN], *p; #ifndef LCC @@ -157,6 +147,5 @@ VOID LANGUAGE_Init(VOID) Globals.lpszLanguage = p = LocalLock(LocalAlloc(LMEM_FIXED, lstrlen(buffer)+1)); strcpy(p, buffer); /* hmemcpy(p, buffer, 1 + lstrlen(buffer)); */ - #endif } diff --git a/programs/progman/string.c b/programs/progman/string.c index 6948aac561c..ec96c2d9d39 100644 --- a/programs/progman/string.c +++ b/programs/progman/string.c @@ -70,7 +70,6 @@ VOID STRING_SelectLanguageByNumber(UINT num) CHAR caption[MAX_STRING_LEN]; CHAR item[MAX_STRING_LEN]; HMENU hMainMenu; - HLOCAL hGroup; /* Select string table */ Globals.wStringTableOffset = num * 0x100; @@ -119,20 +118,6 @@ VOID STRING_SelectLanguageByNumber(UINT num) /* Destroy old menu */ if (Globals.hMainMenu) DestroyMenu(Globals.hMainMenu); Globals.hMainMenu = hMainMenu; - -#ifdef WINELIB - /* Update system menus */ - for (i = 0; Languages[i].name && lstrcmp(lang, Languages[i].name);) i++; - if (Languages[i].name) Options.language = i; - - GetSystemMenu(Globals.hMainWnd, TRUE); - for (hGroup = GROUP_FirstGroup(); hGroup; - hGroup = GROUP_NextGroup(hGroup)) - { - GROUP *group = LocalLock(hGroup); - GetSystemMenu(group->hWnd, TRUE); - } -#endif } /* Local Variables: */