From 2f73fd3816072986e98c67cfce30b79f468fef4b Mon Sep 17 00:00:00 2001 From: Michael Wetherell Date: Wed, 25 May 2005 21:15:47 +0000 Subject: [PATCH] Uncomment LVN_ODFINDITEM handler for systems that have NMLVFINDITEM or NM_FINDTIEM git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34342 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/msw/listctrl.cpp | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/src/msw/listctrl.cpp b/src/msw/listctrl.cpp index 5d00e034b4..174af29eb5 100644 --- a/src/msw/listctrl.cpp +++ b/src/msw/listctrl.cpp @@ -56,6 +56,15 @@ // include "properly" #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 // ---------------------------------------------------------------------------- @@ -2133,8 +2142,7 @@ bool wxListCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result) } break; -#if 0 -disable temporary for correct building before the missing headers are not completed +#if HAVE_NMLVFINDITEM || HAVE_NM_FINDITEM case LVN_ODFINDITEM: // 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 @@ -2143,7 +2151,11 @@ disable temporary for correct building before the missing headers are not comple // application waiting while it performs linear search if ( IsVirtual() && GetItemCount() <= 1000 ) { +#if HAVE_NMLVFINDITEM NMLVFINDITEM* pFindInfo = (NMLVFINDITEM*)lParam; +#else + NM_FINDTIEM* pFindInfo = (NM_FINDTIEM*)lParam; +#endif // no match by default *result = -1; @@ -2204,7 +2216,7 @@ disable temporary for correct building before the missing headers are not comple processed = false; } break; -#endif +#endif // HAVE_NMLVFINDITEM || HAVE_NM_FINDITEM case LVN_GETDISPINFO: if ( IsVirtual() ) -- 2.47.2