diff options
| author | Tobias Weimer <wishmaster51@googlemail.com> | 2015-03-05 22:14:09 +0000 |
|---|---|---|
| committer | Tobias Weimer <wishmaster51@googlemail.com> | 2015-03-05 22:14:09 +0000 |
| commit | 18a91339f2d9e1449887f5d993ab2f038ff56833 (patch) | |
| tree | c5ee079c530794040fee8d2cfb497bd799545735 /plugins/TabSRMM/src/utils.cpp | |
| parent | b915069a9d7ad8d4da5da7a7d92d3e73a0a65346 (diff) | |
TabSRMM: code cleanup
git-svn-id: http://svn.miranda-ng.org/main/trunk@12344 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/TabSRMM/src/utils.cpp')
| -rw-r--r-- | plugins/TabSRMM/src/utils.cpp | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/plugins/TabSRMM/src/utils.cpp b/plugins/TabSRMM/src/utils.cpp index e0fa5dde0a..580a6bccc1 100644 --- a/plugins/TabSRMM/src/utils.cpp +++ b/plugins/TabSRMM/src/utils.cpp @@ -479,7 +479,7 @@ TCHAR* Utils::GetPreviewWithEllipsis(TCHAR *szText, size_t iMaxLen) cSaved = 0;
}
else {
- TCHAR *p = &szText[iMaxLen - 1];
+ p = &szText[iMaxLen - 1];
fEllipsis = true;
while (p >= szText && *p != ' ')
@@ -560,9 +560,9 @@ void Utils::RTF_ColorAdd(const TCHAR *tszColname, size_t length) /////////////////////////////////////////////////////////////////////////////////////////
// generic error popup dialog procedure
-INT_PTR CALLBACK Utils::PopupDlgProcError(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
+LRESULT CALLBACK Utils::PopupDlgProcError(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
{
- MCONTACT hContact = (MCONTACT)PUGetPluginData(hWnd);
+ MCONTACT hContact = PUGetContact(hWnd);
switch (message) {
case WM_COMMAND:
@@ -1192,12 +1192,7 @@ LRESULT CWarning::show(const int uId, DWORD dwFlags, const wchar_t* tszTxt) _s = TranslateTS(warnings[uId]);
}
}
- else if (-1 == uId && tszTxt) {
- dwFlags |= CWF_NOALLOWHIDE;
- _s = (dwFlags & CWF_UNTRANSLATED ? const_cast<wchar_t *>(tszTxt) : TranslateW(tszTxt));
- }
- else
- return -1;
+ return -1;
}
if ((wcslen(_s) > 3) && ((separator_pos = wcschr(_s, '|')) != 0)) {
|