From 2e5dddb0a4df12c32177dd706c4658c551b85da9 Mon Sep 17 00:00:00 2001 From: Julian Smart Date: Mon, 23 Nov 1998 14:28:18 +0000 Subject: [PATCH] Fix to wxTreeCtrl::GetNextChild from Marcel Rasche. Corrected WXUSINGDLL in 2 makefiles. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1027 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- samples/mdi/makefile.nt | 2 +- samples/minimal/makefile.nt | 2 +- src/msw/treectrl.cpp | 6 ++++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/samples/mdi/makefile.nt b/samples/mdi/makefile.nt index 7e0b86c583..c79a4f8d78 100644 --- a/samples/mdi/makefile.nt +++ b/samples/mdi/makefile.nt @@ -13,7 +13,7 @@ # Set WXDIR for your system WXDIR = $(WXWIN) -WXUSINGDLL=1 +WXUSINGDLL=0 !include $(WXDIR)\src\ntwxwin.mak diff --git a/samples/minimal/makefile.nt b/samples/minimal/makefile.nt index 05af65af8a..0416630669 100644 --- a/samples/minimal/makefile.nt +++ b/samples/minimal/makefile.nt @@ -14,7 +14,7 @@ # Set WXDIR for your system WXDIR = $(WXWIN) -WXUSINGDLL=1 +WXUSINGDLL=0 !include $(WXDIR)\src\ntwxwin.mak diff --git a/src/msw/treectrl.cpp b/src/msw/treectrl.cpp index 6b4b2317b5..aa41b2d722 100644 --- a/src/msw/treectrl.cpp +++ b/src/msw/treectrl.cpp @@ -407,8 +407,10 @@ wxTreeItemId wxTreeCtrl::GetFirstChild(const wxTreeItemId& item, wxTreeItemId wxTreeCtrl::GetNextChild(const wxTreeItemId& WXUNUSED(item), long& _cookie) const { - return wxTreeItemId((WXHTREEITEM) TreeView_GetNextSibling(wxhWnd, - (HTREEITEM) (WXHTREEITEM)_cookie)); + wxTreeItemId l=wxTreeItemId((WXHTREEITEM) TreeView_GetNextSibling(wxhWnd, + (HTREEITEM) (WXHTREEITEM)_cookie)); + _cookie=(long)l; + return l; } wxTreeItemId wxTreeCtrl::GetNextSibling(const wxTreeItemId& item) const -- 2.45.2