From d977f1728ac71776a7ec58c0cf40c13fd87340ba Mon Sep 17 00:00:00 2001
From: Alexey Kulakov <panda75@bk.ru>
Date: Mon, 25 Jun 2012 06:36:19 +0000
Subject: removed deprecated header and link on it

git-svn-id: http://svn.miranda-ng.org/main/trunk@623 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 plugins/ExternalAPI/m_notify_popup.h | 29 -----------------------------
 plugins/Popup/resource.rc            |  2 +-
 plugins/Popup/src/headers.h          |  7 -------
 3 files changed, 1 insertion(+), 37 deletions(-)
 delete mode 100644 plugins/ExternalAPI/m_notify_popup.h

diff --git a/plugins/ExternalAPI/m_notify_popup.h b/plugins/ExternalAPI/m_notify_popup.h
deleted file mode 100644
index 88b6633b5b..0000000000
--- a/plugins/ExternalAPI/m_notify_popup.h
+++ /dev/null
@@ -1,29 +0,0 @@
-#ifndef __m_notify_popup_h__
-#define __m_notify_popup_h__
-
-#define NFOPT_POPUP2_BACKCOLOR    "Popup2/BackColor"
-#define NFOPT_POPUP2_TEXTCOLOR    "Popup2/TextColor"
-#define NFOPT_POPUP2_TIMEOUT      "Popup2/Timeout"
-#define NFOPT_POPUP2_LCLICKSVC    "Popup2/LClickSvc"
-#define NFOPT_POPUP2_LCLICKCOOKIE "Popup2/LClickCookie"
-#define NFOPT_POPUP2_RCLICKSVC    "Popup2/RClickSvc"
-#define NFOPT_POPUP2_RCLICKCOOKIE "Popup2/RClickCookie"
-#define NFOPT_POPUP2_STATUSMODE   "Popup2/StatusMode"
-#define NFOPT_POPUP2_PLUGINDATA   "Popup2/PluginData"
-#define NFOPT_POPUP2_WNDPROC      "Popup2/WndProc"
-
-#define NFOPT_POPUP2_BACKCOLOR_S  "Popup2/BackColor/Save"
-#define NFOPT_POPUP2_TEXTCOLOR_S  "Popup2/TextColor/Save"
-#define NFOPT_POPUP2_TIMEOUT_S    "Popup2/Timeout/Save"
-
-#define MS_POPUP2_SHOW   "Popup2/Show"
-#define MS_POPUP2_UPDATE "Popup2/Update"
-#define MS_POPUP2_REMOVE "Popup2/Remove"
-
-#ifndef POPUP2_NOHELPERS
-	#define MPopup2Show(a)   (CallService(MS_POPUP2_SHOW, 0, (LPARAM)(a)))
-	#define MPopup2Update(a) (CallService(MS_POPUP2_UPDATE, 0, (LPARAM)(a)))
-	#define MPopup2Remove(a) (CallService(MS_POPUP2_REMOVE, 0, (LPARAM)(a)))
-#endif
-
-#endif // __m_notify_popup_h__
diff --git a/plugins/Popup/resource.rc b/plugins/Popup/resource.rc
index 8b950e3b77..0d01beb1d7 100644
--- a/plugins/Popup/resource.rc
+++ b/plugins/Popup/resource.rc
@@ -7,7 +7,7 @@
 //
 // Generated from the TEXTINCLUDE 2 resource.
 //
-#include "afxres.h"
+#include "winres.h"
 
 /////////////////////////////////////////////////////////////////////////////
 #undef APSTUDIO_READONLY_SYMBOLS
diff --git a/plugins/Popup/src/headers.h b/plugins/Popup/src/headers.h
index 971a321fe2..552eb01c31 100644
--- a/plugins/Popup/src/headers.h
+++ b/plugins/Popup/src/headers.h
@@ -127,8 +127,6 @@ Last change by : $Author: Merlin_de $
 	#include <m_hpp.h>
 	#include <m_ieview.h>
 	#include <m_nconvers.h>
-//	#include <m_notify.h>		//deprecatet
-	#include <m_notify_popup.h>
 	#include <m_smileyadd.h>
 	#ifndef MTEXT_NOHELPERS
 		#define MTEXT_NOHELPERS
@@ -151,11 +149,8 @@ Last change by : $Author: Merlin_de $
 	#include "config.h"
 	#include "common.h"
 	#include "def_settings.h"
-//	#include "notify_imp.h"		//deprecatet
 	#include "opttree.h"
-//	#include "opt_old.h"		//deprecatet
 	#include "opt_gen.h"
-//	#include "opt_notify.h"		//deprecatet
 	#include "opt_skins.h"
 	#include "opt_contacts.h"
 	#include "opt_adv.h"
@@ -173,8 +168,6 @@ Last change by : $Author: Merlin_de $
 	#include "opt_class.h"
 	#include "popup_wnd2.h"
 	#include "effects.h"
-//	#include "popup_queue.h"
-//	#include "popup_list.h"
 
 	#include "avatars.h"
 	#include "avatars_simple.h"
-- 
cgit v1.2.3