- clist_modern switched to the core wildcmp[i] functions

- fixed chinese in skin options

git-svn-id: http://svn.miranda-ng.org/main/trunk@4512 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

2 files changed, 1 insertions, 4 deletions

diff --git a/plugins/Clist_modern/src/hdr/modern_commonprototypes.h b/plugins/Clist_modern/src/hdr/modern_commonprototypes.h
index 3fe99a1f86..9b2970ec06 100644
--- a/plugins/Clist_modern/src/hdr/modern_commonprototypes.h
+++ b/plugins/Clist_modern/src/hdr/modern_commonprototypes.h
@@ -203,15 +203,13 @@ int     Docking_ProcessWindowMessage(WPARAM wParam,LPARAM lParam);
 void    DrawBackGround(HWND hwnd,HDC mhdc, HBITMAP hBmpBackground, COLORREF bkColour, DWORD backgroundBmpUse );

 HRESULT BackgroundsLoadModule();

 int     BackgroundsUnloadModule();

-BOOL    wildcmp(const char *name, const char *mask, BYTE option);                              //mod_skin_selector.c

-BOOL    wildcmpi(const char *name, const char *mask);                                       //mod_skin_selector.c

-BOOL    wildcmpi(const WCHAR *name, const WCHAR *mask);                                       //mod_skin_selector.c

 INT_PTR CALLBACK DlgSkinEditorOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam);   //SkinEditor.c

 INT_PTR CALLBACK DlgTmplEditorOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam);   //RowTemplate.c

 BOOL    FindMenuHanleByGlobalID(HMENU hMenu, int globalID, struct _MenuItemHandles * dat);   //GenMenu.c

 BOOL    MatchMask(char *name, char *mask);                                    //mod_skin_selector.c

 char*   GetContactCachedProtocol(HANDLE hContact);                                 //clistsettings.c

 char*   GetParamN(char *string, char *buf, int buflen, BYTE paramN, char Delim, BOOL SkipSpaces);  //mod_skin_selector.c

+WCHAR*  GetParamN(WCHAR *string, WCHAR *buf, int buflen, BYTE paramN, WCHAR Delim, BOOL SkipSpaces);

 DWORD   CompareContacts2_getLMTime(HANDLE u);                                    //contact.c

 DWORD   mod_CalcHash(const char * a);                                          //mod_skin_selector.c

 HICON   cliGetIconFromStatusMode(HANDLE hContact, const char *szProto,int status);            //clistmod.c

diff --git a/plugins/Clist_modern/src/hdr/modern_skinselector.h b/plugins/Clist_modern/src/hdr/modern_skinselector.h
index 4e75fdecc5..7c6226c5e5 100644
--- a/plugins/Clist_modern/src/hdr/modern_skinselector.h
+++ b/plugins/Clist_modern/src/hdr/modern_skinselector.h
@@ -78,7 +78,6 @@ BOOL CompareStrWithModernMask(char * szValue,MODERNMASK *mmTemplate);
 MODERNMASK * FindMaskByStr(char * szValue,LISTMODERNMASK * mmTemplateList);

 DWORD mod_CalcHash(const char * a);

 char * ModernMaskToString(MODERNMASK *mm, char * buf, UINT bufsize);

-BOOL __inline wildcmp(const char * name, const char * mask, BYTE option);

 int RegisterObjectByParce(char * ObjectName, char * Params);

 SKINOBJECTDESCRIPTOR *  skin_FindObjectByRequest(char * szValue,LISTMODERNMASK * mmTemplateList);

 SKINOBJECTDESCRIPTOR *  skin_FindObjectByMask (MODERNMASK *mm,LISTMODERNMASK * mmTemplateList);