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

Temporary solution to make SetFont work again

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@1811 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
kichik 2002-11-21 23:32:05 +00:00
parent 20e2277078
commit 1fc6f94b86
2 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Source/DialogTemplate.cpp
View file

@ -247,11 +247,14 @@ void CDialogTemplate::RemoveItem(WORD wId) {
// 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_SETFONT; m_dwStyle &= ~DS_SHELLFONT;
m_dwStyle &= ~DS_FIXEDSYS;
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)];
lstrcpy(m_szFont, szFaceName); lstrcpy(m_szFont, szFaceName);
m_sFontSize = wFontSize; m_sFontSize = wFontSize;
m_bExtended = false;
} }
// Adds an item to the dialog // Adds an item to the dialog

6
Source/DialogTemplate.h
View file

@ -82,7 +82,7 @@ typedef struct {
short cx; short cx;
short cy; short cy;
WORD id; WORD id;
WORD _miscrosoft_docs_are_wrong; WORD _miscrosoft_docs_are_wrong;
} DLGITEMTEMPLATEEX; } DLGITEMTEMPLATEEX;
#pragma pack(pop) #pragma pack(pop)
@ -105,7 +105,7 @@ public:
void RTrimToString(WORD id, char *str, int margins); void RTrimToString(WORD id, char *str, int margins);
void LTrimToString(WORD id, char *str, int margins); void LTrimToString(WORD id, char *str, int margins);
void CTrimToString(WORD id, char *str, int margins); void CTrimToString(WORD id, char *str, int margins);
void ConvertToRTL(); void ConvertToRTL();
BYTE* Save(DWORD& dwSize); BYTE* Save(DWORD& dwSize);
DWORD GetSize(); DWORD GetSize();
@ -129,7 +129,7 @@ private:
short m_sFontSize; short m_sFontSize;
short m_sFontWeight; // Extended only short m_sFontWeight; // Extended only
BYTE m_bItalic; // Extended only BYTE m_bItalic; // Extended only
BYTE m_bCharset; // Extended only BYTE m_bCharset; // Extended only
char* m_szFont; char* m_szFont;
// Items vector // Items vector