R.I.P m_clui.h, you helped us alot

git-svn-id: http://svn.miranda-ng.org/main/trunk@16767 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

9 files changed, 14 insertions, 38 deletions

diff --git a/plugins/Clist_modern/src/groupmenu.cpp b/plugins/Clist_modern/src/groupmenu.cpp
index 6801632ee6..61c606bd4c 100644
--- a/plugins/Clist_modern/src/groupmenu.cpp
+++ b/plugins/Clist_modern/src/groupmenu.cpp
@@ -22,7 +22,6 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

 */

 #include "stdafx.h"

-#include "m_clui.h"

 #include "modern_clist.h"

 #include "modern_clc.h"

 

diff --git a/plugins/Clist_modern/src/modern_clc.cpp b/plugins/Clist_modern/src/modern_clc.cpp
index 30be3a17a7..a4183bc8f2 100644
--- a/plugins/Clist_modern/src/modern_clc.cpp
+++ b/plugins/Clist_modern/src/modern_clc.cpp
@@ -53,13 +53,6 @@ static ClcContact *hitcontact = NULL;
 HANDLE hSkinFolder;

 TCHAR SkinsFolder[MAX_PATH];

 

-static int clcHookSmileyAddOptionsChanged(WPARAM wParam, LPARAM lParam);

-static int clcHookIconsChanged(WPARAM wParam, LPARAM lParam);

-static int clcHookBkgndConfigChanged(WPARAM wParam, LPARAM lParam);

-static int clcProceedDragToScroll(HWND hwnd, int Y);

-static int clcExitDragToScroll();

-

-

 int ReloadSkinFolder(WPARAM, LPARAM)

 {

 	FoldersGetCustomPathT(hSkinFolder, SkinsFolder, _countof(SkinsFolder), _T(DEFAULT_SKIN_FOLDER));

@@ -205,19 +198,16 @@ static int clcExitDragToScroll()
 

 static int clcProceedDragToScroll(HWND hwnd, int Y)

 {

-	int pos, dy;

 	if (!IsDragToScrollMode) return 0;

 	if (GetCapture() != hwnd) clcExitDragToScroll();

-	dy = StartDragPos - Y;

-	pos = StartScrollPos + dy;

+	int dy = StartDragPos - Y;

+	int pos = StartScrollPos + dy;

 	if (pos < 0)

 		pos = 0;

 	SendMessage(hwnd, WM_VSCROLL, MAKEWPARAM(SB_THUMBTRACK, pos), 0);

 	return 1;

 }

 

-

-

 static int clcSearchNextContact(HWND hwnd, ClcData *dat, int index, const TCHAR *text, int prefixOk, BOOL fSearchUp)

 {

 	ClcGroup *group = &dat->list;

@@ -418,6 +408,7 @@ static LRESULT clcOnChar(ClcData *dat, HWND hwnd, UINT msg, WPARAM wParam, LPARA
 	}

 	return corecli.pfnContactListControlWndProc(hwnd, msg, wParam, lParam);

 }

+

 static LRESULT clcOnPaint(ClcData *dat, HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)

 {

 	if (IsWindowVisible(hwnd)) {

@@ -638,14 +629,14 @@ static LRESULT clcOnTimer(ClcData *dat, HWND hwnd, UINT msg, WPARAM wParam, LPAR
 		return corecli.pfnContactListControlWndProc(hwnd, msg, wParam, lParam);

 

 	case TIMERID_INVALIDATE:

-	{

-		time_t cur_time = (time(NULL) / 60);

-		if (cur_time != dat->last_tick_time) {

-			CLUI__cliInvalidateRect(hwnd, NULL, FALSE);

-			dat->last_tick_time = cur_time;

+		{

+			time_t cur_time = (time(NULL) / 60);

+			if (cur_time != dat->last_tick_time) {

+				CLUI__cliInvalidateRect(hwnd, NULL, FALSE);

+				dat->last_tick_time = cur_time;

+			}

 		}

-	}

-	return corecli.pfnContactListControlWndProc(hwnd, msg, wParam, lParam);

+		return corecli.pfnContactListControlWndProc(hwnd, msg, wParam, lParam);

 

 	case TIMERID_SUBEXPAND:

 		KillTimer(hwnd, TIMERID_SUBEXPAND);

@@ -691,7 +682,6 @@ static LRESULT clcOnTimer(ClcData *dat, HWND hwnd, UINT msg, WPARAM wParam, LPAR
 	}

 }

 

-

 static LRESULT clcOnActivate(ClcData *dat, HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)

 {

 	TRACE("clcOnActivate\n");

@@ -751,6 +741,7 @@ static LRESULT clcOnLButtonDown(ClcData *dat, HWND hwnd, UINT, WPARAM, LPARAM lP
 	int hit = cliHitTest(hwnd, dat, (short)LOWORD(lParam), (short)HIWORD(lParam), &contact, &group, &hitFlags);

 	if (GetFocus() != hwnd)

 		SetFocus(hwnd);

+

 	if (hit != -1 && !(hitFlags & CLCHT_NOWHERE)) {

 		if (hit == dat->selection && hitFlags & CLCHT_ONITEMLABEL && dat->exStyle & CLS_EX_EDITLABELS) {

 			if (!(dat->dragStage & DRAGSTAGEF_SKIPRENAME)) {

@@ -1600,8 +1591,8 @@ static int clcHookModulesLoaded(WPARAM, LPARAM)
 

 	if (!ServiceExists(MS_AV_GETAVATARBITMAP))

 		MessageBox(NULL,

-		TranslateT("Clist Modern requires AVS plugin to be present. Install it using PluginUpdater or download from http://wiki.miranda-ng.org/Download"),

-		TranslateT("Error loading plugin"), MB_ICONERROR | MB_OK);

+			TranslateT("Clist Modern requires AVS plugin to be present. Install it using PluginUpdater or download from http://wiki.miranda-ng.org/Download"),

+			TranslateT("Error loading plugin"), MB_ICONERROR | MB_OK);

 

 	HookEvent(ME_AV_AVATARCHANGED, clcHookAvatarChanged);

 

@@ -1802,8 +1793,7 @@ int ClcEnterDragToScroll(HWND hwnd, int Y)
 */

 LRESULT CALLBACK cli_ContactListControlWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)

 {

-

-#define CASE_MSG_RET(msg, handler) case msg: return handler(dat, hwnd, msg, wParam, lParam);

+	#define CASE_MSG_RET(msg, handler) case msg: return handler(dat, hwnd, msg, wParam, lParam);

 

 	ClcData *dat = (ClcData*)GetWindowLongPtr(hwnd, 0);

 

diff --git a/plugins/Clist_modern/src/modern_clistevents.cpp b/plugins/Clist_modern/src/modern_clistevents.cpp
index 78bd96b475..bca83d69db 100644
--- a/plugins/Clist_modern/src/modern_clistevents.cpp
+++ b/plugins/Clist_modern/src/modern_clistevents.cpp
@@ -23,7 +23,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */

 

 #include "stdafx.h"

-#include "m_clui.h"

 #include "modern_clist.h"

 #include "modern_commonprototypes.h"

 #include "modern_clcpaint.h"

diff --git a/plugins/Clist_modern/src/modern_clistmenus.cpp b/plugins/Clist_modern/src/modern_clistmenus.cpp
index a0dc3834c5..027da4c262 100644
--- a/plugins/Clist_modern/src/modern_clistmenus.cpp
+++ b/plugins/Clist_modern/src/modern_clistmenus.cpp
@@ -25,7 +25,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "stdafx.h"

 #include "modern_clist.h"

 #include "m_genmenu.h"

-#include "m_clui.h"

 #include "modern_commonprototypes.h"

 

 int LoadFavoriteContactMenu();

diff --git a/plugins/Clist_modern/src/modern_clistopts.cpp b/plugins/Clist_modern/src/modern_clistopts.cpp
index 2a8c81e727..29dcd0b5de 100644
--- a/plugins/Clist_modern/src/modern_clistopts.cpp
+++ b/plugins/Clist_modern/src/modern_clistopts.cpp
@@ -23,7 +23,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */

 

 #include "stdafx.h"

-#include "m_clui.h"

 #include "modern_clist.h"

 #include "modern_commonprototypes.h"

 

diff --git a/plugins/Clist_modern/src/modern_clisttray.cpp b/plugins/Clist_modern/src/modern_clisttray.cpp
index d03ff525b9..3b713f0f01 100644
--- a/plugins/Clist_modern/src/modern_clisttray.cpp
+++ b/plugins/Clist_modern/src/modern_clisttray.cpp
@@ -23,7 +23,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */

 

 #include "stdafx.h"

-#include <m_clui.h>

 #include "modern_clist.h"

 #include "modern_commonprototypes.h"

 #include "modern_statusbar.h"

diff --git a/plugins/Clist_modern/src/modern_cluiservices.cpp b/plugins/Clist_modern/src/modern_cluiservices.cpp
index 32507cc395..e43ede7807 100644
--- a/plugins/Clist_modern/src/modern_cluiservices.cpp
+++ b/plugins/Clist_modern/src/modern_cluiservices.cpp
@@ -40,14 +40,8 @@ void cliCluiProtocolStatusChanged(int, const char * proto)
 		pcli->pfnTrayIconUpdateBase(proto);

 }

 

-static INT_PTR MetaSupportCheck(WPARAM, LPARAM)

-{

-	return 1;

-}

-

 int CLUIServices_LoadModule(void)

 {

-	CreateServiceFunction(MS_CLUI_METASUPPORT, MetaSupportCheck);

 	CreateServiceFunction(MS_CLIST_GETSTATUSMODE, CListTray_GetGlobalStatus);

 	return 0;

 }

diff --git a/plugins/Clist_modern/src/modern_contact.cpp b/plugins/Clist_modern/src/modern_contact.cpp
index 3260689079..24cdcb0a96 100644
--- a/plugins/Clist_modern/src/modern_contact.cpp
+++ b/plugins/Clist_modern/src/modern_contact.cpp
@@ -23,7 +23,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */

 

 #include "stdafx.h"

-#include "m_clui.h"

 #include "modern_clist.h"

 #include "modern_commonprototypes.h"

 

diff --git a/plugins/Clist_modern/src/modern_viewmodebar.cpp b/plugins/Clist_modern/src/modern_viewmodebar.cpp
index a726afc1a6..a48543b1b1 100644
--- a/plugins/Clist_modern/src/modern_viewmodebar.cpp
+++ b/plugins/Clist_modern/src/modern_viewmodebar.cpp
@@ -1216,8 +1216,6 @@ void CreateViewModeFrame()
 	ApplyViewMode(NULL); //Apply last selected view mode

 }

 

-const char *MakeVariablesString(const char *src, const char *UIN);

-

 void ApplyViewMode(const char *Name, bool onlySelector)

 {

 	char szSetting[256];