dragonleo/NSIS
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

DS_SHELLFONT fixes

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@1843 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
kichik 2002-11-28 13:13:06 +00:00
parent ac4ef5df5c
commit 77dd6eed7f
1 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Source/DialogTemplate.cpp
View file

@ -127,7 +127,7 @@ CDialogTemplate::CDialogTemplate(BYTE* pbData) {
// Read title variant length array // Read title variant length array
ReadVarLenArr(seeker, m_szTitle); ReadVarLenArr(seeker, m_szTitle);
// Read font size and variant length array (only if style DS_SETFONT is used!) // Read font size and variant length array (only if style DS_SETFONT is used!)
if (m_dwStyle & DS_SETFONT || m_dwStyle & DS_SHELLFONT) { if (m_dwStyle & DS_SETFONT) {
m_sFontSize = *(short*)seeker; m_sFontSize = *(short*)seeker;
seeker += sizeof(short); seeker += sizeof(short);
if (m_bExtended) { if (m_bExtended) {
@ -245,10 +245,13 @@ void CDialogTemplate::RemoveItem(WORD wId) {
m_vItems.erase(m_vItems.begin() + i); m_vItems.erase(m_vItems.begin() + i);
} }
#ifndef DS_SHELLFONT
#define DS_SHELLFONT (DS_SETFONT | DS_FIXEDSYS)
#endif
// Sets the font of the dialog // Sets the font of the dialog
void CDialogTemplate::SetFont(char* szFaceName, WORD wFontSize) { void CDialogTemplate::SetFont(char* szFaceName, WORD wFontSize) {
m_dwStyle &= ~DS_SHELLFONT; m_dwStyle &= ~DS_SHELLFONT;
m_dwStyle &= ~DS_FIXEDSYS;
m_dwStyle |= DS_SETFONT; m_dwStyle |= DS_SETFONT;
if (m_szFont) delete [] m_szFont; if (m_szFont) delete [] m_szFont;
m_szFont = new char[lstrlen(szFaceName)]; m_szFont = new char[lstrlen(szFaceName)];
@ -468,7 +471,7 @@ BYTE* CDialogTemplate::Save(DWORD& dwSize) {
WriteStringOrId(m_szTitle); WriteStringOrId(m_szTitle);
// Write font variant length array, size, and extended info (if needed) // Write font variant length array, size, and extended info (if needed)
if (m_dwStyle & DS_SETFONT || m_dwStyle & DS_SHELLFONT) { if (m_dwStyle & DS_SETFONT) {
*(short*)seeker = m_sFontSize; *(short*)seeker = m_sFontSize;
seeker += sizeof(short); seeker += sizeof(short);
if (m_bExtended) { if (m_bExtended) {
@ -551,7 +554,7 @@ DWORD CDialogTemplate::GetSize() {
AddStringOrIdSize(m_szTitle); AddStringOrIdSize(m_szTitle);
// Font // Font
if (m_dwStyle & DS_SETFONT || m_dwStyle & DS_SHELLFONT) { if (m_dwStyle & DS_SETFONT) {
dwSize += sizeof(WORD) + (m_bExtended ? sizeof(short) + 2*sizeof(BYTE) : 0); dwSize += sizeof(WORD) + (m_bExtended ? sizeof(short) + 2*sizeof(BYTE) : 0);
AddStringOrIdSize(m_szFont); AddStringOrIdSize(m_szFont);
} }