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

diff --git a/samples/mdi/makefile.nt b/samples/mdi/makefile.nt
index 7e0b86c583417dbcd58f80b24f1d2d9167952f12..c79a4f8d789427d31b796eb5545c6f417c5bcda2 100644 (file)
--- 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 05af65af8a2f940efb2d93123f22b65f3a82bdc6..041663066934d4a4e7adb43671863cbd8f64587a 100644 (file)
--- 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 6b4b2317b51749680e583ad78c1067cea79d901b..aa41b2d72223e0964014d450472eee8eebc87eef 100644 (file)
--- 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