- MTREE_DND implemented, all drag-n-drop operations in trees went into the core;

- fixed chaos inside CCtrlBase::Subclass();
- two app dialogs switched to MTREE_DND;

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

1 files changed, 7 insertions, 2 deletions

diff --git a/include/m_gui.h b/include/m_gui.h
index c850d8c18b..d369ed5058 100644
--- a/include/m_gui.h
+++ b/include/m_gui.h
@@ -373,8 +373,6 @@ public:
 	virtual void OnApply();

 	virtual void OnReset();

 

-	CCallback<CCtrlBase> OnChange;

-

 	static int cmp(const CCtrlBase *c1, const CCtrlBase *c2)

 	{

 		if (c1->m_idCtrl < c2->m_idCtrl) return -1;

@@ -389,6 +387,10 @@ protected:
 	CDlgBase* m_parentWnd;

 	bool m_bChanged;

 

+public:

+	CCallback<CCtrlBase> OnChange;

+

+protected:

 	virtual LRESULT CustomWndProc(UINT msg, WPARAM wParam, LPARAM lParam);

 	void Subclass();

 	void Unsubclass();

@@ -957,7 +959,10 @@ public:
 	CCallback<TEventInfo> OnSingleExpand;

 

 protected:

+	virtual void OnInit();

 	virtual BOOL OnNotify(int idCtrl, NMHDR *pnmh);

+	

+	virtual LRESULT CustomWndProc(UINT msg, WPARAM wParam, LPARAM lParam);

 

 	union {

 		uint32_t m_dwFlags;