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

Move wxList::Member() to pseudo-template base list class.

Browse Source 
Member() should be available in all list classes, not just specially crafted
list of wxObjects (wxList).

See #3616.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65789 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2010-10-10 12:48:36 +00:00
parent ed8b46bba3
commit 20d88ec692
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/wx/list.h
View File

@@ -767,6 +767,9 @@ private:
virtual nodetype *Find(const wxListKey& key) const \ virtual nodetype *Find(const wxListKey& key) const \
{ return (nodetype *)wxListBase::Find(key); } \ { return (nodetype *)wxListBase::Find(key); } \
\ \
bool Member(const Tbase *object) const \
{ return Find(object) != NULL; } \
\
int IndexOf(Tbase *object) const \ int IndexOf(Tbase *object) const \
{ return wxListBase::IndexOf(object); } \ { return wxListBase::IndexOf(object); } \
\ \
@@ -1190,7 +1193,6 @@ public:
// compatibility methods // compatibility methods
void Sort(wxSortCompareFunction compfunc) { wxListBase::Sort(compfunc); } void Sort(wxSortCompareFunction compfunc) { wxListBase::Sort(compfunc); }
bool Member(wxObject *object) const { return Find(object) != NULL; }
#endif // !wxUSE_STL #endif // !wxUSE_STL
}; };

4
src/osx/carbon/nonownedwnd.cpp
View File

@@ -722,8 +722,8 @@ wxMacTopLevelMouseEventHandler(EventHandlerCallRef WXUNUSED(handler),
if ( currentMouseWindow->HandleWindowEvent(wxevent) ) if ( currentMouseWindow->HandleWindowEvent(wxevent) )
{ {
if ((currentMouseWindowParent != NULL) && if ( currentMouseWindowParent &&
(currentMouseWindowParent->GetChildren().Find(currentMouseWindow) == NULL)) !currentMouseWindowParent->GetChildren().Member(currentMouseWindow) )
currentMouseWindow = NULL; currentMouseWindow = NULL;
result = noErr; result = noErr;