diff options
Diffstat (limited to 'plugins/Scriver/src')
| -rw-r--r-- | plugins/Scriver/src/msgdialog.cpp | 16 | ||||
| -rw-r--r-- | plugins/Scriver/src/msgwindow.h | 43 |
2 files changed, 29 insertions, 30 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);
diff --git a/plugins/Scriver/src/msgwindow.h b/plugins/Scriver/src/msgwindow.h index df0c822d16..ca2e643e7c 100644 --- a/plugins/Scriver/src/msgwindow.h +++ b/plugins/Scriver/src/msgwindow.h @@ -24,34 +24,33 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #define MSGWINDOW_H
/* container services */
-#define CM_ADDCHILD (WM_USER+0x180)
-#define CM_REMOVECHILD (WM_USER+0x181)
-#define CM_ACTIVATECHILD (WM_USER+0x182)
-#define CM_ACTIVATEPREV (WM_USER+0x183)
-#define CM_ACTIVATENEXT (WM_USER+0x184)
+#define CM_ADDCHILD (WM_USER+0x180)
+#define CM_REMOVECHILD (WM_USER+0x181)
+#define CM_ACTIVATECHILD (WM_USER+0x182)
+#define CM_ACTIVATEPREV (WM_USER+0x183)
+#define CM_ACTIVATENEXT (WM_USER+0x184)
#define CM_ACTIVATEBYINDEX (WM_USER+0x185)
-#define CM_GETCHILDCOUNT (WM_USER+0x188)
-#define CM_GETACTIVECHILD (WM_USER+0x189)
-#define CM_GETFLAGS (WM_USER+0x18A)
+#define CM_GETCHILDCOUNT (WM_USER+0x188)
+#define CM_GETACTIVECHILD (WM_USER+0x189)
+#define CM_GETFLAGS (WM_USER+0x18A)
-#define CM_UPDATETITLEBAR (WM_USER+0x190)
-#define CM_UPDATESTATUSBAR (WM_USER+0x191)
-#define CM_UPDATETABCONTROL (WM_USER+0x192)
-#define CM_STARTFLASHING (WM_USER+0x1A0)
-#define CM_POPUPWINDOW (WM_USER+0x1A1)
+#define CM_UPDATETITLEBAR (WM_USER+0x190)
+#define CM_UPDATESTATUSBAR (WM_USER+0x191)
+#define CM_UPDATETABCONTROL (WM_USER+0x192)
+#define CM_STARTFLASHING (WM_USER+0x1A0)
+#define CM_POPUPWINDOW (WM_USER+0x1A1)
-#define CM_GETTOOLBARSTATUS (WM_USER+0x1A2)
+#define CM_GETTOOLBARSTATUS (WM_USER+0x1A2)
/* child window services */
-#define DM_UPDATETITLEBAR (WM_USER+0x200)
-#define DM_UPDATESTATUSBAR (WM_USER+0x201)
-#define DM_UPDATETABCONTROL (WM_USER+0x202)
-#define DM_SETPARENT (WM_USER+0x203)
-#define DM_ACTIVATE (WM_USER+0x206)
-#define DM_GETCONTEXTMENU (WM_USER+0x207)
-#define DM_SETFOCUS (WM_USER+0x20A)
-#define DM_CLISTSETTINGSCHANGED (WM_USER+0x20B)
+#define DM_UPDATETITLEBAR (WM_USER+0x1B0)
+#define DM_UPDATETABCONTROL (WM_USER+0x1B2)
+#define DM_SETPARENT (WM_USER+0x1B3)
+#define DM_ACTIVATE (WM_USER+0x1B6)
+#define DM_GETCONTEXTMENU (WM_USER+0x1B7)
+#define DM_SETFOCUS (WM_USER+0x1BA)
+#define DM_CLISTSETTINGSCHANGED (WM_USER+0x1BB)
#define SBDF_TEXT 1
#define SBDF_ICON 2
|