From 5823fde31b7185403f6fe4f24c1a858d63bfa2d3 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Wed, 13 Feb 2013 19:34:27 +0000 Subject: - boost updated to 1.53, and should be placed into ..\..\boost folder - various compilation fixes git-svn-id: http://svn.miranda-ng.org/main/trunk@3591 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- include/m_clc.h | 2 +- include/m_utils.h | 2 +- plugins/BasicHistory/res/BasicHistory.rc | 5 +-- plugins/Clist_modern/src/modern_clui.cpp | 4 +-- plugins/Clist_modern/src/modern_cluiservices.cpp | 2 +- plugins/Clist_mw/src/clui.cpp | 2 +- plugins/Clist_nicer/src/clui.cpp | 2 +- plugins/CrashDumper/src/exhndlr.cpp | 2 +- plugins/New_GPG/new_gpg_10.vcxproj | 16 ++++----- plugins/New_GPG/new_gpg_11.vcxproj | 16 ++++----- plugins/Quotes/Forex_10.vcxproj | 16 ++++----- plugins/Quotes/Forex_11.vcxproj | 16 ++++----- plugins/Sessions/Src/Main.cpp | 2 +- plugins/Sessions/Src/Options.cpp | 2 +- plugins/StopSpamMod/stopspam_mod_10.vcxproj | 16 ++++----- plugins/StopSpamMod/stopspam_mod_11.vcxproj | 16 ++++----- protocols/GTalkExt/res/settings.rc | 41 ++++++++++++------------ protocols/GTalkExt/src/stdafx.h | 2 -- protocols/Twitter/src/tinyjson.hpp | 4 +-- protocols/Twitter/twitter_10.vcxproj | 8 ++--- protocols/Twitter/twitter_11.vcxproj | 8 ++--- src/modules/clist/clcfiledrop.cpp | 2 +- src/modules/clist/clui.cpp | 8 ++--- src/modules/clist/cluiservices.cpp | 2 +- src/modules/utils/colourpicker.cpp | 2 +- 25 files changed, 96 insertions(+), 102 deletions(-) diff --git a/include/m_clc.h b/include/m_clc.h index b8d50d864b..b7f6bf10f4 100644 --- a/include/m_clc.h +++ b/include/m_clc.h @@ -26,7 +26,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. //This module is new in 0.1.2.1 -#define CLISTCONTROL_CLASS _T("CListControl") +#define CLISTCONTROL_CLASS "CListControl" //styles #define CLS_MANUALUPDATE 0x0001 //todo diff --git a/include/m_utils.h b/include/m_utils.h index 60e407ffdb..64d0e2a2e3 100644 --- a/include/m_utils.h +++ b/include/m_utils.h @@ -277,7 +277,7 @@ __forceinline INT_PTR Utils_AssertInsideScreen(RECT *rc) { /************************ Colour Picker Control (0.1.2.1+) **********************/ -#define WNDCLASS_COLOURPICKER _T("ColourPicker") +#define WNDCLASS_COLOURPICKER "ColourPicker" #define CPM_SETCOLOUR 0x1000 //lParam = new colour #define CPM_GETCOLOUR 0x1001 //returns colour diff --git a/plugins/BasicHistory/res/BasicHistory.rc b/plugins/BasicHistory/res/BasicHistory.rc index 6da741a059..d0874095cc 100644 --- a/plugins/BasicHistory/res/BasicHistory.rc +++ b/plugins/BasicHistory/res/BasicHistory.rc @@ -11,10 +11,8 @@ #undef APSTUDIO_READONLY_SYMBOLS #include -#include -#include #include -#include +#include #include ///////////////////////////////////////////////////////////////////////////// @@ -262,4 +260,3 @@ IDI_MINUSEX ICON "mnode.ico" #endif // Neutral resources ///////////////////////////////////////////////////////////////////////////// - diff --git a/plugins/Clist_modern/src/modern_clui.cpp b/plugins/Clist_modern/src/modern_clui.cpp index 96ecc8b1e4..3fd7ed5423 100644 --- a/plugins/Clist_modern/src/modern_clui.cpp +++ b/plugins/Clist_modern/src/modern_clui.cpp @@ -106,7 +106,7 @@ int CLUI::OnEvent_ContactMenuPreBuild(WPARAM wParam, LPARAM lParam) CLISTMENUITEM mi = { sizeof(mi) }; mi.flags = CMIM_FLAGS; GetClassName(hwndClist,cls,SIZEOF(cls)); - hwndClist = (!lstrcmp(CLISTCONTROL_CLASS,cls))?hwndClist:pcli->hwndContactList; + hwndClist = (!lstrcmp( _T(CLISTCONTROL_CLASS), cls))?hwndClist:pcli->hwndContactList; hItem = (HANDLE)SendMessage(hwndClist,CLM_GETSELECTION, 0, 0); if ( !hItem) mi.flags = CMIM_FLAGS | CMIF_HIDDEN; @@ -307,7 +307,7 @@ HRESULT CLUI::RegisterAvatarMenu() HRESULT CLUI::CreateCLCWindow(const HWND hwndClui) { - ClcWnd() = CreateWindow(CLISTCONTROL_CLASS,_T(""), + ClcWnd() = CreateWindow( _T(CLISTCONTROL_CLASS),_T(""), WS_CHILD|WS_CLIPCHILDREN|CLS_CONTACTLIST |( db_get_b(NULL,"CList","UseGroups",SETTING_USEGROUPS_DEFAULT)?CLS_USEGROUPS:0) |( db_get_b(NULL,"CList","HideOffline",SETTING_HIDEOFFLINE_DEFAULT)?CLS_HIDEOFFLINE:0) diff --git a/plugins/Clist_modern/src/modern_cluiservices.cpp b/plugins/Clist_modern/src/modern_cluiservices.cpp index e3eb5652ca..2e431396c8 100644 --- a/plugins/Clist_modern/src/modern_cluiservices.cpp +++ b/plugins/Clist_modern/src/modern_cluiservices.cpp @@ -77,7 +77,7 @@ static INT_PTR GroupAdded(WPARAM wParam, LPARAM lParam) HWND hwndFocus = GetFocus(); GetClassName(hwndFocus, szFocusClass, SIZEOF(szFocusClass)); - if ( !lstrcmp(szFocusClass, CLISTCONTROL_CLASS)) { + if ( !lstrcmp(szFocusClass, _T(CLISTCONTROL_CLASS))) { hItem = (HANDLE) SendMessage(hwndFocus, CLM_FINDGROUP, wParam, 0); if (hItem) SendMessage(hwndFocus, CLM_EDITLABEL, (WPARAM) hItem, 0); diff --git a/plugins/Clist_mw/src/clui.cpp b/plugins/Clist_mw/src/clui.cpp index 67862d2a79..f30e910dd3 100644 --- a/plugins/Clist_mw/src/clui.cpp +++ b/plugins/Clist_mw/src/clui.cpp @@ -367,7 +367,7 @@ int OnSettingChanging(WPARAM wParam,LPARAM lParam) HWND PreCreateCLC(HWND parent) { - pcli->hwndContactTree = CreateWindow(CLISTCONTROL_CLASS,_T(""), + pcli->hwndContactTree = CreateWindow( _T(CLISTCONTROL_CLASS),_T(""), WS_CHILD|WS_CLIPCHILDREN|CLS_CONTACTLIST |( db_get_b(NULL,"CList","UseGroups",SETTING_USEGROUPS_DEFAULT)?CLS_USEGROUPS:0) | CLS_HIDEOFFLINE diff --git a/plugins/Clist_nicer/src/clui.cpp b/plugins/Clist_nicer/src/clui.cpp index d9639080cf..5da598e932 100644 --- a/plugins/Clist_nicer/src/clui.cpp +++ b/plugins/Clist_nicer/src/clui.cpp @@ -179,7 +179,7 @@ static int FS_FontsChanged(WPARAM wParam, LPARAM lParam) static HWND PreCreateCLC(HWND parent) { - pcli->hwndContactTree = CreateWindow(CLISTCONTROL_CLASS, _T(""), + pcli->hwndContactTree = CreateWindow( _T(CLISTCONTROL_CLASS), _T(""), WS_CHILD | CLS_CONTACTLIST | (cfg::getByte(NULL, "CList", "UseGroups", SETTING_USEGROUPS_DEFAULT) ? CLS_USEGROUPS : 0) | CLS_HIDEOFFLINE diff --git a/plugins/CrashDumper/src/exhndlr.cpp b/plugins/CrashDumper/src/exhndlr.cpp index 441df2056f..2b3b56301f 100644 --- a/plugins/CrashDumper/src/exhndlr.cpp +++ b/plugins/CrashDumper/src/exhndlr.cpp @@ -41,7 +41,7 @@ void UnloadDbgHlp(void) int myDebugFilter(unsigned int code, PEXCEPTION_POINTERS ep) { if (code == VcppException(ERROR_SEVERITY_ERROR, ERROR_MOD_NOT_FOUND) || - code == VcppException(ERROR_SEVERITY_ERROR, ERROR_PROC_NOT_FOUND)) + code == VcppException(ERROR_SEVERITY_ERROR, ERROR_PROC_NOT_FOUND)) { PDelayLoadInfo dlld = (PDelayLoadInfo)ep->ExceptionRecord->ExceptionInformation[0]; diff --git a/plugins/New_GPG/new_gpg_10.vcxproj b/plugins/New_GPG/new_gpg_10.vcxproj index a437bbe66a..9f25e9a073 100755 --- a/plugins/New_GPG/new_gpg_10.vcxproj +++ b/plugins/New_GPG/new_gpg_10.vcxproj @@ -304,7 +304,7 @@ Size true true - .\src\include;..\..\..\boost_1_49_0;..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) + .\src\include;..\..\..\boost;..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -323,7 +323,7 @@ shlwapi.lib;%(AdditionalDependencies) true - $(ProfileDir)..\..\bin10\lib;..\..\..\boost_1_49_0\lib + $(ProfileDir)..\..\bin10\lib;..\..\..\boost\stage\lib true true true @@ -355,7 +355,7 @@ Size true true - .\src\include;..\..\..\boost_1_49_0;..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) + .\src\include;..\..\..\boost;..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) WIN64;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -374,7 +374,7 @@ shlwapi.lib;%(AdditionalDependencies) true - $(ProfileDir)..\..\bin10\lib;..\..\..\boost_1_49_0\lib64 + $(ProfileDir)..\..\bin10\lib;..\..\..\boost\lib64 true true true @@ -445,7 +445,7 @@ Disabled - .\src\include;..\..\..\boost_1_49_0;..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) + .\src\include;..\..\..\boost;..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;TESTPLUG_EXPORTS;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -466,7 +466,7 @@ shlwapi.lib;%(AdditionalDependencies) true - $(ProfileDir)..\..\bin10\lib;..\..\..\boost_1_49_0\lib + $(ProfileDir)..\..\bin10\lib;..\..\..\boost\stage\lib true false @@ -491,7 +491,7 @@ Disabled - .\src\include;..\..\..\boost_1_49_0;..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) + .\src\include;..\..\..\boost;..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) WIN64;_DEBUG;_WINDOWS;_USRDLL;TESTPLUG_EXPORTS;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -512,7 +512,7 @@ shlwapi.lib;%(AdditionalDependencies) true - $(ProfileDir)..\..\bin10\lib;..\..\..\boost_1_49_0\lib64 + $(ProfileDir)..\..\bin10\lib;..\..\..\boost\lib64 true false diff --git a/plugins/New_GPG/new_gpg_11.vcxproj b/plugins/New_GPG/new_gpg_11.vcxproj index c97aaaa37e..6e7fbb977e 100644 --- a/plugins/New_GPG/new_gpg_11.vcxproj +++ b/plugins/New_GPG/new_gpg_11.vcxproj @@ -308,7 +308,7 @@ Size true true - .\src\include;..\..\..\boost_1_49_0;..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) + .\src\include;..\..\..\boost;..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -327,7 +327,7 @@ shlwapi.lib;%(AdditionalDependencies) true - $(ProfileDir)..\..\bin11\lib;..\..\..\boost_1_49_0\lib + $(ProfileDir)..\..\bin11\lib;..\..\..\boost\stage\lib true true true @@ -359,7 +359,7 @@ Size true true - .\src\include;..\..\..\boost_1_49_0;..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) + .\src\include;..\..\..\boost;..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) WIN64;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -378,7 +378,7 @@ shlwapi.lib;%(AdditionalDependencies) true - $(ProfileDir)..\..\bin11\lib;..\..\..\boost_1_49_0\lib64 + $(ProfileDir)..\..\bin11\lib;..\..\..\boost\lib64 true true true @@ -449,7 +449,7 @@ Disabled - .\src\include;..\..\..\boost_1_49_0;..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) + .\src\include;..\..\..\boost;..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;TESTPLUG_EXPORTS;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -470,7 +470,7 @@ shlwapi.lib;%(AdditionalDependencies) true - $(ProfileDir)..\..\bin11\lib;..\..\..\boost_1_49_0\lib + $(ProfileDir)..\..\bin11\lib;..\..\..\boost\stage\lib true false @@ -495,7 +495,7 @@ Disabled - .\src\include;..\..\..\boost_1_49_0;..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) + .\src\include;..\..\..\boost;..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) WIN64;_DEBUG;_WINDOWS;_USRDLL;TESTPLUG_EXPORTS;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -516,7 +516,7 @@ shlwapi.lib;%(AdditionalDependencies) true - $(ProfileDir)..\..\bin11\lib;..\..\..\boost_1_49_0\lib64 + $(ProfileDir)..\..\bin11\lib;..\..\..\boost\lib64 true false diff --git a/plugins/Quotes/Forex_10.vcxproj b/plugins/Quotes/Forex_10.vcxproj index 3def2265f1..b534b58ac6 100644 --- a/plugins/Quotes/Forex_10.vcxproj +++ b/plugins/Quotes/Forex_10.vcxproj @@ -72,7 +72,7 @@ Disabled - ..\..\include;..\..\plugins\ExternalAPI;..\..\..\boost_1_49_0;%(AdditionalIncludeDirectories) + ..\..\include;..\..\plugins\ExternalAPI;..\..\..\boost;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;FOREX_EXPORTS;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -86,7 +86,7 @@ Windows $(IntDir)$(TargetName).lib false - $(ProfileDir)..\..\bin10\lib;..\..\..\boost_1_49_0\lib + $(ProfileDir)..\..\bin10\lib;..\..\..\boost\stage\lib ..\..\include\msapi @@ -96,7 +96,7 @@ Disabled - ..\..\include;..\..\plugins\ExternalAPI;..\..\..\boost_1_49_0;%(AdditionalIncludeDirectories) + ..\..\include;..\..\plugins\ExternalAPI;..\..\..\boost;%(AdditionalIncludeDirectories) WIN64;_DEBUG;_WINDOWS;_USRDLL;FOREX_EXPORTS;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -109,7 +109,7 @@ Windows $(IntDir)$(TargetName).lib false - $(ProfileDir)..\..\bin10\lib;..\..\..\boost_1_49_0\lib + $(ProfileDir)..\..\bin10\lib;..\..\..\boost\stage\lib ..\..\include\msapi @@ -120,7 +120,7 @@ Full Size - ..\..\include;..\..\plugins\ExternalAPI;..\..\..\boost_1_49_0;%(AdditionalIncludeDirectories) + ..\..\include;..\..\plugins\ExternalAPI;..\..\..\boost;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;FOREX_EXPORTS;%(PreprocessorDefinitions) true Use @@ -134,7 +134,7 @@ true $(IntDir)$(TargetName).lib false - $(ProfileDir)..\..\bin10\lib;..\..\..\boost_1_49_0\lib + $(ProfileDir)..\..\bin10\lib;..\..\..\boost\stage\lib /PDBALTPATH:%_PDB% @@ -146,7 +146,7 @@ Full Size - ..\..\include;..\..\plugins\ExternalAPI;..\..\..\boost_1_49_0;%(AdditionalIncludeDirectories) + ..\..\include;..\..\plugins\ExternalAPI;..\..\..\boost;%(AdditionalIncludeDirectories) WIN64;NDEBUG;_WINDOWS;_USRDLL;FOREX_EXPORTS;%(PreprocessorDefinitions) true Use @@ -160,7 +160,7 @@ true $(IntDir)$(TargetName).lib false - $(ProfileDir)..\..\bin10\lib;..\..\..\boost_1_49_0\lib + $(ProfileDir)..\..\bin10\lib;..\..\..\boost\stage\lib /PDBALTPATH:%_PDB% diff --git a/plugins/Quotes/Forex_11.vcxproj b/plugins/Quotes/Forex_11.vcxproj index b7ab30bf75..7b8105496c 100644 --- a/plugins/Quotes/Forex_11.vcxproj +++ b/plugins/Quotes/Forex_11.vcxproj @@ -76,7 +76,7 @@ Disabled - ..\..\include;..\..\plugins\ExternalAPI;..\..\..\boost_1_49_0;%(AdditionalIncludeDirectories) + ..\..\include;..\..\plugins\ExternalAPI;..\..\..\boost;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;FOREX_EXPORTS;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -90,7 +90,7 @@ Windows $(IntDir)$(TargetName).lib false - $(ProfileDir)..\..\bin11\lib;..\..\..\boost_1_49_0\lib + $(ProfileDir)..\..\bin11\lib;..\..\..\boost\stage\lib ..\..\include\msapi @@ -100,7 +100,7 @@ Disabled - ..\..\include;..\..\plugins\ExternalAPI;..\..\..\boost_1_49_0;%(AdditionalIncludeDirectories) + ..\..\include;..\..\plugins\ExternalAPI;..\..\..\boost;%(AdditionalIncludeDirectories) WIN64;_DEBUG;_WINDOWS;_USRDLL;FOREX_EXPORTS;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -113,7 +113,7 @@ Windows $(IntDir)$(TargetName).lib false - $(ProfileDir)..\..\bin11\lib;..\..\..\boost_1_49_0\lib + $(ProfileDir)..\..\bin11\lib;..\..\..\boost\stage\lib ..\..\include\msapi @@ -124,7 +124,7 @@ Full Size - ..\..\include;..\..\plugins\ExternalAPI;..\..\..\boost_1_49_0;%(AdditionalIncludeDirectories) + ..\..\include;..\..\plugins\ExternalAPI;..\..\..\boost;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;FOREX_EXPORTS;%(PreprocessorDefinitions) true Use @@ -138,7 +138,7 @@ true $(IntDir)$(TargetName).lib false - $(ProfileDir)..\..\bin11\lib;..\..\..\boost_1_49_0\lib + $(ProfileDir)..\..\bin11\lib;..\..\..\boost\stage\lib /PDBALTPATH:%_PDB% @@ -150,7 +150,7 @@ Full Size - ..\..\include;..\..\plugins\ExternalAPI;..\..\..\boost_1_49_0;%(AdditionalIncludeDirectories) + ..\..\include;..\..\plugins\ExternalAPI;..\..\..\boost;%(AdditionalIncludeDirectories) WIN64;NDEBUG;_WINDOWS;_USRDLL;FOREX_EXPORTS;%(PreprocessorDefinitions) true Use @@ -164,7 +164,7 @@ true $(IntDir)$(TargetName).lib false - $(ProfileDir)..\..\bin11\lib;..\..\..\boost_1_49_0\lib + $(ProfileDir)..\..\bin11\lib;..\..\..\boost\stage\lib /PDBALTPATH:%_PDB% diff --git a/plugins/Sessions/Src/Main.cpp b/plugins/Sessions/Src/Main.cpp index 5bb8e5d0bf..587dd12fb5 100644 --- a/plugins/Sessions/Src/Main.cpp +++ b/plugins/Sessions/Src/Main.cpp @@ -182,7 +182,7 @@ INT_PTR CALLBACK SaveSessionDlgProc(HWND hdlg,UINT msg,WPARAM wparam,LPARAM lpar dy=20; dx=150; dd=5; - hClistControl = CreateWindowEx(WS_EX_CLIENTEDGE,CLISTCONTROL_CLASS, _T(""), + hClistControl = CreateWindowEx(WS_EX_CLIENTEDGE, _T(CLISTCONTROL_CLASS), _T(""), WS_TABSTOP |WS_VISIBLE | WS_CHILD , x, y, dx, dy, hdlg, (HMENU)IDC_CLIST, hinstance, 0); diff --git a/plugins/Sessions/Src/Options.cpp b/plugins/Sessions/Src/Options.cpp index d5295453fb..756aeeee44 100644 --- a/plugins/Sessions/Src/Options.cpp +++ b/plugins/Sessions/Src/Options.cpp @@ -375,7 +375,7 @@ INT_PTR CALLBACK OptionsProc(HWND hdlg,UINT msg,WPARAM wparam,LPARAM lparam) EnableWindow(GetDlgItem(hdlg,IDC_DEL),FALSE); //EnableWindow(GetDlgItem(hdlg,IDC_SAVE),TRUE); SetWindowText(GetDlgItem(hdlg,IDC_EDIT),TranslateT("View")); - hOpClistControl = CreateWindowEx(WS_EX_STATICEDGE,CLISTCONTROL_CLASS, _T(""), + hOpClistControl = CreateWindowEx(WS_EX_STATICEDGE, _T(CLISTCONTROL_CLASS), _T(""), WS_TABSTOP |WS_VISIBLE | WS_CHILD , 14,198,161,163,hdlg, (HMENU)IDC_EMCLIST, hinstance, 0); diff --git a/plugins/StopSpamMod/stopspam_mod_10.vcxproj b/plugins/StopSpamMod/stopspam_mod_10.vcxproj index fa75ecb225..51e8c5cfcf 100644 --- a/plugins/StopSpamMod/stopspam_mod_10.vcxproj +++ b/plugins/StopSpamMod/stopspam_mod_10.vcxproj @@ -85,7 +85,7 @@ Disabled - .\src\include;..\..\..\boost_1_49_0;..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) + .\src\include;..\..\..\boost;..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;STOPSPAM_EXPORTS;%(PreprocessorDefinitions);_UNICODE;UNICODE;_CRT_SECURE_NO_DEPRECATE true EnableFastChecks @@ -103,7 +103,7 @@ $(IntDir)$(TargetName).lib MachineX86 - $(ProfileDir)..\..\bin10\lib;..\..\..\boost_1_49_0\lib + $(ProfileDir)..\..\bin10\lib;..\..\..\boost\stage\lib ..\..\include\msapi @@ -116,7 +116,7 @@ Disabled - .\src\include;..\..\..\boost_1_49_0;..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) + .\src\include;..\..\..\boost;..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) WIN64;_DEBUG;_WINDOWS;_USRDLL;STOPSPAM_EXPORTS;%(PreprocessorDefinitions);_UNICODE;UNICODE;_CRT_SECURE_NO_DEPRECATE EnableFastChecks MultiThreadedDebugDLL @@ -132,7 +132,7 @@ $(IntDir)$(TargetName).lib - $(ProfileDir)..\..\bin10\lib;..\..\..\boost_1_49_0\lib64 + $(ProfileDir)..\..\bin10\lib;..\..\..\boost\lib64 ..\..\include\msapi @@ -146,7 +146,7 @@ Full OnlyExplicitInline - .\src\include;..\..\..\boost_1_49_0;..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) + .\src\include;..\..\..\boost;..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;STOPSPAM_EXPORTS;%(PreprocessorDefinitions);_UNICODE;UNICODE true MultiThreadedDLL @@ -171,7 +171,7 @@ $(IntDir)$(TargetName).lib MachineX86 - $(ProfileDir)..\..\bin10\lib;..\..\..\boost_1_49_0\lib + $(ProfileDir)..\..\bin10\lib;..\..\..\boost\stage\lib /PDBALTPATH:%_PDB% @@ -190,7 +190,7 @@ Full OnlyExplicitInline - .\src\include;..\..\..\boost_1_49_0;..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) + .\src\include;..\..\..\boost;..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) WIN64;NDEBUG;_WINDOWS;_USRDLL;STOPSPAM_EXPORTS;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -214,7 +214,7 @@ $(IntDir)$(TargetName).lib - $(ProfileDir)..\..\bin10\lib;..\..\..\boost_1_49_0\lib64 + $(ProfileDir)..\..\bin10\lib;..\..\..\boost\lib64 /PDBALTPATH:%_PDB% diff --git a/plugins/StopSpamMod/stopspam_mod_11.vcxproj b/plugins/StopSpamMod/stopspam_mod_11.vcxproj index f016d29aee..ca1e6516a5 100644 --- a/plugins/StopSpamMod/stopspam_mod_11.vcxproj +++ b/plugins/StopSpamMod/stopspam_mod_11.vcxproj @@ -89,7 +89,7 @@ Disabled - .\src\include;..\..\..\boost_1_49_0;..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) + .\src\include;..\..\..\boost;..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;STOPSPAM_EXPORTS;%(PreprocessorDefinitions);_UNICODE;UNICODE;_CRT_SECURE_NO_DEPRECATE true EnableFastChecks @@ -107,7 +107,7 @@ $(IntDir)$(TargetName).lib MachineX86 - $(ProfileDir)..\..\bin11\lib;..\..\..\boost_1_49_0\lib + $(ProfileDir)..\..\bin11\lib;..\..\..\boost\stage\lib ..\..\include\msapi @@ -120,7 +120,7 @@ Disabled - .\src\include;..\..\..\boost_1_49_0;..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) + .\src\include;..\..\..\boost;..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) WIN64;_DEBUG;_WINDOWS;_USRDLL;STOPSPAM_EXPORTS;%(PreprocessorDefinitions);_UNICODE;UNICODE;_CRT_SECURE_NO_DEPRECATE EnableFastChecks MultiThreadedDebugDLL @@ -136,7 +136,7 @@ $(IntDir)$(TargetName).lib - $(ProfileDir)..\..\bin11\lib;..\..\..\boost_1_49_0\lib64 + $(ProfileDir)..\..\bin11\lib;..\..\..\boost\lib64 ..\..\include\msapi @@ -150,7 +150,7 @@ Full OnlyExplicitInline - .\src\include;..\..\..\boost_1_49_0;..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) + .\src\include;..\..\..\boost;..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;STOPSPAM_EXPORTS;%(PreprocessorDefinitions);_UNICODE;UNICODE true MultiThreadedDLL @@ -175,7 +175,7 @@ $(IntDir)$(TargetName).lib MachineX86 - $(ProfileDir)..\..\bin11\lib;..\..\..\boost_1_49_0\lib + $(ProfileDir)..\..\bin11\lib;..\..\..\boost\stage\lib /PDBALTPATH:%_PDB% @@ -194,7 +194,7 @@ Full OnlyExplicitInline - .\src\include;..\..\..\boost_1_49_0;..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) + .\src\include;..\..\..\boost;..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) WIN64;NDEBUG;_WINDOWS;_USRDLL;STOPSPAM_EXPORTS;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -218,7 +218,7 @@ $(IntDir)$(TargetName).lib - $(ProfileDir)..\..\bin11\lib;..\..\..\boost_1_49_0\lib64 + $(ProfileDir)..\..\bin11\lib;..\..\..\boost\lib64 /PDBALTPATH:%_PDB% diff --git a/protocols/GTalkExt/res/settings.rc b/protocols/GTalkExt/res/settings.rc index 2da956af7e..097f4ef125 100644 --- a/protocols/GTalkExt/res/settings.rc +++ b/protocols/GTalkExt/res/settings.rc @@ -1,40 +1,39 @@ #include "..\src\resources.h" #include "winres.h" -#include "m_utils.h" IDD_MAILSETTINGS DIALOGEX 0, 0, 304, 228 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD EXSTYLE WS_EX_CONTROLPARENT FONT 8, "MS Shell Dlg", 0, 0, 0x1 { - CONTROL "", IDC_WARNBAR, STATIC, SS_LEFT, 30, 9, 3, 26 - CONTROL "NOTE\n\nThis will work only if this Jabber account is actually GTalk", IDC_NOTE, STATIC, SS_LEFT, 40, 9, 230, 26 - CONTROL "Popup notifications (needs popup plugin)", IDC_POPUPSENABLED, BUTTON, BS_AUTOCHECKBOX | WS_TABSTOP, 3, 36, 271, 14 - CONTROL "Notify in fullscreen mode too", IDC_POPUPSINFULLSCREEN, BUTTON, BS_AUTOCHECKBOX | WS_TABSTOP, 17, 51, 254, 15 + CONTROL "", IDC_WARNBAR, STATIC, SS_LEFT, 30, 9, 3, 26 + CONTROL "NOTE\n\nThis will work only if this Jabber account is actually GTalk", IDC_NOTE, STATIC, SS_LEFT, 40, 9, 230, 26 + CONTROL "Popup notifications (needs popup plugin)", IDC_POPUPSENABLED, BUTTON, BS_AUTOCHECKBOX | WS_TABSTOP, 3, 36, 271, 14 + CONTROL "Notify in fullscreen mode too", IDC_POPUPSINFULLSCREEN, BUTTON, BS_AUTOCHECKBOX | WS_TABSTOP, 17, 51, 254, 15 CONTROL "Use this if your popup plugin does not correctly detect fullscreen mode. It will take away your keyboard focus", IDC_POPUPSINFULLSCREENLABEL, STATIC, SS_LEFT, 30, 65, 270, 22 - CONTROL "Notify in contact list", IDC_PSEUDOCONTACTENABLED, BUTTON, BS_AUTOCHECKBOX | WS_TABSTOP, 3, 83, 271, 14 - CONTROL "Clear pseudocontact history before adding new events", IDC_CLEARPSEUDOCONTACTLOG, BUTTON, BS_AUTOCHECKBOX | WS_TABSTOP, 17, 97, 254, 15 - CONTROL "Supress foreign popups for pseudocontact", IDC_SUPRESSFOREIGN, BUTTON, BS_AUTOCHECKBOX | WS_TABSTOP, 17, 111, 254, 15 - CONTROL "Mark history event read when popup closed", IDC_MARKEVENTREAD, BUTTON, BS_AUTOCHECKBOX | WS_TABSTOP, 3, 128, 300, 15 + CONTROL "Notify in contact list", IDC_PSEUDOCONTACTENABLED, BUTTON, BS_AUTOCHECKBOX | WS_TABSTOP, 3, 83, 271, 14 + CONTROL "Clear pseudocontact history before adding new events", IDC_CLEARPSEUDOCONTACTLOG, BUTTON, BS_AUTOCHECKBOX | WS_TABSTOP, 17, 97, 254, 15 + CONTROL "Supress foreign popups for pseudocontact", IDC_SUPRESSFOREIGN, BUTTON, BS_AUTOCHECKBOX | WS_TABSTOP, 17, 111, 254, 15 + CONTROL "Mark history event read when popup closed", IDC_MARKEVENTREAD, BUTTON, BS_AUTOCHECKBOX | WS_TABSTOP, 3, 128, 300, 15 CONTROL "Add message snip to notification", IDC_ADDSNIP, BUTTON, BS_AUTOCHECKBOX | WS_TABSTOP, 3, 146, 300, 15 - CONTROL "Try to login before open mailbox", IDC_AUTHONMAILBOX, BUTTON, BS_AUTOCHECKBOX | WS_TABSTOP, 3, 164, 300, 15 - CONTROL "This works only if password is saved in the database. Has no effect on links in pseudocontact message log", IDC_AUTHONMAILBOXLABEL, STATIC, SS_LEFT, 15, 178, 280, 26 - CONTROL "Choose GMail view you use in web interface", IDC_MAILBOXVIEWLABEL, STATIC, SS_LEFT, 3, 200, 280, 15 - CONTROL "I don't know", IDC_UNKNOWNVIEW, BUTTON, BS_AUTORADIOBUTTON | WS_TABSTOP, 17, 212, 50, 8 - CONTROL "Standard view", IDC_STANDARDVIEW, BUTTON, BS_AUTORADIOBUTTON | WS_TABSTOP, 80, 212, 60, 8 - CONTROL "Basic HTML", IDC_HTMLVIEW, BUTTON, BS_AUTORADIOBUTTON | WS_TABSTOP, 150, 212, 60, 8 -} - + CONTROL "Try to login before open mailbox", IDC_AUTHONMAILBOX, BUTTON, BS_AUTOCHECKBOX | WS_TABSTOP, 3, 164, 300, 15 + CONTROL "This works only if password is saved in the database. Has no effect on links in pseudocontact message log", IDC_AUTHONMAILBOXLABEL, STATIC, SS_LEFT, 15, 178, 280, 26 + CONTROL "Choose GMail view you use in web interface", IDC_MAILBOXVIEWLABEL, STATIC, SS_LEFT, 3, 200, 280, 15 + CONTROL "I don't know", IDC_UNKNOWNVIEW, BUTTON, BS_AUTORADIOBUTTON | WS_TABSTOP, 17, 212, 50, 8 + CONTROL "Standard view", IDC_STANDARDVIEW, BUTTON, BS_AUTORADIOBUTTON | WS_TABSTOP, 80, 212, 60, 8 + CONTROL "Basic HTML", IDC_HTMLVIEW, BUTTON, BS_AUTORADIOBUTTON | WS_TABSTOP, 150, 212, 60, 8 +} + IDD_POPUPSETTINGS DIALOGEX 0, 0, 304, 65 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD -EXSTYLE WS_EX_CONTROLPARENT +EXSTYLE WS_EX_CONTROLPARENT FONT 8, "MS Shell Dlg", 0, 0, 0x1 { - GROUPBOX "", IDC_GROUP, 0, 0, 304, 65 + GROUPBOX "", IDC_GROUP, 0, 0, 304, 65 CONTROL "Background color", IDC_BACKCOLORLABEL, STATIC, SS_LEFT, 10, 10, 60, 15 - CONTROL "", IDC_BACKCOLORPICKER, WNDCLASS_COLOURPICKER, WS_TABSTOP, 70, 10, 39, 10 + CONTROL "", IDC_BACKCOLORPICKER, "ColourPicker", WS_TABSTOP, 70, 10, 39, 10 CONTROL "Text color", IDC_TEXTCOLORLABEL, STATIC, SS_LEFT, 10, 25, 50, 15 - CONTROL "", IDC_TEXTCOLORPICKER, WNDCLASS_COLOURPICKER, WS_TABSTOP, 70, 25, 39, 10 + CONTROL "", IDC_TEXTCOLORPICKER, "ColourPicker", WS_TABSTOP, 70, 25, 39, 10 CONTROL "Timeout", IDC_TIMEOUTLABEL, STATIC, SS_LEFT, 10, 40, 50, 13 CONTROL "", IDC_TIMEOUTEDIT, EDIT, WS_TABSTOP | WS_BORDER, 70, 40, 39, 10 CONTROL "If both colors set to the same value, default colors will be used", IDC_DEFCOLORSLABEL, STATIC, SS_LEFT, 120, 10, 120, 25 diff --git a/protocols/GTalkExt/src/stdafx.h b/protocols/GTalkExt/src/stdafx.h index d9712d7e9c..ded641295b 100644 --- a/protocols/GTalkExt/src/stdafx.h +++ b/protocols/GTalkExt/src/stdafx.h @@ -67,5 +67,3 @@ #define _tstoi64 _ttoi #define _tcstoui64(A,B,C) _ttoi(A) #endif - -#define WNDCLASS_COLOURPICKER _T("ColourPicker") \ No newline at end of file diff --git a/protocols/Twitter/src/tinyjson.hpp b/protocols/Twitter/src/tinyjson.hpp index 240a3503c5..d87ca8420e 100644 --- a/protocols/Twitter/src/tinyjson.hpp +++ b/protocols/Twitter/src/tinyjson.hpp @@ -28,8 +28,8 @@ #include #include -#include -#include +#include +#include #include #include diff --git a/protocols/Twitter/twitter_10.vcxproj b/protocols/Twitter/twitter_10.vcxproj index a6c5ead3ff..09fd1a5e27 100644 --- a/protocols/Twitter/twitter_10.vcxproj +++ b/protocols/Twitter/twitter_10.vcxproj @@ -72,7 +72,7 @@ Disabled - ..\..\include;..\..\plugins\ExternalAPI;src\oauth;..\..\..\boost_1_49_0;%(AdditionalIncludeDirectories) + ..\..\include;..\..\plugins\ExternalAPI;src\oauth;..\..\..\boost;%(AdditionalIncludeDirectories) WIN32;_WINDOWS;_USRDLL;TWITTER_EXPORTS;_CRT_SECURE_NO_WARNINGS;NOMINMAX;%(PreprocessorDefinitions) true EnableFastChecks @@ -95,7 +95,7 @@ Disabled - ..\..\include;..\..\plugins\ExternalAPI;src\oauth;..\..\..\boost_1_49_0;%(AdditionalIncludeDirectories) + ..\..\include;..\..\plugins\ExternalAPI;src\oauth;..\..\..\boost;%(AdditionalIncludeDirectories) WIN64;_WINDOWS;_USRDLL;TWITTER_EXPORTS;_CRT_SECURE_NO_WARNINGS;NOMINMAX;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -115,7 +115,7 @@ - ..\..\include;..\..\plugins\ExternalAPI;src\oauth;..\..\..\boost_1_49_0;%(AdditionalIncludeDirectories) + ..\..\include;..\..\plugins\ExternalAPI;src\oauth;..\..\..\boost;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;TWITTER_EXPORTS;_CRT_SECURE_NO_WARNINGS;NOMINMAX;%(PreprocessorDefinitions) Level3 Full @@ -139,7 +139,7 @@ - ..\..\include;..\..\plugins\ExternalAPI;src\oauth;..\..\..\boost_1_49_0;%(AdditionalIncludeDirectories) + ..\..\include;..\..\plugins\ExternalAPI;src\oauth;..\..\..\boost;%(AdditionalIncludeDirectories) WIN64;NDEBUG;_WINDOWS;_USRDLL;TWITTER_EXPORTS;_CRT_SECURE_NO_WARNINGS;NOMINMAX;%(PreprocessorDefinitions) Level3 Full diff --git a/protocols/Twitter/twitter_11.vcxproj b/protocols/Twitter/twitter_11.vcxproj index babcd4e5c1..1565b854b8 100644 --- a/protocols/Twitter/twitter_11.vcxproj +++ b/protocols/Twitter/twitter_11.vcxproj @@ -76,7 +76,7 @@ Disabled - ..\..\include;..\..\plugins\ExternalAPI;src\oauth;..\..\..\boost_1_49_0;%(AdditionalIncludeDirectories) + ..\..\include;..\..\plugins\ExternalAPI;src\oauth;..\..\..\boost;%(AdditionalIncludeDirectories) WIN32;_WINDOWS;_USRDLL;TWITTER_EXPORTS;_CRT_SECURE_NO_WARNINGS;NOMINMAX;%(PreprocessorDefinitions) true EnableFastChecks @@ -99,7 +99,7 @@ Disabled - ..\..\include;..\..\plugins\ExternalAPI;src\oauth;..\..\..\boost_1_49_0;%(AdditionalIncludeDirectories) + ..\..\include;..\..\plugins\ExternalAPI;src\oauth;..\..\..\boost;%(AdditionalIncludeDirectories) WIN64;_WINDOWS;_USRDLL;TWITTER_EXPORTS;_CRT_SECURE_NO_WARNINGS;NOMINMAX;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -119,7 +119,7 @@ - ..\..\include;..\..\plugins\ExternalAPI;src\oauth;..\..\..\boost_1_49_0;%(AdditionalIncludeDirectories) + ..\..\include;..\..\plugins\ExternalAPI;src\oauth;..\..\..\boost;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;TWITTER_EXPORTS;_CRT_SECURE_NO_WARNINGS;NOMINMAX;%(PreprocessorDefinitions) Level3 Full @@ -143,7 +143,7 @@ - ..\..\include;..\..\plugins\ExternalAPI;src\oauth;..\..\..\boost_1_49_0;%(AdditionalIncludeDirectories) + ..\..\include;..\..\plugins\ExternalAPI;src\oauth;..\..\..\boost;%(AdditionalIncludeDirectories) WIN64;NDEBUG;_WINDOWS;_USRDLL;TWITTER_EXPORTS;_CRT_SECURE_NO_WARNINGS;NOMINMAX;%(PreprocessorDefinitions) Level3 Full diff --git a/src/modules/clist/clcfiledrop.cpp b/src/modules/clist/clcfiledrop.cpp index 05ef5b36a7..dfd75751ee 100644 --- a/src/modules/clist/clcfiledrop.cpp +++ b/src/modules/clist/clcfiledrop.cpp @@ -147,7 +147,7 @@ HRESULT CDropTarget::DragEnter(IDataObject *pDataObj, DWORD grfKeyState, POINTL shortPt.y = pt.y; hwnd = WindowFromPoint(shortPt); GetClassName(hwnd, szWindowClass, SIZEOF(szWindowClass)); - if ( !lstrcmp(szWindowClass, CLISTCONTROL_CLASS)) { + if ( !lstrcmp(szWindowClass, _T(CLISTCONTROL_CLASS))) { struct ClcData *dat; hwndCurrentDrag = hwnd; dat = (struct ClcData *) GetWindowLongPtr(hwndCurrentDrag, 0); diff --git a/src/modules/clist/clui.cpp b/src/modules/clist/clui.cpp index 307cc0b914..ab4b7db76a 100644 --- a/src/modules/clist/clui.cpp +++ b/src/modules/clist/clui.cpp @@ -96,7 +96,7 @@ static int MenuItem_PreBuild(WPARAM, LPARAM) CLISTMENUITEM mi = { sizeof(mi) }; mi.flags = CMIM_FLAGS; GetClassName(hwndClist, cls, SIZEOF(cls)); - hwndClist = ( !lstrcmp(CLISTCONTROL_CLASS, cls)) ? hwndClist : cli.hwndContactList; + hwndClist = ( !lstrcmp( _T(CLISTCONTROL_CLASS), cls)) ? hwndClist : cli.hwndContactList; hItem = (HANDLE) SendMessage(hwndClist, CLM_GETSELECTION, 0, 0); if ( !hItem) mi.flags = CMIM_FLAGS | CMIF_HIDDEN; @@ -111,7 +111,7 @@ static INT_PTR MenuItem_RenameContact(WPARAM, LPARAM) HWND hwndClist = GetFocus(); GetClassName(hwndClist, cls, SIZEOF(cls)); // worst case scenario, the rename is sent to the main contact list - hwndClist = ( !lstrcmp(CLISTCONTROL_CLASS, cls)) ? hwndClist : cli.hwndContactList; + hwndClist = ( !lstrcmp( _T(CLISTCONTROL_CLASS), cls)) ? hwndClist : cli.hwndContactList; hItem = (HANDLE) SendMessage(hwndClist, CLM_GETSELECTION, 0, 0); if (hItem) { SetFocus(hwndClist); @@ -287,7 +287,7 @@ int LoadCLUIModule(void) wndclass.hCursor = LoadCursor(NULL, IDC_ARROW); wndclass.hbrBackground = NULL; wndclass.lpszMenuName = NULL; - wndclass.lpszClassName = CLISTCONTROL_CLASS; + wndclass.lpszClassName = _T(CLISTCONTROL_CLASS); wndclass.hIconSm = NULL; RegisterClassEx(&wndclass); @@ -510,7 +510,7 @@ LRESULT CALLBACK fnContactListWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM return FALSE; case M_CREATECLC: - cli.hwndContactTree = CreateWindow(CLISTCONTROL_CLASS, _T(""), + cli.hwndContactTree = CreateWindow( _T(CLISTCONTROL_CLASS), _T(""), WS_CHILD | WS_VISIBLE | WS_CLIPCHILDREN | CLS_CONTACTLIST | (db_get_b(NULL, "CList", "UseGroups", SETTING_USEGROUPS_DEFAULT) ? CLS_USEGROUPS : 0) diff --git a/src/modules/clist/cluiservices.cpp b/src/modules/clist/cluiservices.cpp index ef9885de72..cc67c14954 100644 --- a/src/modules/clist/cluiservices.cpp +++ b/src/modules/clist/cluiservices.cpp @@ -55,7 +55,7 @@ static INT_PTR GroupAdded(WPARAM wParam, LPARAM lParam) HWND hwndFocus = GetFocus(); GetClassName(hwndFocus, szFocusClass, SIZEOF(szFocusClass)); - if ( !lstrcmp(szFocusClass, CLISTCONTROL_CLASS)) { + if ( !lstrcmp(szFocusClass, _T(CLISTCONTROL_CLASS))) { hItem = (HANDLE) SendMessage(hwndFocus, CLM_FINDGROUP, wParam, 0); if (hItem) SendMessage(hwndFocus, CLM_EDITLABEL, (WPARAM) hItem, 0); diff --git a/src/modules/utils/colourpicker.cpp b/src/modules/utils/colourpicker.cpp index 1b5c4ca55e..1c7ec449de 100644 --- a/src/modules/utils/colourpicker.cpp +++ b/src/modules/utils/colourpicker.cpp @@ -97,7 +97,7 @@ int InitColourPicker(void) wcl.cbWndExtra = sizeof(COLORREF)*2; wcl.hInstance = hInst; wcl.hCursor = NULL; - wcl.lpszClassName = WNDCLASS_COLOURPICKER; + wcl.lpszClassName = _T(WNDCLASS_COLOURPICKER); wcl.hbrBackground = (HBRUSH)(COLOR_BTNFACE+1); wcl.hIcon = NULL; wcl.lpszMenuName = NULL; -- cgit v1.2.3