Skip to content

Commit 8661d66

Browse files
committed
fixedwidth font fixes for timer and multiline trigger dlgs
1 parent a90ab15 commit 8661d66

File tree

3 files changed

+11
-1
lines changed

3 files changed

+11
-1
lines changed

dialogs/MultiLineTriggerDlg.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ void CMultiLineTriggerDlg::DoDataExchange(CDataExchange* pDX)
8686

8787
} // end of save and validate
8888
else
89-
FixFont (m_font, m_ctlTriggerText, "Courier New", 9, FW_NORMAL, DEFAULT_CHARSET);
89+
FixFont (m_font, m_ctlTriggerText, App.m_strFixedPitchFont, App.m_iFixedPitchFontSize, FW_NORMAL, DEFAULT_CHARSET);
9090

9191
}
9292

dialogs/world_prefs/TimerDlg.cpp

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ CTimerDlg::CTimerDlg(CWnd* pParent /*=NULL*/)
5050

5151
m_current_timer = NULL;
5252
m_pTimerMap = NULL;
53+
m_font = NULL;
5354
m_pDoc = NULL;
5455

5556
}
@@ -253,6 +254,13 @@ void CTimerDlg::DoDataExchange(CDataExchange* pDX)
253254
} // end of having non-blank procedure
254255

255256
} // end of saving and validating
257+
else
258+
{
259+
if (App.m_bFixedFontForEditing)
260+
{
261+
FixFont(m_font, m_ctlContents, App.m_strFixedPitchFont, App.m_iFixedPitchFontSize, FW_NORMAL, DEFAULT_CHARSET);
262+
}
263+
}
256264

257265
}
258266

dialogs/world_prefs/TimerDlg.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ class CTimerDlg : public CDialog
1717
// Construction
1818
public:
1919
CTimerDlg(CWnd* pParent = NULL); // standard constructor
20+
~CTimerDlg() { delete m_font; };
2021

2122
// Dialog Data
2223
//{{AFX_DATA(CTimerDlg)
@@ -52,6 +53,7 @@ class CTimerDlg : public CDialog
5253

5354
CTimerMap * m_pTimerMap;
5455
CTimer * m_current_timer;
56+
CFont * m_font;
5557
CMUSHclientDoc * m_pDoc;
5658

5759

0 commit comments

Comments
 (0)