merge with master till

IRC fixes #1342 (broken search in channel browser);

3 files changed, 12 insertions, 12 deletions

diff --git a/protocols/IRCG/src/irc_dlg.h b/protocols/IRCG/src/irc_dlg.h
index c84cde8aac..0d74f61258 100644
--- a/protocols/IRCG/src/irc_dlg.h
+++ b/protocols/IRCG/src/irc_dlg.h
@@ -88,7 +88,6 @@ struct CListDlg : public CProtoDlgBase < CIrcProto >
 	CListDlg(CIrcProto* _pro);

 

 	virtual void OnInitDialog();

-	virtual void OnChange(CCtrlBase* ctrl);

 	virtual INT_PTR DlgProc(UINT msg, WPARAM wParam, LPARAM lParam);

 	virtual void OnDestroy();

 	virtual int Resizer(UTILRESIZECONTROL *urc);

@@ -98,9 +97,10 @@ struct CListDlg : public CProtoDlgBase < CIrcProto >
 	UINT_PTR m_timer;

 

 	CCtrlButton m_Join;

-	void OnJoin(CCtrlButton*);

+	void onClick_Join(CCtrlButton*);

 

-	void List_OnColumnClick(CCtrlListView::TEventInfo* ev);

+	void onChange_Filter(CCtrlEdit *ctrl);

+	void onColumnClick_List(CCtrlListView::TEventInfo* ev);

 

 	void UpdateList(void);

 };

diff --git a/protocols/IRCG/src/version.h b/protocols/IRCG/src/version.h
index fa3c95b189..03de9ba40d 100644
--- a/protocols/IRCG/src/version.h
+++ b/protocols/IRCG/src/version.h
@@ -1,7 +1,7 @@
 #define __MAJOR_VERSION          0

 #define __MINOR_VERSION          95

-#define __RELEASE_NUM            7

-#define __BUILD_NUM              2

+#define __RELEASE_NUM            8

+#define __BUILD_NUM              1

 

 #include <stdver.h>

 

diff --git a/protocols/IRCG/src/windows.cpp b/protocols/IRCG/src/windows.cpp
index 72831b3a3c..6810e439b8 100644
--- a/protocols/IRCG/src/windows.cpp
+++ b/protocols/IRCG/src/windows.cpp
@@ -258,8 +258,9 @@ CListDlg::CListDlg(CIrcProto *_pro)
 	m_status(this, IDC_TEXT),

 	m_filter(this, IDC_FILTER_STRING)

 {

-	m_list2.OnDoubleClick = m_list.OnDoubleClick = m_Join.OnClick = Callback(this, &CListDlg::OnJoin);

-	m_list.OnColumnClick = Callback(this, &CListDlg::List_OnColumnClick);

+	m_list.OnColumnClick = Callback(this, &CListDlg::onColumnClick_List);

+	m_list2.OnDoubleClick = m_list.OnDoubleClick = m_Join.OnClick = Callback(this, &CListDlg::onClick_Join);

+	m_filter.OnChange = Callback(this, &CListDlg::onChange_Filter);

 }

 

 void CListDlg::OnInitDialog()

@@ -390,10 +391,9 @@ INT_PTR CListDlg::DlgProc(UINT msg, WPARAM wParam, LPARAM lParam)
 	return CProtoDlgBase<CIrcProto>::DlgProc(msg, wParam, lParam);

 }

 

-void CListDlg::OnChange(CCtrlBase *ctrl)

+void CListDlg::onChange_Filter(CCtrlEdit*)

 {

-	if (ctrl->GetCtrlId() == IDC_FILTER_STRING)

-		m_timer = ::SetTimer(m_hwnd, LIST_TIMER, 200, nullptr);

+	m_timer = ::SetTimer(m_hwnd, LIST_TIMER, 200, nullptr);

 }

 

 void CListDlg::OnDestroy()

@@ -454,14 +454,14 @@ int CListDlg::Resizer(UTILRESIZECONTROL *urc)
 	return RD_ANCHORX_RIGHT | RD_ANCHORY_BOTTOM;

 }

 

-void CListDlg::List_OnColumnClick(CCtrlListView::TEventInfo *ev)

+void CListDlg::onColumnClick_List(CCtrlListView::TEventInfo *ev)

 {

 	ListViewSortParam param = { &m_list, ev->nmlv->iSubItem };

 	m_list.SortItems(ListViewSort, (LPARAM)&param);

 	UpdateList();

 }

 

-void CListDlg::OnJoin(CCtrlButton*)

+void CListDlg::onClick_Join(CCtrlButton*)

 {

 	wchar_t szTemp[255];

 	m_filter.GetText(szTemp, _countof(szTemp));