From 66cb770a982a2502456d10d73838df2b7239fd89 Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Mon, 4 Mar 2013 07:23:42 +0000
Subject: new subclassing functions applied to all plugins

git-svn-id: http://svn.miranda-ng.org/main/trunk@3880 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 plugins/TabSRMM/src/include/controls.h  | 1 -
 plugins/TabSRMM/src/include/infopanel.h | 7 ++-----
 plugins/TabSRMM/src/include/msgs.h      | 1 -
 3 files changed, 2 insertions(+), 7 deletions(-)

(limited to 'plugins/TabSRMM/src/include')

diff --git a/plugins/TabSRMM/src/include/controls.h b/plugins/TabSRMM/src/include/controls.h
index 7c2560afe8..ac4c0a3374 100644
--- a/plugins/TabSRMM/src/include/controls.h
+++ b/plugins/TabSRMM/src/include/controls.h
@@ -108,7 +108,6 @@ private:
    bool     m_isAero;
    bool     m_mustAutoHide;
    LONG     m_size_y;
-   WNDPROC  m_oldWndProc;
    HANDLE   m_hevHook;
    /*
     * for custom drawing
diff --git a/plugins/TabSRMM/src/include/infopanel.h b/plugins/TabSRMM/src/include/infopanel.h
index f7513b8930..a7c64e469a 100644
--- a/plugins/TabSRMM/src/include/infopanel.h
+++ b/plugins/TabSRMM/src/include/infopanel.h
@@ -90,7 +90,7 @@ private:
 
 	       INT_PTR CALLBACK WndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam);
 	static INT_PTR CALLBACK WndProcStub(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam);
-	static INT_PTR CALLBACK RichEditProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam);
+	static LRESULT CALLBACK RichEditProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam);
 
 	HWND    m_hwnd;            // our window handle
 	HWND    m_hRich;           // handle of the rich edit child
@@ -104,9 +104,6 @@ private:
 	int     m_leftWidth;
 
 	const CInfoPanel *m_panel; // the info panel parent (if any)
-
-private:
-	static WNDPROC m_OldMessageEditProc;   // stores original richedit wnd proc
 };
 
 /**
@@ -182,7 +179,7 @@ public:
 public:
 	static TInfoPanelConfig m_ipConfig;
 	static int setPanelHandler(TWindowData *dat, WPARAM wParam, LPARAM lParam);
-	static INT_PTR CALLBACK avatarParentSubclass(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam);
+	static LRESULT CALLBACK avatarParentSubclass(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam);
 
 private:
 	void  mapRealRect(const RECT& rcSrc, RECT& rcDest, const SIZE& sz);
diff --git a/plugins/TabSRMM/src/include/msgs.h b/plugins/TabSRMM/src/include/msgs.h
index 3e95b494c0..13f64e33e2 100644
--- a/plugins/TabSRMM/src/include/msgs.h
+++ b/plugins/TabSRMM/src/include/msgs.h
@@ -346,7 +346,6 @@ struct TWindowData
 	int     nMax;            // max message size
 	int     textLen;         // current text len
 	LONG    ipFieldHeight;
-	WNDPROC oldIEViewProc;
 	BOOL    clr_added;
 	BOOL    fIsReattach;
 	WPARAM  wParam;          // used for "delayed" actions like moved splitters in minimized windows
-- 
cgit v1.2.3