diff options
author | George Hazan <george.hazan@gmail.com> | 2013-02-13 19:34:27 +0000 |
---|---|---|
committer | George Hazan <george.hazan@gmail.com> | 2013-02-13 19:34:27 +0000 |
commit | 5823fde31b7185403f6fe4f24c1a858d63bfa2d3 (patch) | |
tree | 796b522f4f1c1986fb749457ee3f904157e928c5 /src | |
parent | cbdba41a954b4cf8849cc12ba5d27c458288c146 (diff) |
- 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
Diffstat (limited to 'src')
-rw-r--r-- | src/modules/clist/clcfiledrop.cpp | 2 | ||||
-rw-r--r-- | src/modules/clist/clui.cpp | 8 | ||||
-rw-r--r-- | src/modules/clist/cluiservices.cpp | 2 | ||||
-rw-r--r-- | src/modules/utils/colourpicker.cpp | 2 |
4 files changed, 7 insertions, 7 deletions
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;
|