diff options
| author | George Hazan <ghazan@miranda.im> | 2016-12-23 18:56:41 +0300 |
|---|---|---|
| committer | George Hazan <ghazan@miranda.im> | 2016-12-23 18:56:41 +0300 |
| commit | 64b2f3a0823db9bbfc428e3872e751f15cb07201 (patch) | |
| tree | 2f6b790a49db72d336570681fe1e5a9aa1425188 /plugins/Scriver/src/msgdialog.cpp | |
| parent | 698d2c931a1520a17ec6acda89a7126ea1119f3c (diff) | |
fix for conflicting message codes
Diffstat (limited to 'plugins/Scriver/src/msgdialog.cpp')
| -rw-r--r-- | plugins/Scriver/src/msgdialog.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/plugins/Scriver/src/msgdialog.cpp b/plugins/Scriver/src/msgdialog.cpp index fd24b73a60..ba32b638a2 100644 --- a/plugins/Scriver/src/msgdialog.cpp +++ b/plugins/Scriver/src/msgdialog.cpp @@ -937,7 +937,7 @@ INT_PTR CALLBACK DlgProcMessage(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP break;
case DM_CHANGEICONS:
- SendMessage(hwndDlg, DM_UPDATESTATUSBAR, 0, 0);
+ SendMessage(hwndDlg, GC_UPDATESTATUSBAR, 0, 0);
SetStatusIcon(dat);
case DM_UPDATEICON:
@@ -1055,7 +1055,7 @@ INT_PTR CALLBACK DlgProcMessage(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP SendMessage(hwndDlg, DM_REMAKELOG, 0, 0);
SendMessage(hwndDlg, DM_UPDATETITLEBAR, 0, 0);
SendMessage(hwndDlg, DM_UPDATETABCONTROL, 0, 0);
- SendMessage(hwndDlg, DM_UPDATESTATUSBAR, 0, 0);
+ SendMessage(hwndDlg, GC_UPDATESTATUSBAR, 0, 0);
SendDlgItemMessage(hwndDlg, IDC_MESSAGE, EM_REQUESTRESIZE, 0, 0);
SetupInfobar(dat->infobarData);
break;
@@ -1267,7 +1267,7 @@ INT_PTR CALLBACK DlgProcMessage(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP if (!IsWindowVisible(GetParent(hwndDlg)) && dat->hDbUnreadEventFirst == NULL)
dat->hDbUnreadEventFirst = hDbEvent;
dat->lastMessage = dbei.timestamp;
- SendMessage(hwndDlg, DM_UPDATESTATUSBAR, 0, 0);
+ SendMessage(hwndDlg, GC_UPDATESTATUSBAR, 0, 0);
if (GetForegroundWindow() == dat->hwndParent && dat->parent->hwndActive == hwndDlg)
SkinPlaySound("RecvMsgActive");
else SkinPlaySound("RecvMsgInactive");
@@ -1292,7 +1292,7 @@ INT_PTR CALLBACK DlgProcMessage(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP }
break;
- case DM_UPDATESTATUSBAR:
+ case GC_UPDATESTATUSBAR:
if (dat->parent->hwndActive == hwndDlg) {
wchar_t szText[256];
StatusBarData sbd = { 0 };
@@ -1363,14 +1363,14 @@ INT_PTR CALLBACK DlgProcMessage(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP dat->nTypeSecs--;
else {
dat->showTyping = 0;
- SendMessage(hwndDlg, DM_UPDATESTATUSBAR, 0, 0);
+ SendMessage(hwndDlg, GC_UPDATESTATUSBAR, 0, 0);
SendMessage(hwndDlg, DM_UPDATEICON, 0, 0);
}
}
else {
if (dat->nTypeSecs) {
dat->showTyping = 1;
- SendMessage(hwndDlg, DM_UPDATESTATUSBAR, 0, 0);
+ SendMessage(hwndDlg, GC_UPDATESTATUSBAR, 0, 0);
SendMessage(hwndDlg, DM_UPDATEICON, 0, 0);
}
}
@@ -1406,14 +1406,14 @@ INT_PTR CALLBACK DlgProcMessage(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP case DM_SHOWMESSAGESENDING:
SetTimer(hwndDlg, TIMERID_MSGSEND, 1000, NULL);
if (g_dat.flags & SMF_SHOWPROGRESS)
- SendMessage(dat->hwnd, DM_UPDATESTATUSBAR, 0, 0);
+ SendMessage(dat->hwnd, GC_UPDATESTATUSBAR, 0, 0);
break;
case DM_STOPMESSAGESENDING:
if (dat->messagesInProgress > 0) {
dat->messagesInProgress--;
if (g_dat.flags & SMF_SHOWPROGRESS)
- SendMessage(dat->hwnd, DM_UPDATESTATUSBAR, 0, 0);
+ SendMessage(dat->hwnd, GC_UPDATESTATUSBAR, 0, 0);
}
if (dat->messagesInProgress == 0)
KillTimer(hwndDlg, TIMERID_MSGSEND);
|