From 9291fbdf04bc65fe05611d1a60e586feb86402cc Mon Sep 17 00:00:00 2001 From: Kirill Volinsky Date: Sat, 27 Dec 2014 10:33:37 +0000 Subject: not needed code removed git-svn-id: http://svn.miranda-ng.org/main/trunk@11654 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/Utils/mir_fonts.cpp | 6 ++++-- plugins/Utils/mir_fonts.h | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) (limited to 'plugins/Utils') diff --git a/plugins/Utils/mir_fonts.cpp b/plugins/Utils/mir_fonts.cpp index 768ac12363..c7af5c3088 100644 --- a/plugins/Utils/mir_fonts.cpp +++ b/plugins/Utils/mir_fonts.cpp @@ -6,7 +6,7 @@ #include "mir_fonts.h" -int FontService_RegisterFont(const char *pszDbModule,const char *pszDbName,const TCHAR *pszSection,const TCHAR *pszDescription,int position,BOOL bAllowEffects,LOGFONT *plfDefault,COLORREF clrDefault) +int FontService_RegisterFont(const char *pszDbModule, const char *pszDbName, const TCHAR *pszSection, const TCHAR *pszDescription, const TCHAR* pszBackgroundGroup, const TCHAR* pszBackgroundName, int position, BOOL bAllowEffects, LOGFONT *plfDefault, COLORREF clrDefault) { FontIDT fid; memset(&fid, 0, sizeof(fid)); @@ -15,7 +15,9 @@ int FontService_RegisterFont(const char *pszDbModule,const char *pszDbName,const mir_strncpy(fid.prefix,pszDbName,sizeof(fid.prefix)); /* buffer safe */ mir_tstrncpy(fid.group,pszSection,SIZEOF(fid.group)); /* buffer safe */ mir_tstrncpy(fid.name,pszDescription,SIZEOF(fid.name)); /* buffer safe */ - fid.flags=FIDF_ALLOWREREGISTER; + mir_tstrncpy(fid.backgroundGroup, pszBackgroundGroup, SIZEOF(fid.backgroundGroup)); /* buffer safe */ + mir_tstrncpy(fid.backgroundName, pszBackgroundName, SIZEOF(fid.backgroundName)); /* buffer safe */ + fid.flags = FIDF_ALLOWREREGISTER; if(bAllowEffects) fid.flags|=FIDF_ALLOWEFFECTS; fid.order=position; if(plfDefault!=NULL) { diff --git a/plugins/Utils/mir_fonts.h b/plugins/Utils/mir_fonts.h index 46528c51c1..10acb6399e 100644 --- a/plugins/Utils/mir_fonts.h +++ b/plugins/Utils/mir_fonts.h @@ -1,6 +1,6 @@ -int FontService_RegisterFont(const char *pszDbModule,const char *pszDbName,const TCHAR *pszSection,const TCHAR *pszDescription,int position,BOOL bAllowEffects,LOGFONT *plfDefault,COLORREF clrDefault); -int FontService_GetFont(const TCHAR *pszSection,const TCHAR *pszDescription,COLORREF *pclr,LOGFONT *plf); +int FontService_RegisterFont(const char *pszDbModule, const char *pszDbName, const TCHAR *pszSection, const TCHAR *pszDescription, const TCHAR* pszBackgroundGroup, const TCHAR* pszBackgroundName, int position, BOOL bAllowEffects, LOGFONT *plfDefault, COLORREF clrDefault); +int FontService_GetFont(const TCHAR *pszSection, const TCHAR *pszDescription, COLORREF *pclr, LOGFONT *plf); int FontService_RegisterColor(const char *pszDbModule,const char *pszDbName,const TCHAR *pszSection,const TCHAR *pszDescription,COLORREF clrDefault); int FontService_GetColor(const TCHAR *pszSection,const TCHAR *pszDescription,COLORREF *pclr); -- cgit v1.2.3