diff options
| author | elfmz <fenix1905@tut.by> | 2022-02-20 02:02:21 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-20 02:02:21 +0300 |
| commit | e0f3f14fb3d648ba640e75cf25e257ac8fde4865 (patch) | |
| tree | a88b1d0d075cd8a951a757e45114cf64a8cd6fb3 /far2l/src/DialogBuilder.cpp | |
| parent | dc2f6de4c2f438046b4d31cf4c2078b6ad65a5ce (diff) | |
Language refactor (#1271)
optimized and refactored language files loader
got rid of MSG() macro and use Msg:: namespace instead
Diffstat (limited to 'far2l/src/DialogBuilder.cpp')
| -rw-r--r-- | far2l/src/DialogBuilder.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/far2l/src/DialogBuilder.cpp b/far2l/src/DialogBuilder.cpp index e46ede78..c5a3270e 100644 --- a/far2l/src/DialogBuilder.cpp +++ b/far2l/src/DialogBuilder.cpp @@ -36,7 +36,6 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "lang.hpp" #include "DialogBuilder.hpp" #include "dialog.hpp" -#include "language.hpp" #include "codepage.hpp" struct EditFieldBinding: public DialogItemBinding<DialogItemEx> @@ -87,7 +86,7 @@ static bool IsEditField(DialogItemEx *Item) } */ -DialogBuilder::DialogBuilder(int TitleMessageId, const wchar_t *HelpTopic): +DialogBuilder::DialogBuilder(FarLangMsg TitleMessageId, const wchar_t *HelpTopic): HelpTopic(HelpTopic) { AddBorder(GetLangString(TitleMessageId)); @@ -109,9 +108,9 @@ int DialogBuilder::TextWidth(const DialogItemEx &Item) return static_cast<int>(Item.strData.GetLength()); } -const TCHAR *DialogBuilder::GetLangString(int MessageID) +const TCHAR *DialogBuilder::GetLangString(FarLangMsg MessageID) { - return MSG(MessageID); + return MessageID; } DialogItemBinding<DialogItemEx> *DialogBuilder::CreateCheckBoxBinding(BOOL *Value, int Mask) @@ -168,7 +167,7 @@ DialogItemEx *DialogBuilder::AddComboBox(int *Value, int Width, FarListItem *ListItems = new FarListItem[ItemCount]; for(int i=0; i<ItemCount; i++) { - ListItems [i].Text = MSG(Items [i].MessageId); + ListItems [i].Text = Items [i].MessageId; ListItems [i].Flags = (*Value == Items [i].ItemValue) ? LIF_SELECTED : 0; ListItems [i].Reserved [0] = Items [i].ItemValue; } |