diff options
| author | pescuma <pescuma@c086bb3d-8645-0410-b8da-73a8550f86e7> | 2009-01-26 01:44:08 +0000 |
|---|---|---|
| committer | pescuma <pescuma@c086bb3d-8645-0410-b8da-73a8550f86e7> | 2009-01-26 01:44:08 +0000 |
| commit | 8c0fdc97e08a752bf9ca84a0ac17caa3a79bea22 (patch) | |
| tree | 5ab9b7fa0374ab941a77a503d6b1ac1dc2bfcf94 /Plugins/skins/MirandaFont.cpp | |
| parent | 5b6037bba0a247515bffdb1c0914d9cb01b8518c (diff) | |
skins: 0.0.0.4
* Fixed font service iteration
* Fixed naming of skin options
git-svn-id: http://pescuma.googlecode.com/svn/trunk/Miranda@141 c086bb3d-8645-0410-b8da-73a8550f86e7
Diffstat (limited to 'Plugins/skins/MirandaFont.cpp')
| -rw-r--r-- | Plugins/skins/MirandaFont.cpp | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/Plugins/skins/MirandaFont.cpp b/Plugins/skins/MirandaFont.cpp index 877d9b5..51b0f34 100644 --- a/Plugins/skins/MirandaFont.cpp +++ b/Plugins/skins/MirandaFont.cpp @@ -4,7 +4,7 @@ MirandaFont::MirandaFont(Field *aField, const char *description) : field(aField), hFont(NULL)
{
ZeroMemory(&fid, sizeof(fid));
- strncpy(fid.name, description, sizeof(fid.name));
+ lstrcpyn(fid.name, CharToTchar(description), sizeof(fid.name));
}
MirandaFont::~MirandaFont()
@@ -21,13 +21,12 @@ void MirandaFont::registerFont(FontState *font) HDC hdc = GetDC(NULL);
- // ZeroMemory(&fid, sizeof(fid));
fid.cbSize = sizeof(fid);
- strncpy(fid.group, field->getDialog()->getName(), sizeof(fid.group));
+ lstrcpyn(fid.group, CharToTchar(dlg->getDescription()), sizeof(fid.group));
strncpy(fid.dbSettingsGroup, dlg->getModule(), sizeof(fid.dbSettingsGroup));
char tmp[sizeof(fid.prefix)];
- mir_snprintf(tmp, sizeof(tmp), "%s_%s_%s_Font_", TcharToChar(dlg->getSkinName()), field->getDialog()->getName(), field->getName());
+ mir_snprintf(tmp, sizeof(tmp), "%s%s%sFont", TcharToChar(dlg->getSkinName()), dlg->getName(), field->getName());
strncpy(fid.prefix, tmp, sizeof(fid.prefix));
fid.deffontsettings.colour = font->getColor();
@@ -37,11 +36,11 @@ void MirandaFont::registerFont(FontState *font) | (font->isUnderline() ? DBFONTF_UNDERLINE : 0)
| (font->isStrikeOut() ? DBFONTF_STRIKEOUT : 0);
fid.deffontsettings.charset = DEFAULT_CHARSET;
- strncpy(fid.deffontsettings.szFace, TcharToUtf8(font->getFace()), sizeof(fid.deffontsettings.szFace));
+ lstrcpyn(fid.deffontsettings.szFace, font->getFace(), sizeof(fid.deffontsettings.szFace));
fid.order = dlg->getIndexOf(field);
fid.flags = FIDF_DEFAULTVALID | FIDF_ALLOWEFFECTS;
- CallService(MS_FONT_REGISTER, (WPARAM)&fid, 0);
+ CallService(MS_FONT_REGISTERT, (WPARAM)&fid, 0);
ReleaseDC(NULL, hdc);
@@ -55,7 +54,7 @@ void MirandaFont::reloadFont() releaseFont();
LOGFONT log_font;
- COLORREF color = (COLORREF) CallService(MS_FONT_GET, (WPARAM) &fid, (LPARAM) &log_font);
+ COLORREF color = (COLORREF) CallService(MS_FONT_GETT, (WPARAM) &fid, (LPARAM) &log_font);
hFont = CreateFontIndirect(&log_font);
switch(field->getType())
|