From da1fc2e685d2933ca7064f75ac69cf0e4a290bd1 Mon Sep 17 00:00:00 2001 From: sje Date: Tue, 28 Nov 2006 00:43:59 +0000 Subject: patch for fontservice ansi/unicode services by TioDuke git-svn-id: https://server.scottellis.com.au/svn/mim_plugs@65 4f64403b-2f21-0410-a795-97e2b3489a10 --- yapp/popups2.cpp | 27 ++++++++++++++------------- yapp/version.h | 2 +- 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/yapp/popups2.cpp b/yapp/popups2.cpp index 1027289..7e5ead7 100644 --- a/yapp/popups2.cpp +++ b/yapp/popups2.cpp @@ -62,32 +62,33 @@ extern "C" POPUPS2_API PLUGININFO* MirandaPluginInfo(DWORD mirandaVersion) } int ReloadFont(WPARAM wParam, LPARAM lParam) { - LOGFONT log_font; if(ServiceExists(MS_FONT_GETW)) { + LOGFONTW log_font; if(hFontFirstLine) DeleteObject(hFontFirstLine); colFirstLine = CallService(MS_FONT_GETW, (WPARAM)&font_id_firstlinew, (LPARAM)&log_font); - hFontFirstLine = CreateFontIndirect(&log_font); + hFontFirstLine = CreateFontIndirectW(&log_font); if(hFontSecondLine) DeleteObject(hFontSecondLine); colSecondLine = CallService(MS_FONT_GETW, (WPARAM)&font_id_secondlinew, (LPARAM)&log_font); - hFontSecondLine = CreateFontIndirect(&log_font); + hFontSecondLine = CreateFontIndirectW(&log_font); if(hFontTime) DeleteObject(hFontTime); colTime = CallService(MS_FONT_GETW, (WPARAM)&font_id_timew, (LPARAM)&log_font); - hFontTime = CreateFontIndirect(&log_font); + hFontTime = CreateFontIndirectW(&log_font); colBg = CallService(MS_COLOUR_GETW, (WPARAM)&colour_id_bgw, 0); colBorder = CallService(MS_COLOUR_GETW, (WPARAM)&colour_id_borderw, 0); colSidebar = CallService(MS_COLOUR_GETW, (WPARAM)&colour_id_sidebarw, 0); } else { + LOGFONTA log_font; if(hFontFirstLine) DeleteObject(hFontFirstLine); colFirstLine = CallService(MS_FONT_GET, (WPARAM)&font_id_firstline, (LPARAM)&log_font); - hFontFirstLine = CreateFontIndirect(&log_font); + hFontFirstLine = CreateFontIndirectA(&log_font); if(hFontSecondLine) DeleteObject(hFontSecondLine); colSecondLine = CallService(MS_FONT_GET, (WPARAM)&font_id_secondline, (LPARAM)&log_font); - hFontSecondLine = CreateFontIndirect(&log_font); + hFontSecondLine = CreateFontIndirectA(&log_font); if(hFontTime) DeleteObject(hFontTime); colTime = CallService(MS_FONT_GET, (WPARAM)&font_id_time, (LPARAM)&log_font); - hFontTime = CreateFontIndirect(&log_font); + hFontTime = CreateFontIndirectA(&log_font); colBg = CallService(MS_COLOUR_GET, (WPARAM)&colour_id_bg, 0); colBorder = CallService(MS_COLOUR_GET, (WPARAM)&colour_id_border, 0); @@ -189,7 +190,7 @@ int ModulesLoaded(WPARAM wParam, LPARAM lParam) { hEventReloadFont = HookEvent(ME_FONT_RELOAD, ReloadFont); } else if(ServiceExists(MS_FONT_REGISTER)) { - font_id_firstline.cbSize = sizeof(FontIDW); + font_id_firstline.cbSize = sizeof(FontID); font_id_firstline.flags = FIDF_ALLOWEFFECTS; t2a(TranslateT("Popups"), font_id_firstline.group, 64); t2a(TranslateT("First line"), font_id_firstline.name, 64); @@ -197,7 +198,7 @@ int ModulesLoaded(WPARAM wParam, LPARAM lParam) { strcpy(font_id_firstline.prefix, "FontFirst"); font_id_firstline.order = 0; - font_id_secondline.cbSize = sizeof(FontIDW); + font_id_secondline.cbSize = sizeof(FontID); font_id_secondline.flags = FIDF_ALLOWEFFECTS; t2a(TranslateT("Popups"), font_id_secondline.group, 64); t2a(TranslateT("Second line"), font_id_secondline.name, 64); @@ -205,7 +206,7 @@ int ModulesLoaded(WPARAM wParam, LPARAM lParam) { strcpy(font_id_secondline.prefix, "FontSecond"); font_id_secondline.order = 1; - font_id_time.cbSize = sizeof(FontIDW); + font_id_time.cbSize = sizeof(FontID); font_id_time.flags = FIDF_ALLOWEFFECTS; t2a(TranslateT("Popups"), font_id_time.group, 64); t2a(TranslateT("Time"), font_id_time.name, 64); @@ -217,7 +218,7 @@ int ModulesLoaded(WPARAM wParam, LPARAM lParam) { CallService(MS_FONT_REGISTER, (WPARAM)&font_id_secondline, 0); CallService(MS_FONT_REGISTER, (WPARAM)&font_id_time, 0); - colour_id_bg.cbSize = sizeof(ColourIDW); + colour_id_bg.cbSize = sizeof(ColourID); t2a(TranslateT("Popups"), colour_id_bg.group, 64); t2a(TranslateT("Background"), colour_id_bg.name, 64); strcpy(colour_id_bg.dbSettingsGroup, MODULE); @@ -225,7 +226,7 @@ int ModulesLoaded(WPARAM wParam, LPARAM lParam) { colour_id_bg.defcolour = GetSysColor(COLOR_3DSHADOW); colour_id_bg.order = 0; - colour_id_border.cbSize = sizeof(ColourIDW); + colour_id_border.cbSize = sizeof(ColourID); t2a(TranslateT("Popups"), colour_id_border.group, 64); t2a(TranslateT("Border"), colour_id_border.name, 64); strcpy(colour_id_border.dbSettingsGroup, MODULE); @@ -233,7 +234,7 @@ int ModulesLoaded(WPARAM wParam, LPARAM lParam) { colour_id_border.defcolour = RGB(0, 0, 0); colour_id_border.order = 1; - colour_id_sidebar.cbSize = sizeof(ColourIDW); + colour_id_sidebar.cbSize = sizeof(ColourID); t2a(TranslateT("Popups"), colour_id_sidebar.group, 64); t2a(TranslateT("Sidebar"), colour_id_sidebar.name, 64); strcpy(colour_id_sidebar.dbSettingsGroup, MODULE); diff --git a/yapp/version.h b/yapp/version.h index 80c5c9a..39bbc6e 100644 --- a/yapp/version.h +++ b/yapp/version.h @@ -4,7 +4,7 @@ #define __MAJOR_VERSION 0 #define __MINOR_VERSION 2 #define __RELEASE_NUM 0 -#define __BUILD_NUM 0 +#define __BUILD_NUM 1 #define __FILEVERSION_STRING __MAJOR_VERSION,__MINOR_VERSION,__RELEASE_NUM,__BUILD_NUM #define __FILEVERSION_STRING_DOTS __MAJOR_VERSION.__MINOR_VERSION.__RELEASE_NUM.__BUILD_NUM -- cgit v1.2.3