Fix issue #784: Error on try to show differences between two different gif

[winmerge-jp/winmerge-jp.git] / Src / PropSyntaxColors.cpp

diff --git a/Src/PropSyntaxColors.cpp b/Src/PropSyntaxColors.cpp
index 9724f24..26db4cc 100644 (file)
--- a/Src/PropSyntaxColors.cpp
+++ b/Src/PropSyntaxColors.cpp
@@ -25,9 +25,10 @@ IMPLEMENT_DYNAMIC(PropSyntaxColors, CPropertyPage)
 
 PropSyntaxColors::PropSyntaxColors(COptionsMgr *optionsMgr, SyntaxColors *pColors)
 : OptionsPanel(optionsMgr, PropSyntaxColors::IDD)
+, m_nBolds()
+, m_pTempColors(pColors)
+, m_cCustColors()
 {
-       m_pTempColors = pColors;
-       memset(m_cCustColors, 0, sizeof(m_cCustColors));
 }
 
 void PropSyntaxColors::DoDataExchange(CDataExchange* pDX)
@@ -54,7 +55,7 @@ void PropSyntaxColors::DoDataExchange(CDataExchange* pDX)
 }
 
 
-BEGIN_MESSAGE_MAP(PropSyntaxColors, CPropertyPage)
+BEGIN_MESSAGE_MAP(PropSyntaxColors, OptionsPanel)
        ON_BN_CLICKED(IDC_SCOLOR_KEYWORDS, OnBnClickedEcolor<COLORINDEX_KEYWORD>)
        ON_BN_CLICKED(IDC_SCOLOR_FUNCTIONS, OnBnClickedEcolor<COLORINDEX_FUNCNAME>)
        ON_BN_CLICKED(IDC_SCOLOR_COMMENTS, OnBnClickedEcolor<COLORINDEX_COMMENT>)
@@ -64,7 +65,6 @@ BEGIN_MESSAGE_MAP(PropSyntaxColors, CPropertyPage)
        ON_BN_CLICKED(IDC_SCOLOR_PREPROCESSOR, OnBnClickedEcolor<COLORINDEX_PREPROCESSOR>)
        ON_BN_CLICKED(IDC_SCOLOR_USER1, OnBnClickedEcolor<COLORINDEX_USER1>)
        ON_BN_CLICKED(IDC_SCOLOR_USER2, OnBnClickedEcolor<COLORINDEX_USER2>)
-       ON_BN_CLICKED(IDC_SCOLORS_BDEFAULTS, OnBnClickedEcolorsBdefaults)
        ON_BN_CLICKED(IDC_SCOLOR_KEYWORDS_BOLD, (OnBnClickedBoldButton<IDC_SCOLOR_KEYWORDS_BOLD, COLORINDEX_KEYWORD>))
        ON_BN_CLICKED(IDC_SCOLOR_FUNCTIONS_BOLD, (OnBnClickedBoldButton<IDC_SCOLOR_FUNCTIONS_BOLD, COLORINDEX_FUNCNAME>))
        ON_BN_CLICKED(IDC_SCOLOR_COMMENTS_BOLD, (OnBnClickedBoldButton<IDC_SCOLOR_COMMENTS_BOLD, COLORINDEX_COMMENT>))
@@ -110,8 +110,8 @@ void PropSyntaxColors::BrowseColorAndSave(unsigned colorIndex)
 {
        COLORREF currentColor = m_pTempColors->GetColor(colorIndex);
        CColorDialog dialog(currentColor);
-       Options::CustomColors::Load(GetOptionsMgr(), m_cCustColors);
-       dialog.m_cc.lpCustColors = m_cCustColors;
+       Options::CustomColors::Load(GetOptionsMgr(), m_cCustColors.data());
+       dialog.m_cc.lpCustColors = m_cCustColors.data();
        
        if (dialog.DoModal() == IDOK)
        {
@@ -119,7 +119,7 @@ void PropSyntaxColors::BrowseColorAndSave(unsigned colorIndex)
                m_colorButtons[colorIndex].SetColor(currentColor);
                m_pTempColors->SetColor(colorIndex, currentColor);
        }
-       Options::CustomColors::Save(GetOptionsMgr(), m_cCustColors);
+       Options::CustomColors::Save(GetOptionsMgr(), m_cCustColors.data());
 }
 
 template <unsigned colorIndex>
@@ -128,18 +128,6 @@ void PropSyntaxColors::OnBnClickedEcolor()
        BrowseColorAndSave(colorIndex);
 }
 
-void PropSyntaxColors::OnBnClickedEcolorsBdefaults()
-{
-       m_pTempColors->SetDefaults();
-       for (auto&& colorIndex : ColorIndices)
-       {
-               m_colorButtons[colorIndex].SetColor(m_pTempColors->GetColor(colorIndex));
-               m_nBolds[colorIndex] = GetCheckVal(colorIndex);
-       }
-
-       UpdateData(FALSE);
-}
-
 template <unsigned ctlId, unsigned colorIndex>
 void PropSyntaxColors::OnBnClickedBoldButton()
 {