1 files changed, 14 insertions, 31 deletions

diff --git a/plugins/NewStory/src/calendartool.cpp b/plugins/NewStory/src/calendartool.cpp
index dd2578d33a..49960debf6 100644
--- a/plugins/NewStory/src/calendartool.cpp
+++ b/plugins/NewStory/src/calendartool.cpp
@@ -1,21 +1,12 @@
 #include "stdafx.h"
 
-struct CalendarToolData
-{
-	int x, y;
-};
-
 INT_PTR CALLBACK CalendarToolDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
 {
-	CalendarToolData* data = (CalendarToolData*)GetWindowLongPtr(hwnd, GWLP_USERDATA);
 	switch (msg) {
 	case WM_INITDIALOG:
-		data = (CalendarToolData*)lParam;
-		SetWindowLongPtr(hwnd, GWLP_USERDATA, (LONG_PTR)data);
-
 		// This causes ALL miranda dialogs to have drop-shadow enabled. That's bad =(
 		// SetClassLong(hwnd, GCL_STYLE, GetClassLong(hwnd, GCL_STYLE)|CS_DROPSHADOW);
-		SetWindowPos(hwnd, HWND_TOP, data->x, data->y, 0, 0, SWP_NOSIZE);
+		SetWindowPos(hwnd, HWND_TOP, LOWORD(lParam), HIWORD(lParam), 0, 0, SWP_NOSIZE);
 		return TRUE;
 
 	case WM_ACTIVATE:
@@ -36,37 +27,29 @@ INT_PTR CALLBACK CalendarToolDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM
 		break;
 
 	case WM_NOTIFY:
-	{
-		LPNMHDR hdr = (LPNMHDR)lParam;
-		if ((hdr->idFrom = IDC_MONTHCALENDAR1) && (hdr->code == MCN_SELECT)) {
-			LPNMSELCHANGE lpnmsc = (LPNMSELCHANGE)lParam;
-			struct tm tm_sel;
-			tm_sel.tm_hour = tm_sel.tm_min = tm_sel.tm_sec = 0;
-			tm_sel.tm_isdst = 1;
-			tm_sel.tm_mday = lpnmsc->stSelStart.wDay;
-			tm_sel.tm_mon = lpnmsc->stSelStart.wMonth - 1;
-			tm_sel.tm_year = lpnmsc->stSelStart.wYear - 1900;
-			EndDialog(hwnd, mktime(&tm_sel));
+		{
+			LPNMHDR hdr = (LPNMHDR)lParam;
+			if ((hdr->idFrom == IDC_MONTHCALENDAR1) && (hdr->code == MCN_SELECT)) {
+				LPNMSELCHANGE lpnmsc = (LPNMSELCHANGE)lParam;
+				struct tm tm_sel;
+				tm_sel.tm_hour = tm_sel.tm_min = tm_sel.tm_sec = 0;
+				tm_sel.tm_isdst = 1;
+				tm_sel.tm_mday = lpnmsc->stSelStart.wDay;
+				tm_sel.tm_mon = lpnmsc->stSelStart.wMonth - 1;
+				tm_sel.tm_year = lpnmsc->stSelStart.wYear - 1900;
+				EndDialog(hwnd, mktime(&tm_sel));
+			}
 		}
 		return TRUE;
-	}
 
 	case WM_CLOSE:
 		DestroyWindow(hwnd);
 		return TRUE;
-
-	case WM_DESTROY:
-		delete data;
-		data = 0;
-		SetWindowLongPtr(hwnd, GWLP_USERDATA, 0);
 	}
 	return FALSE;
 }
 
 time_t CalendarTool_Show(HWND hwnd, int x, int y)
 {
-	CalendarToolData* data = new CalendarToolData;
-	data->x = x;
-	data->y = y;
-	return DialogBoxParam(g_plugin.getInst(), MAKEINTRESOURCE(IDD_CALENDARTOOL), hwnd, CalendarToolDlgProc, (LPARAM)data);
+	return DialogBoxParam(g_plugin.getInst(), MAKEINTRESOURCE(IDD_CALENDARTOOL), hwnd, CalendarToolDlgProc, MAKELONG(x, y));
 }