From 5fbea6c9b7b89fd01f64a67244bddf6ecc8a7187 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Sun, 7 Apr 2013 20:50:13 +0000 Subject: more cleanup git-svn-id: http://svn.miranda-ng.org/main/trunk@4376 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/UserInfoEx/src/commonheaders.h | 1 - plugins/UserInfoEx/src/dlg_anniversarylist.cpp | 7 ++----- plugins/UserInfoEx/src/dlg_propsheet.cpp | 6 +----- 3 files changed, 3 insertions(+), 11 deletions(-) (limited to 'plugins/UserInfoEx/src') diff --git a/plugins/UserInfoEx/src/commonheaders.h b/plugins/UserInfoEx/src/commonheaders.h index c660fe8a52..8baa7f1eb9 100644 --- a/plugins/UserInfoEx/src/commonheaders.h +++ b/plugins/UserInfoEx/src/commonheaders.h @@ -86,7 +86,6 @@ using namespace std; #include #include #include -#include #include #include diff --git a/plugins/UserInfoEx/src/dlg_anniversarylist.cpp b/plugins/UserInfoEx/src/dlg_anniversarylist.cpp index 2bb666f10e..06404c4301 100644 --- a/plugins/UserInfoEx/src/dlg_anniversarylist.cpp +++ b/plugins/UserInfoEx/src/dlg_anniversarylist.cpp @@ -653,7 +653,6 @@ class CAnnivList SetUserData(hDlg, NULL); delete pDlg; } - MagneticWindows_RemoveWindow(hDlg); } break; } return FALSE; @@ -959,10 +958,8 @@ public: LoadFilter(); _hDlg = CreateDialogParam(ghInst, MAKEINTRESOURCE(IDD_ANNIVERSARY_LIST), NULL, DlgProc, (LPARAM)this); - if (_hDlg) { - MagneticWindows_AddWindow(_hDlg); - _mHookExit = HookEventMessage(ME_SYSTEM_PRESHUTDOWN, _hDlg, WM_CLOSE); - } + if (_hDlg) + _mHookExit = HookEventMessage(ME_SYSTEM_PRESHUTDOWN, _hDlg, WM_CLOSE); else { _mHookExit = NULL; delete this; diff --git a/plugins/UserInfoEx/src/dlg_propsheet.cpp b/plugins/UserInfoEx/src/dlg_propsheet.cpp index dfde72915f..0510e79b48 100644 --- a/plugins/UserInfoEx/src/dlg_propsheet.cpp +++ b/plugins/UserInfoEx/src/dlg_propsheet.cpp @@ -350,11 +350,8 @@ static INT_PTR ShowDialog(WPARAM wParam, LPARAM lParam) } // create the dialog itself hWnd = CreateDialogParam(ghInst, MAKEINTRESOURCE(IDD_DETAILS), NULL, DlgProc, (LPARAM)&psh); - if (!hWnd) { + if (!hWnd) MsgErr(NULL, LPGENT("Details dialog failed to be created. Returning error is %d."), GetLastError()); - } - else - MagneticWindows_AddWindow(hWnd); } return 0; } @@ -1809,7 +1806,6 @@ static INT_PTR CALLBACK DlgProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lPar DeleteObject(pPs->hCaptionFont); DeleteObject(pPs->hBoldFont); mir_free(pPs); pPs = NULL; - MagneticWindows_RemoveWindow(hDlg); } } return FALSE; -- cgit v1.2.3