Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Uncomment LVN_ODFINDITEM handler for systems that have NMLVFINDITEM or NM_FINDTIEM

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34342 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Michael Wetherell
2005-05-25 21:15:47 +00:00
parent d00016f53f
commit 2f73fd3816
1 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/msw/listctrl.cpp
View File

@@ -56,6 +56,15 @@
// include <commctrl.h> "properly" // include <commctrl.h> "properly"
#include "wx/msw/wrapcctl.h" #include "wx/msw/wrapcctl.h"
// Currently gcc and watcom don't define NMLVFINDITEM, and DMC only defines
// it by its old name NM_FINDTIEM.
//
#if defined __VISUALC__ || defined __BORLANDC__ || defined NMLVFINDITEM
#define HAVE_NMLVFINDITEM 1
#elif defined __DMC__ || defined NM_FINDITEM
#define HAVE_NM_FINDITEM 1
#endif
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// private functions // private functions
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
@@ -2133,8 +2142,7 @@ bool wxListCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
} }
break; break;
#if 0 #if HAVE_NMLVFINDITEM || HAVE_NM_FINDITEM
disable temporary for correct building before the missing headers are not completed
case LVN_ODFINDITEM: case LVN_ODFINDITEM:
// this message is only used with the virtual list control but // this message is only used with the virtual list control but
// even there we don't want to always use it: in a control with // even there we don't want to always use it: in a control with
@@ -2143,7 +2151,11 @@ disable temporary for correct building before the missing headers are not comple
// application waiting while it performs linear search // application waiting while it performs linear search
if ( IsVirtual() && GetItemCount() <= 1000 ) if ( IsVirtual() && GetItemCount() <= 1000 )
{ {
#if HAVE_NMLVFINDITEM
NMLVFINDITEM* pFindInfo = (NMLVFINDITEM*)lParam; NMLVFINDITEM* pFindInfo = (NMLVFINDITEM*)lParam;
#else
NM_FINDTIEM* pFindInfo = (NM_FINDTIEM*)lParam;
#endif
// no match by default // no match by default
*result = -1; *result = -1;
@@ -2204,7 +2216,7 @@ disable temporary for correct building before the missing headers are not comple
processed = false; processed = false;
} }
break; break;
#endif #endif // HAVE_NMLVFINDITEM || HAVE_NM_FINDITEM
case LVN_GETDISPINFO: case LVN_GETDISPINFO:
if ( IsVirtual() ) if ( IsVirtual() )