From c3a35102a3256fb557d5053db8ebac3a8e000496 Mon Sep 17 00:00:00 2001 From: Tomasz Sowa Date: Tue, 12 Jan 2010 16:07:29 +0000 Subject: [PATCH] fixed: the correct language of the menu on a pad window was not set properly when the program started updated: chinese translation git-svn-id: svn://ttmath.org/publicrep/ttcalc/trunk@280 e52654a7-88a9-db11-a3e9-0013d4bc506e --- src/languages.cpp | 4 ++-- src/pad.cpp | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/languages.cpp b/src/languages.cpp index 362d045..2a95736 100644 --- a/src/languages.cpp +++ b/src/languages.cpp @@ -1245,7 +1245,7 @@ void Languages::InitGuiMessagesTab() InsertGuiPair(menu_view_normal_view, "&普通视图"); InsertGuiPair(menu_view_compact_view, "&迷你视图"); InsertGuiPair(menu_view_always_on_top, "&总在最前"); - InsertGuiPair(menu_view_pad, "&Pad"); + InsertGuiPair(menu_view_pad, "粘贴板"); InsertGuiPair(menu_view_lang_english, "&英语"); InsertGuiPair(menu_view_lang_polish, "&波兰语"); InsertGuiPair(menu_view_lang_spanish, "&西班牙语"); @@ -1337,7 +1337,7 @@ void Languages::InitGuiMessagesTab() #endif InsertGuiPair(update_download_error, "下载时出现错误，请稍后重试。"); - InsertGuiPair(pad_title, "&粘贴板"); + InsertGuiPair(pad_title, "粘贴板"); InsertGuiPair(pad_menu_file, "&文件"); InsertGuiPair(pad_menu_edit, "&编辑"); InsertGuiPair(pad_menu_file_new, "&新建"); // temporarily not used diff --git a/src/pad.cpp b/src/pad.cpp index 21b2423..2c082b6 100644 --- a/src/pad.cpp +++ b/src/pad.cpp @@ -362,6 +362,8 @@ Languages * pLang = GetPrgRes()->GetLanguages(); ModifyMenu(menu, menu_id, MF_BYCOMMAND|MF_STRING, menu_id, pLang->GuiMessage(msg) ); } + + void SetPadMenuLanguage(HWND hWnd) { HMENU menu = GetMenu(hWnd); @@ -902,6 +904,7 @@ ATOM a = RegisterPadClass(ttcalc_pad_class_name); 0 /*GetPrgRes()->GetMainWindow()*/, 0, GetPrgRes()->GetInstance(), 0); GetPrgRes()->SetPadWindow(pad); + SetPadLanguage(); GetPrgRes()->SetPadMaximized( pad_maximized_from_file ); GetPrgRes()->ShowPad( GetPrgRes()->IsPadVisible() );