merge with latest sources

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@7985 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-08-09 10:10:14 +00:00
parent 57681e5bfd
commit 2f1ae41432
176 changed files with 7712 additions and 5094 deletions
--- a/src/mac/treectrl.cpp
+++ b/src/mac/treectrl.cpp
@@ -16,9 +16,11 @@
 #include "wx/stubs/textctrl.h"
 #include "wx/stubs/treectrl.h"

+#if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxTreeCtrl, wxControl)
 IMPLEMENT_DYNAMIC_CLASS(wxTreeItem, wxObject)

+#endif

 wxTreeCtrl::wxTreeCtrl()
 {