AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

corrected HAVE_NMLVFINDITEM tests, eliminated HAVE_NM_FINDITEM as it's more clear to just redefine NMLVFINDITEM in DMC case

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35104 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2005-08-04 21:05:01 +00:00
parent fe19000379
commit 206391cbab
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/msw/listctrl.cpp
View File

@ -62,7 +62,8 @@
#if defined(__VISUALC__) || defined(__BORLANDC__) || defined(NMLVFINDITEM) #if defined(__VISUALC__) || defined(__BORLANDC__) || defined(NMLVFINDITEM)
#define HAVE_NMLVFINDITEM 1 #define HAVE_NMLVFINDITEM 1
#elif defined(__DMC__) || defined(NM_FINDITEM) #elif defined(__DMC__) || defined(NM_FINDITEM)
#define HAVE_NM_FINDITEM 1 #define HAVE_NMLVFINDITEM 1
#define NMLVFINDITEM NM_FINDITEM
#endif #endif
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
@ -2160,7 +2161,7 @@ bool wxListCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
} }
break; break;
#if HAVE_NMLVFINDITEM || HAVE_NM_FINDITEM #ifdef HAVE_NMLVFINDITEM
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
@ -2169,11 +2170,7 @@ bool wxListCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
// 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_FINDITEM* pFindInfo = (NM_FINDITEM*)lParam;
#endif
// no match by default // no match by default
*result = -1; *result = -1;
@ -2234,7 +2231,7 @@ bool wxListCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
processed = false; processed = false;
} }
break; break;
#endif // HAVE_NMLVFINDITEM || HAVE_NM_FINDITEM #endif // HAVE_NMLVFINDITEM
case LVN_GETDISPINFO: case LVN_GETDISPINFO:
if ( IsVirtual() ) if ( IsVirtual() )