From 601562c2a08523440e58b09511cba4878880ec4d Mon Sep 17 00:00:00 2001 From: George Hazan Date: Tue, 22 Nov 2016 21:09:01 +0300 Subject: missing UI method: CCtrlListBox::GetItemRect --- bin10/lib/mir_core.lib | Bin 312004 -> 312360 bytes bin10/lib/mir_core64.lib | Bin 313002 -> 313368 bytes bin12/lib/mir_core.lib | Bin 312004 -> 312360 bytes bin12/lib/mir_core64.lib | Bin 313002 -> 313368 bytes bin14/lib/mir_core.lib | Bin 312004 -> 312360 bytes bin14/lib/mir_core64.lib | Bin 313002 -> 313368 bytes include/m_gui.h | 1 + src/mir_core/src/mir_core.def | 1 + src/mir_core/src/mir_core64.def | 1 + src/mir_core/src/ui_utils.cpp | 8 ++++++-- 10 files changed, 9 insertions(+), 2 deletions(-) diff --git a/bin10/lib/mir_core.lib b/bin10/lib/mir_core.lib index 33ef96afff..9ec13e5003 100644 Binary files a/bin10/lib/mir_core.lib and b/bin10/lib/mir_core.lib differ diff --git a/bin10/lib/mir_core64.lib b/bin10/lib/mir_core64.lib index 6674239967..4c590e3dd2 100644 Binary files a/bin10/lib/mir_core64.lib and b/bin10/lib/mir_core64.lib differ diff --git a/bin12/lib/mir_core.lib b/bin12/lib/mir_core.lib index 33ef96afff..9ec13e5003 100644 Binary files a/bin12/lib/mir_core.lib and b/bin12/lib/mir_core.lib differ diff --git a/bin12/lib/mir_core64.lib b/bin12/lib/mir_core64.lib index 6674239967..4c590e3dd2 100644 Binary files a/bin12/lib/mir_core64.lib and b/bin12/lib/mir_core64.lib differ diff --git a/bin14/lib/mir_core.lib b/bin14/lib/mir_core.lib index 33ef96afff..9ec13e5003 100644 Binary files a/bin14/lib/mir_core.lib and b/bin14/lib/mir_core.lib differ diff --git a/bin14/lib/mir_core64.lib b/bin14/lib/mir_core64.lib index 6674239967..4c590e3dd2 100644 Binary files a/bin14/lib/mir_core64.lib and b/bin14/lib/mir_core64.lib differ diff --git a/include/m_gui.h b/include/m_gui.h index eabf1040a6..503f790e8e 100644 --- a/include/m_gui.h +++ b/include/m_gui.h @@ -780,6 +780,7 @@ public: int GetCount(); int GetCurSel(); LPARAM GetItemData(int index); + int GetItemRect(int index, RECT *pResult); wchar_t* GetItemText(int index); wchar_t* GetItemText(int index, wchar_t *buf, int size); bool GetSel(int index); diff --git a/src/mir_core/src/mir_core.def b/src/mir_core/src/mir_core.def index 5415d0021a..a1d5f04406 100644 --- a/src/mir_core/src/mir_core.def +++ b/src/mir_core/src/mir_core.def @@ -1033,3 +1033,4 @@ CallFunctionSync @1170 ?AddTimer@CDlgBase@@IAEXPAVCTimer@@@Z @1190 NONAME ??0CCtrlBase@@AAE@PAUHWND__@@@Z @1191 NONAME ?FindControl@CDlgBase@@AAEPAVCCtrlBase@@PAUHWND__@@@Z @1192 NONAME +?GetItemRect@CCtrlListBox@@QAEHHPAUtagRECT@@@Z @1193 NONAME diff --git a/src/mir_core/src/mir_core64.def b/src/mir_core/src/mir_core64.def index 1d24a768ff..76bc7b1e8f 100644 --- a/src/mir_core/src/mir_core64.def +++ b/src/mir_core/src/mir_core64.def @@ -1033,3 +1033,4 @@ CallFunctionSync @1170 ?AddTimer@CDlgBase@@IEAAXPEAVCTimer@@@Z @1190 NONAME ??0CCtrlBase@@AEAA@PEAUHWND__@@@Z @1191 NONAME ?FindControl@CDlgBase@@AEAAPEAVCCtrlBase@@PEAUHWND__@@@Z @1192 NONAME +?GetItemRect@CCtrlListBox@@QEAAHHPEAUtagRECT@@@Z @1193 NONAME diff --git a/src/mir_core/src/ui_utils.cpp b/src/mir_core/src/ui_utils.cpp index ef726b6c49..9335a08610 100644 --- a/src/mir_core/src/ui_utils.cpp +++ b/src/mir_core/src/ui_utils.cpp @@ -470,8 +470,8 @@ void CCtrlCombo::ShowDropdown(bool show) ///////////////////////////////////////////////////////////////////////////////////////// // CCtrlListBox class -CCtrlListBox::CCtrlListBox(CDlgBase* dlg, int ctrlId) : -CCtrlBase(dlg, ctrlId) +CCtrlListBox::CCtrlListBox(CDlgBase* dlg, int ctrlId) + : CCtrlBase(dlg, ctrlId) {} BOOL CCtrlListBox::OnCommand(HWND, WORD, WORD idCode) @@ -511,6 +511,10 @@ LPARAM CCtrlListBox::GetItemData(int index) { return SendMessage(m_hwnd, LB_GETITEMDATA, index, 0); } +int CCtrlListBox::GetItemRect(int index, RECT *pResult) +{ return ListBox_GetItemRect(m_hwnd, index, pResult); +} + wchar_t* CCtrlListBox::GetItemText(int index) { wchar_t *result = (wchar_t *)mir_alloc(sizeof(wchar_t) * (SendMessage(m_hwnd, LB_GETTEXTLEN, index, 0) + 1)); -- cgit v1.2.3