diff options
| author | Tobias Weimer <wishmaster51@googlemail.com> | 2012-10-16 19:12:32 +0000 |
|---|---|---|
| committer | Tobias Weimer <wishmaster51@googlemail.com> | 2012-10-16 19:12:32 +0000 |
| commit | ee854715a0f8589b312599dfead0cd3609a28cb7 (patch) | |
| tree | d1e8827d01e9fcb19db7172d9c856cceb56f69b9 | |
| parent | 425a2a9cc185edbbf88b6347c84fbc895e52b761 (diff) | |
minor changes
git-svn-id: http://svn.miranda-ng.org/main/trunk@1963 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
| -rw-r--r-- | plugins/PluginUpdater/src/Notifications.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/plugins/PluginUpdater/src/Notifications.cpp b/plugins/PluginUpdater/src/Notifications.cpp index 3ed7fca2b2..c11b805789 100644 --- a/plugins/PluginUpdater/src/Notifications.cpp +++ b/plugins/PluginUpdater/src/Notifications.cpp @@ -34,7 +34,7 @@ void PopupAction(HWND hWnd, BYTE action) PUDeletePopUp(hWnd);
}
-static INT_PTR CALLBACK PopupDlgProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
+static LRESULT CALLBACK PopupDlgProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
{
switch (uMsg) {
case UM_POPUPACTION:
@@ -71,7 +71,7 @@ static INT_PTR CALLBACK PopupDlgProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM return DefWindowProc(hDlg, uMsg, wParam, lParam);
}
-static INT_PTR CALLBACK PopupDlgProc2(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
+static LRESULT CALLBACK PopupDlgProc2(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
{
switch (uMsg) {
case WM_COMMAND:
@@ -104,12 +104,12 @@ static void MakePopupAction(POPUPACTION &pa, int id) switch (id) {
case IDYES:
pa.lchIcon = Skin_GetIcon("btn_ok");
- strncpy_s(pa.lpzTitle, MODNAME"/Yes", SIZEOF(pa.lpzTitle));
+ strncpy_s(pa.lpzTitle, MODNAME"/Yes", MAX_ACTIONTITLE);
break;
case IDNO:
pa.lchIcon = Skin_GetIcon("btn_cancel");
- strncpy_s(pa.lpzTitle, MODNAME"/No", SIZEOF(pa.lpzTitle));
+ strncpy_s(pa.lpzTitle, MODNAME"/No", MAX_ACTIONTITLE);
break;
}
}
@@ -141,8 +141,8 @@ void ShowPopup(HWND hDlg, LPCTSTR ptszTitle, LPCTSTR ptszText, int Number, int A pd.cbSize = sizeof(POPUPDATAT_V2);
pd.lchContact = NULL; //(HANDLE)wParam;
pd.lchIcon = LoadSkinnedIcon(PopupsList[Number].Icon);
- lstrcpyn(pd.lptzText, TranslateTS(ptszText), SIZEOF(pd.lptzText));
- lstrcpyn(pd.lptzContactName, TranslateTS(ptszTitle), SIZEOF(pd.lptzContactName));
+ lstrcpyn(pd.lptzText, TranslateTS(ptszText), MAX_SECONDLINE);
+ lstrcpyn(pd.lptzContactName, TranslateTS(ptszTitle), MAX_CONTACTNAME);
switch (PopupOptions.DefColors) {
case byCOLOR_WINDOWS:
pd.colorBack = GetSysColor(COLOR_BTNFACE);
@@ -157,9 +157,9 @@ void ShowPopup(HWND hDlg, LPCTSTR ptszTitle, LPCTSTR ptszText, int Number, int A break;
}
if (Number == 0 && ActType != 0)
- pd.PluginWindowProc = (WNDPROC)PopupDlgProc;
+ pd.PluginWindowProc = PopupDlgProc;
else
- pd.PluginWindowProc = (WNDPROC)PopupDlgProc2;
+ pd.PluginWindowProc = PopupDlgProc2;
pd.PluginData = pmpd;
if (Number == 0)
pd.iSeconds = -1;
|