TabSrmm -> UI classes

1 files changed, 12 insertions, 12 deletions

diff --git a/plugins/TabSRMM/src/sidebar.h b/plugins/TabSRMM/src/sidebar.h
index b4c565ec7e..2ee7f35d90 100644
--- a/plugins/TabSRMM/src/sidebar.h
+++ b/plugins/TabSRMM/src/sidebar.h
@@ -31,8 +31,8 @@
 

 struct TSideBarNotify

 {

-	NMHDR 				nmHdr;

-	const TWindowData*	dat;

+	NMHDR nmHdr;

+	const CTabBaseDlg *dat;

 };

 /* layout description structure */

 

@@ -61,7 +61,7 @@ class CSideBarButton
 {

 public:

 	CSideBarButton(const UINT id, CSideBar *sideBar);

-	CSideBarButton(const TWindowData *dat, CSideBar *sideBar);

+	CSideBarButton(const CTabBaseDlg *dat, CSideBar *sideBar);

 	~CSideBarButton();

 

 	LONG                  getHeight() const { return(m_sz.cy); }

@@ -70,8 +70,8 @@ public:
 	const bool            isTopAligned() const { return(m_isTopAligned); }

 	const HWND            getHwnd() const { return(m_hwnd); }

 	const UINT            getID() const { return(m_id); }

-	const MCONTACT        getContactHandle() const { return(m_dat->hContact); }

-	const TWindowData*    getDat() const { return(m_dat); }

+	const MCONTACT        getContactHandle() const { return(m_dat->m_hContact); }

+	const CTabBaseDlg* getDat() const { return(m_dat); }

 	const TSideBarLayout* getLayout() const { return(m_sideBarLayout); }

 

 	void                  RenderThis(const HDC hdc) const;

@@ -91,7 +91,7 @@ private:
 private:

 	const TSideBarLayout* m_sideBarLayout;

 	HWND                  m_hwnd;           // window handle for the TSButton object

-	const TWindowData*    m_dat;            // session data

+	const CTabBaseDlg* m_dat;            // session data

 	UINT                  m_id;             // control id

 	bool                  m_isTopAligned;

 	SIZE                  m_sz;

@@ -130,9 +130,9 @@ public:
 	~CSideBar();

 

 	void                  Init();

-	void                  addSession(const TWindowData *dat, int position);

-	HRESULT               removeSession(const TWindowData *dat);

-	void                  updateSession(const TWindowData *dat);

+	void                  addSession(const CTabBaseDlg *dat, int position);

+	HRESULT               removeSession(const CTabBaseDlg *dat);

+	void                  updateSession(const CTabBaseDlg *dat);

 

 	void                  processScrollerButtons(UINT cmd);

 	void                  Layout(const RECT *rc = 0, bool fOnlyCalc = false);

@@ -149,7 +149,7 @@ public:
 	const CSideBarButton* getScrollDown() const { return(m_down); }

 	bool                  isSkinnedContainer() const { return(CSkin::m_skinEnabled ? true : false); }

 	const UINT            getLayoutId() const { return(m_uLayout); }

-	void                  invalidateButton(const TWindowData *dat);

+	void                  invalidateButton(const CTabBaseDlg *dat);

 

 	const CSideBarButton* setActiveItem(const CSideBarButton *newItem)

 	{

@@ -171,7 +171,7 @@ public:
 	}

 	HWND                  getScrollWnd() const { return(m_hwndScrollWnd); }

 	const CSideBarButton* getHoveredClose() const { return(m_hoveredClose); }

-	const CSideBarButton* setActiveItem(const TWindowData *dat);

+	const CSideBarButton* setActiveItem(const CTabBaseDlg *dat);

 

 	static LRESULT CALLBACK wndProcStub(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam);

 

@@ -189,7 +189,7 @@ private:
 	void                  populateAll();

 	void                  removeAll();

 	void                  Invalidate();

-	CSideBarButton*       findSession(const TWindowData *dat);

+	CSideBarButton*       findSession(const CTabBaseDlg *dat);

 	CSideBarButton*       findSession(const MCONTACT hContact);

 

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