Merge pull request #36 from suxiaojack/master

nickgammon · web-flow · commit 2d7a2bb47f15 · 2017-05-02T08:06:03.000+10:00
FixFont sometimes can't be right work.
diff --git a/dialogs/EditDlg.cpp b/dialogs/EditDlg.cpp
@@ -52,7 +52,8 @@ void CEditDlg::DoDataExchange(CDataExchange* pDX)
    }
  else
    {
-   FixFont (m_font, m_ctlText, App.m_strFixedPitchFont, App.m_iFixedPitchFontSize, FW_NORMAL, DEFAULT_CHARSET);
+	if(App.m_bFixedFontForEditing)
+		FixFont (m_font, m_ctlText, App.m_strFixedPitchFont, App.m_iFixedPitchFontSize, FW_NORMAL, DEFAULT_CHARSET);
    }
 
 }
diff --git a/dialogs/EditMultiLine.cpp b/dialogs/EditMultiLine.cpp
@@ -47,7 +47,7 @@ void CEditMultiLine::DoDataExchange(CDataExchange* pDX)
 	DDX_Text(pDX, IDC_TEXT, m_strText);
 	//}}AFX_DATA_MAP
 
- if(!pDX->m_bSaveAndValidate)
+ if(!pDX->m_bSaveAndValidate && App.m_bFixedFontForEditing)
    FixFont (m_font, m_ctlText, App.m_strFixedPitchFont, App.m_iFixedPitchFontSize, FW_NORMAL, DEFAULT_CHARSET);
 
 }

Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,8 @@ void CEditDlg::DoDataExchange(CDataExchange* pDX)`
`52`	`52`	`}`
`53`	`53`	`else`
`54`	`54`	`{`
`55`		`- FixFont (m_font, m_ctlText, App.m_strFixedPitchFont, App.m_iFixedPitchFontSize, FW_NORMAL, DEFAULT_CHARSET);`
	`55`	`+ if(App.m_bFixedFontForEditing)`
	`56`	`+ FixFont (m_font, m_ctlText, App.m_strFixedPitchFont, App.m_iFixedPitchFontSize, FW_NORMAL, DEFAULT_CHARSET);`
`56`	`57`	`}`
`57`	`58`
`58`	`59`	`}`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ void CEditMultiLine::DoDataExchange(CDataExchange* pDX)`
`47`	`47`	`DDX_Text(pDX, IDC_TEXT, m_strText);`
`48`	`48`	`//}}AFX_DATA_MAP`
`49`	`49`
`50`		`- if(!pDX->m_bSaveAndValidate)`
	`50`	`+ if(!pDX->m_bSaveAndValidate && App.m_bFixedFontForEditing)`
`51`	`51`	`FixFont (m_font, m_ctlText, App.m_strFixedPitchFont, App.m_iFixedPitchFontSize, FW_NORMAL, DEFAULT_CHARSET);`
`52`	`52`
`53`	`53`	`}`