diff options
Diffstat (limited to 'plugins/ModernOpt/src')
| -rw-r--r-- | plugins/ModernOpt/src/modernopt.cpp | 20 | ||||
| -rw-r--r-- | plugins/ModernOpt/src/modernopt.h | 4 | ||||
| -rw-r--r-- | plugins/ModernOpt/src/mopt_selector.cpp | 36 |
3 files changed, 30 insertions, 30 deletions
diff --git a/plugins/ModernOpt/src/modernopt.cpp b/plugins/ModernOpt/src/modernopt.cpp index 8eb3a1b369..8ef64ff744 100644 --- a/plugins/ModernOpt/src/modernopt.cpp +++ b/plugins/ModernOpt/src/modernopt.cpp @@ -69,15 +69,15 @@ static void ModernOptUI_SelectSection(HWND hwndDlg, struct ModernOptionsData *da // Main option pages
struct ModernOptMainPageInfo g_ModernOptPages[MODERNOPT_PAGE_COUNT] =
{
- {0, FALSE, IDI_MIRANDA, LPGENT("Home"), LPGENT("Miranda NG configuration center")},
- {IDC_BTN_ACCOUNTS, TRUE, IDI_BIG_NETWORK, LPGENT("Accounts"), LPGENT("Setup your account information to start messaging.")},
- {IDC_BTN_SKINS, TRUE, IDI_BIG_SKINS, LPGENT("Style"), LPGENT("Change the look of Miranda NG according to your taste.")},
- {IDC_BTN_CLIST, TRUE, IDI_BIG_BUDDYLIST, LPGENT("Contacts"), LPGENT("Configure behavior of your contact list.")},
- {IDC_BTN_MESSAGING, TRUE, IDI_BIG_MESSAGE, LPGENT("Chats"), LPGENT("Customize look&&feel of your chat windows here.")},
- {IDC_BTN_IGNORE, TRUE, IDI_BIG_IGNORE, LPGENT("Ignore"), LPGENT("Ban those users and events, you are annoyed with.")},
- {IDC_BTN_STATUS, TRUE, IDI_BIG_STATUS, LPGENT("Status"), LPGENT("Set your status messages and idle reporting.")},
- {IDC_BTN_ADVANCED, TRUE, IDI_BIG_ADVANCED, LPGENT("Advanced"), LPGENT("")},
- {IDC_BTN_PLUGINS, TRUE, IDI_BIG_MODULES, LPGENT("Plugins"), LPGENT("Miranda NG is all about plugins. Manage all the plugins you have here.")},
+ {0, FALSE, IDI_MIRANDA, LPGENW("Home"), LPGENW("Miranda NG configuration center")},
+ {IDC_BTN_ACCOUNTS, TRUE, IDI_BIG_NETWORK, LPGENW("Accounts"), LPGENW("Setup your account information to start messaging.")},
+ {IDC_BTN_SKINS, TRUE, IDI_BIG_SKINS, LPGENW("Style"), LPGENW("Change the look of Miranda NG according to your taste.")},
+ {IDC_BTN_CLIST, TRUE, IDI_BIG_BUDDYLIST, LPGENW("Contacts"), LPGENW("Configure behavior of your contact list.")},
+ {IDC_BTN_MESSAGING, TRUE, IDI_BIG_MESSAGE, LPGENW("Chats"), LPGENW("Customize look&&feel of your chat windows here.")},
+ {IDC_BTN_IGNORE, TRUE, IDI_BIG_IGNORE, LPGENW("Ignore"), LPGENW("Ban those users and events, you are annoyed with.")},
+ {IDC_BTN_STATUS, TRUE, IDI_BIG_STATUS, LPGENW("Status"), LPGENW("Set your status messages and idle reporting.")},
+ {IDC_BTN_ADVANCED, TRUE, IDI_BIG_ADVANCED, LPGENW("Advanced"), LPGENW("")},
+ {IDC_BTN_PLUGINS, TRUE, IDI_BIG_MODULES, LPGENW("Plugins"), LPGENW("Miranda NG is all about plugins. Manage all the plugins you have here.")},
};
////////////////////////////////////////////////////////////////////////////////
@@ -371,7 +371,7 @@ static HWND ModernOptUI_ShowPage_Impl(HWND hwndDlg, struct ModernOptionsData *da return obj->hwnd;
}
-static int lstrcmp_null(TCHAR *p1, TCHAR *p2)
+static int lstrcmp_null(wchar_t *p1, wchar_t *p2)
{
if (!p1 && !p2) return 0;
if (!p1) return -1;
diff --git a/plugins/ModernOpt/src/modernopt.h b/plugins/ModernOpt/src/modernopt.h index 0fe6bce59f..12dc27c5c3 100644 --- a/plugins/ModernOpt/src/modernopt.h +++ b/plugins/ModernOpt/src/modernopt.h @@ -32,8 +32,8 @@ struct ModernOptMainPageInfo int idcButton;
BOOL bShowTab;
int iIcon;
- TCHAR *lpzTitle;
- TCHAR *lpzDescription;
+ wchar_t *lpzTitle;
+ wchar_t *lpzDescription;
int iPageType;
BOOL bShow;
};
diff --git a/plugins/ModernOpt/src/mopt_selector.cpp b/plugins/ModernOpt/src/mopt_selector.cpp index 7c669dd656..5e97984584 100644 --- a/plugins/ModernOpt/src/mopt_selector.cpp +++ b/plugins/ModernOpt/src/mopt_selector.cpp @@ -26,18 +26,18 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "stdafx.h"
-static void sttApplySkin(MODERNOPTOBJECT *obj, TCHAR *fn)
+static void sttApplySkin(MODERNOPTOBJECT *obj, wchar_t *fn)
{
CallProtoService(obj->lpzThemeModuleName, TS_SKIN_APPLY, NULL, (LPARAM)fn);
}
-static TCHAR *sttGetActiveSkin(MODERNOPTOBJECT *obj)
+static wchar_t *sttGetActiveSkin(MODERNOPTOBJECT *obj)
{
return ProtoServiceExists(obj->lpzThemeModuleName, TS_SKIN_ACTIVE) ?
- (TCHAR*)CallProtoService(obj->lpzThemeModuleName, TS_SKIN_ACTIVE, 0, 0) : 0;
+ (wchar_t*)CallProtoService(obj->lpzThemeModuleName, TS_SKIN_ACTIVE, 0, 0) : 0;
}
-static void sttPreviewSkin(MODERNOPTOBJECT *obj, TCHAR *fn, LPDRAWITEMSTRUCT lps)
+static void sttPreviewSkin(MODERNOPTOBJECT *obj, wchar_t *fn, LPDRAWITEMSTRUCT lps)
{
if (!fn) return;
@@ -75,24 +75,24 @@ static void sttPreviewSkin(MODERNOPTOBJECT *obj, TCHAR *fn, LPDRAWITEMSTRUCT lps struct TSkinListItem
{
- TCHAR *path;
- TCHAR *title;
- TCHAR *filename;
+ wchar_t *path;
+ wchar_t *title;
+ wchar_t *filename;
- TSkinListItem(TCHAR *fn)
+ TSkinListItem(wchar_t *fn)
{
title = mir_tstrdup(fn);
- if (TCHAR *p = _tcsrchr(title, _T('.')))
+ if (wchar_t *p = wcsrchr(title, '.'))
*p = 0;
- TCHAR curPath[MAX_PATH];
+ wchar_t curPath[MAX_PATH];
GetCurrentDirectory(_countof(curPath), curPath);
- path = (TCHAR *)mir_alloc(MAX_PATH * sizeof(TCHAR));
+ path = (wchar_t *)mir_alloc(MAX_PATH * sizeof(wchar_t));
PathToRelativeT(curPath, path);
size_t length = mir_tstrlen(curPath) + mir_tstrlen(fn) + 2;
- filename = (TCHAR *)mir_alloc(length * sizeof(TCHAR));
+ filename = (wchar_t *)mir_alloc(length * sizeof(wchar_t));
mir_sntprintf(filename, length, L"%s\\%s", curPath, fn);
}
@@ -107,7 +107,7 @@ struct TSkinListItem struct TSelectorData
{
MODERNOPTOBJECT *obj;
- TCHAR *active;
+ wchar_t *active;
HBITMAP hbmpPreview;
TSelectorData()
@@ -121,18 +121,18 @@ struct TSelectorData }
};
-static bool CheckExt(TCHAR *fn, TCHAR *ext, int n)
+static bool CheckExt(wchar_t *fn, wchar_t *ext, int n)
{
size_t l = mir_tstrlen(fn);
return (l > n) && !mir_tstrcmp(fn + l - n, ext);
}
-static void BuildSkinList(HWND hwndList, TCHAR *szExt, int nExtLength = -1, bool start = true)
+static void BuildSkinList(HWND hwndList, wchar_t *szExt, int nExtLength = -1, bool start = true)
{
if (start) {
- static TCHAR mirPath[MAX_PATH];
+ static wchar_t mirPath[MAX_PATH];
GetModuleFileName(NULL, mirPath, _countof(mirPath));
- if (TCHAR *p = _tcsrchr(mirPath, _T('\\'))) *p = 0;
+ if (wchar_t *p = wcsrchr(mirPath, '\\')) *p = 0;
SetCurrentDirectory(mirPath);
SendMessage(hwndList, LB_RESETCONTENT, 0, 0);
nExtLength = (int)mir_tstrlen(szExt);
@@ -168,7 +168,7 @@ static void BuildSkinList(HWND hwndList, TCHAR *szExt, int nExtLength = -1, bool }
}
-static void CreatePreview(TSelectorData *sd, TCHAR *fn, LPDRAWITEMSTRUCT lps)
+static void CreatePreview(TSelectorData *sd, wchar_t *fn, LPDRAWITEMSTRUCT lps)
{
HDC hdc = CreateCompatibleDC(lps->hDC);
sd->hbmpPreview = CreateCompatibleBitmap(lps->hDC, lps->rcItem.right - lps->rcItem.left, lps->rcItem.bottom - lps->rcItem.top);
|