summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeorge Hazan <george.hazan@gmail.com>2015-05-10 16:29:50 +0000
committerGeorge Hazan <george.hazan@gmail.com>2015-05-10 16:29:50 +0000
commit57d9654ebcb4eb16ecdd74edc8ffe0da76dae798 (patch)
tree835f43801229f56ce77d7ac3afcc1625239f29d4
parentb9e327b9e3c151a262e0af9b8d8383324582d113 (diff)
CCtrlTreeView::GetItem must return bool
git-svn-id: http://svn.miranda-ng.org/main/trunk@13509 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
-rw-r--r--bin10/lib/mir_core.libbin328088 -> 328092 bytes
-rw-r--r--bin10/lib/mir_core64.libbin329828 -> 329832 bytes
-rw-r--r--bin12/lib/mir_core.libbin328088 -> 328092 bytes
-rw-r--r--bin12/lib/mir_core64.libbin329828 -> 329832 bytes
-rw-r--r--include/m_gui.h2
-rw-r--r--src/mir_core/src/mir_core.def2
-rw-r--r--src/mir_core/src/mir_core64.def3
-rw-r--r--src/mir_core/src/ui_utils.cpp4
8 files changed, 5 insertions, 6 deletions
diff --git a/bin10/lib/mir_core.lib b/bin10/lib/mir_core.lib
index c12ea2873b..275457a9b1 100644
--- a/bin10/lib/mir_core.lib
+++ b/bin10/lib/mir_core.lib
Binary files differ
diff --git a/bin10/lib/mir_core64.lib b/bin10/lib/mir_core64.lib
index cd28e984f6..4835a15441 100644
--- a/bin10/lib/mir_core64.lib
+++ b/bin10/lib/mir_core64.lib
Binary files differ
diff --git a/bin12/lib/mir_core.lib b/bin12/lib/mir_core.lib
index b63a576fa3..47d466f9b7 100644
--- a/bin12/lib/mir_core.lib
+++ b/bin12/lib/mir_core.lib
Binary files differ
diff --git a/bin12/lib/mir_core64.lib b/bin12/lib/mir_core64.lib
index 55ba27672c..2f5ab51c4c 100644
--- a/bin12/lib/mir_core64.lib
+++ b/bin12/lib/mir_core64.lib
Binary files differ
diff --git a/include/m_gui.h b/include/m_gui.h
index 9bacf454af..3e4d54431a 100644
--- a/include/m_gui.h
+++ b/include/m_gui.h
@@ -971,7 +971,7 @@ public:
HIMAGELIST GetImageList(int iImage);
int GetIndent();
COLORREF GetInsertMarkColor();
- void GetItem(TVITEMEX *tvi);
+ bool GetItem(TVITEMEX *tvi);
int GetItemHeight();
void GetItemRect(HTREEITEM hItem, RECT *rcItem, BOOL fItemRect);
DWORD GetItemState(HTREEITEM hItem, DWORD stateMask);
diff --git a/src/mir_core/src/mir_core.def b/src/mir_core/src/mir_core.def
index afc34ebc8a..02430c360a 100644
--- a/src/mir_core/src/mir_core.def
+++ b/src/mir_core/src/mir_core.def
@@ -815,7 +815,7 @@ mir_wstrcmpi @280
?GetItem@CCtrlListView@@QAEXPAUtagLVITEMW@@@Z @814 NONAME
?GetItem@CCtrlTreeView@@QAEXPAU_TREEITEM@@PAUtagTVITEMEXW@@@Z @815 NONAME
?GetItem@CCtrlTreeView@@QAEXPAU_TREEITEM@@PAUtagTVITEMEXW@@PA_WH@Z @816 NONAME
-?GetItem@CCtrlTreeView@@QAEXPAUtagTVITEMEXW@@@Z @817 NONAME
+?GetItem@CCtrlTreeView@@QAE_NPAUtagTVITEMEXW@@@Z @817 NONAME
?GetItemCount@CCtrlListView@@QAEHXZ @818 NONAME
?GetItemData@CCtrlCombo@@QAEJH@Z @819 NONAME
?GetItemData@CCtrlListBox@@QAEJH@Z @820 NONAME
diff --git a/src/mir_core/src/mir_core64.def b/src/mir_core/src/mir_core64.def
index 6b2071dfc8..a92977f3c8 100644
--- a/src/mir_core/src/mir_core64.def
+++ b/src/mir_core/src/mir_core64.def
@@ -815,7 +815,7 @@ mir_wstrcmpi @280
?GetItem@CCtrlListView@@QEAAXPEAUtagLVITEMW@@@Z @814 NONAME
?GetItem@CCtrlTreeView@@QEAAXPEAU_TREEITEM@@PEAUtagTVITEMEXW@@@Z @815 NONAME
?GetItem@CCtrlTreeView@@QEAAXPEAU_TREEITEM@@PEAUtagTVITEMEXW@@PEA_WH@Z @816 NONAME
-?GetItem@CCtrlTreeView@@QEAAXPEAUtagTVITEMEXW@@@Z @817 NONAME
+?GetItem@CCtrlTreeView@@QEAA_NPEAUtagTVITEMEXW@@@Z @817 NONAME
?GetItemCount@CCtrlListView@@QEAAHXZ @818 NONAME
?GetItemData@CCtrlCombo@@QEAA_JH@Z @819 NONAME
?GetItemData@CCtrlListBox@@QEAA_JH@Z @820 NONAME
@@ -1073,7 +1073,6 @@ ProtoWindowAdd @1071 NONAME
ProtoWindowRemove @1072 NONAME
Proto_IsProtocolLoaded @1073 NONAME
Proto_RegisterModule @1074 NONAME
-
?GetInst@CDlgBase@@QEBAPEAUHINSTANCE__@@XZ @1075 NONAME
?Find@CDlgBase@@SAPEAV1@PEAUHWND__@@@Z @1076 NONAME
?SetCaption@CDlgBase@@QEAAXPEB_W@Z @1077 NONAME
diff --git a/src/mir_core/src/ui_utils.cpp b/src/mir_core/src/ui_utils.cpp
index e4fad58f64..720ad5f812 100644
--- a/src/mir_core/src/ui_utils.cpp
+++ b/src/mir_core/src/ui_utils.cpp
@@ -1452,8 +1452,8 @@ COLORREF CCtrlTreeView::GetInsertMarkColor()
{ return TreeView_GetInsertMarkColor(m_hwnd);
}
-void CCtrlTreeView::GetItem(TVITEMEX *tvi)
-{ TreeView_GetItem(m_hwnd, tvi);
+bool CCtrlTreeView::GetItem(TVITEMEX *tvi)
+{ return TreeView_GetItem(m_hwnd, tvi) == TRUE;
}
int CCtrlTreeView::GetItemHeight()