From e3ffab889d900847fa6fb9807bc5f818da28c358 Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Sat, 14 Jul 2012 19:06:59 +0000
Subject: much less crazy way to organize clist data

git-svn-id: http://svn.miranda-ng.org/main/trunk@973 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 plugins/Clist_classic/src/clc.h           | 61 +++----------------------------
 plugins/Clist_classic/src/commonheaders.h |  1 -
 2 files changed, 5 insertions(+), 57 deletions(-)

(limited to 'plugins/Clist_classic/src')

diff --git a/plugins/Clist_classic/src/clc.h b/plugins/Clist_classic/src/clc.h
index 472dc12eab..d089a213da 100644
--- a/plugins/Clist_classic/src/clc.h
+++ b/plugins/Clist_classic/src/clc.h
@@ -23,61 +23,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #define FONTID_LAST 7
 
-struct ClcContact {
-	BYTE type;
-	BYTE flags;
-	union {
-		struct {
-			WORD iImage;
-			HANDLE hContact;
-		};
-		struct {
-			WORD groupId;
-			struct ClcGroup *group;
-		};
-	};
-	BYTE  iExtraImage[MAXEXTRACOLUMNS];
-	TCHAR szText[120-MAXEXTRACOLUMNS];
-	char * proto;	// MS_PROTO_GETBASEPROTO
+struct ClcContact : public ClcContactBase
+{
 };
 
-struct ClcData {
-	struct ClcGroup list;
-	int rowHeight;
-	int yScroll;
-	int selection;
-	struct ClcFontInfo fontInfo[FONTID_MAX+1];
-	int scrollTime;
-	HIMAGELIST himlHighlight;
-	int groupIndent;
-	TCHAR szQuickSearch[128];
-	int iconXSpace;
-	HWND hwndRenameEdit;
-	COLORREF bkColour,selBkColour,selTextColour,hotTextColour,quickSearchColour;
-	int iDragItem,iInsertionMark;
-	int dragStage;
-	POINT ptDragStart;
-	int dragAutoScrolling;
-	int dragAutoScrollHeight;
-	int leftMargin;
-	int insertionMarkHitHeight;
-	HBITMAP hBmpBackground;
-	int backgroundBmpUse,bkChanged;
-	int iHotTrack;
-	int gammaCorrection;
-	DWORD greyoutFlags;			  //see m_clc.h
-	DWORD offlineModes;
-	DWORD exStyle;
-	POINT ptInfoTip;
-	int infoTipTimeout;
-	HANDLE hInfoTipItem;
-	HIMAGELIST himlExtraColumns;
-	int extraColumnsCount;
-	int extraColumnSpacing;
-	int checkboxSize;
-	int showSelAlways;
-	int showIdle;
-	int noVScrollbar;
-	int useWindowsColours;
-	int needsResort;
-};
+struct ClcData : public ClcDataBase
+{
+};
\ No newline at end of file
diff --git a/plugins/Clist_classic/src/commonheaders.h b/plugins/Clist_classic/src/commonheaders.h
index 4ae328c54d..d046660d0c 100644
--- a/plugins/Clist_classic/src/commonheaders.h
+++ b/plugins/Clist_classic/src/commonheaders.h
@@ -43,7 +43,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <win2k.h>
 #include <newpluginapi.h>
 #include <m_clist.h>
-#include <m_clc.h>
 #include <m_clistint.h>
 #include <m_clui.h>
 #include <m_plugins.h>
-- 
cgit v1.2.3