From f28bbc3210cc892e6b8985d7c210b2d4e0ecdcfa Mon Sep 17 00:00:00 2001 From: Katayama Hirofumi MZ Date: Sun, 14 Jul 2019 10:13:18 +0900 Subject: [PATCH] adapt to Visual Studio 2012 --- src/MItemSearchDlg.hpp | 24 +++++++++++++++++------- src/Res.hpp | 6 +++--- 2 files changed, 20 insertions(+), 10 deletions(-) diff --git a/src/MItemSearchDlg.hpp b/src/MItemSearchDlg.hpp index 2f461391..c58ba1cd 100644 --- a/src/MItemSearchDlg.hpp +++ b/src/MItemSearchDlg.hpp @@ -36,14 +36,24 @@ class MItemSearchDlg; struct ITEM_SEARCH { ResToText res2text; - BOOL bIgnoreCases = TRUE; - BOOL bDownward = TRUE; - BOOL bInternalText = TRUE; - BOOL bRunning = FALSE; - BOOL bCancelled = FALSE; + BOOL bIgnoreCases; + BOOL bDownward; + BOOL bInternalText; + BOOL bRunning; + BOOL bCancelled; MString strText; - EntryBase *pCurrent = NULL; - EntryBase *pFound = NULL; + EntryBase *pCurrent; + EntryBase *pFound; + ITEM_SEARCH() + { + bIgnoreCases = TRUE; + bDownward = TRUE; + bInternalText = TRUE; + bRunning = FALSE; + bCancelled = FALSE; + pCurrent = NULL; + pFound = NULL; + } }; class MItemSearchDlg : public MDialogBase diff --git a/src/Res.hpp b/src/Res.hpp index 753497e4..c677f7ef 100644 --- a/src/Res.hpp +++ b/src/Res.hpp @@ -126,9 +126,9 @@ struct EntryBase EntryType m_et; // entry type MIdOrString m_type; // resource type MIdOrString m_name; // resource name - WORD m_lang = BAD_LANG; // resource language - HTREEITEM m_hItem = NULL; // treeview item handle - bool m_valid = true; // "is it valid?" flag + WORD m_lang; // resource language + HTREEITEM m_hItem; // treeview item handle + bool m_valid; // "is it valid?" flag data_type m_data; // the item data MStringW m_strLabel; // the label string