From 763141418818d2fe0dbdc8ce6d9f654700f1fe33 Mon Sep 17 00:00:00 2001 From: Ron Lee Date: Sat, 17 Nov 2001 11:33:50 +0000 Subject: [PATCH] Added WX_DEFINE_*_USER_EXPORTED_ARRAY macros for external dlls. updated debian scripts to build with python2.1 git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12456 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- debian/changelog | 7 +++++++ debian/control.in | 4 ++-- debian/rules | 3 +++ include/wx/dynarray.h | 17 +++++++++++++++++ 4 files changed, 29 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index bc6f0088a5..2a017cdcb2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,7 @@ wxwindows2.3 (2.3.2) unstable; urgency=low Added .dll's to msw-cross packages. Added -dbg versions of the cross packages. Added experimental -univ(gtk) package. + Switched to python 2.1 -- Ron Lee Thu, 27 Sep 2001 05:55:07 -0700 @@ -21,6 +22,12 @@ wxwindows2.3 (2.3.0) unstable; urgency=low -- Ron Lee Sat, 27 Jan 2001 01:51:24 -0800 +wxwindows2.2 (2.2.8.1) unstable; urgency=low + + * Rebuild for python2.1 Closes: #119226, #118835 + + -- Ron Lee Mon, 12 Nov 2001 21:47:38 -0800 + wxwindows2.2 (2.2.8) unstable; urgency=medium * Fixed bogus samples makefile. Closes: #110061 diff --git a/debian/control.in b/debian/control.in index db00251df1..8df000fb76 100644 --- a/debian/control.in +++ b/debian/control.in @@ -1,7 +1,7 @@ Source: wxwindows=V Section: libs Priority: optional -Build-Depends: debhelper (>=2.0), flex, bison, gettext, libgtk1.2-dev, python-dev (>=1.5.2), python-distutils, zlib1g-dev, libjpeg62-dev, libpng2-dev, libtiff3g-dev, libgl-dev, libesd0-dev +Build-Depends: debhelper (>=2.0), flex, bison, gettext, libgtk1.2-dev, python2.1-dev, zlib1g-dev, libjpeg62-dev, libpng2-dev, libtiff3g-dev, libgl-dev, libesd0-dev Maintainer: Ron Lee Standards-Version: 3.5.6.0 @@ -116,7 +116,7 @@ Description: wxWindows Cross-platform C++ GUI toolkit (GTK+ development) Package: libwxgtk=V-python Architecture: any Section: interpreters -Depends: python-base (>=1.5.2), ${shlibs:Depends} +Depends: python (>=2.1), python (<<2.2), ${shlibs:Depends} Suggests: wxwin=V-doc, wxwin=V-examples Conflicts: libwxgtk=V-python-contrib, python-wxwin Replaces: libwxgtk=V-python-contrib, python-wxwin diff --git a/debian/rules b/debian/rules index 99d207dcf7..05f0096717 100755 --- a/debian/rules +++ b/debian/rules @@ -799,6 +799,9 @@ binary-univ: control-files-stamp install-gtk-univ binary-doc: control-files-stamp install-doc $(MAKE) -f debian/rules DH_OPTIONS=-p$(package_doc) binary-common +binary-fast:control-files-stamp install-gtk-dbg install-msw-dev install-headers install-headers-msw + $(MAKE) -f debian/rules DH_OPTIONS="-p$(package_gtk_dbg) -p$(package_msw_dev) -p$(package_headers) -p$(package_headers_msw)" binary-common + .PHONY: build build_all build_arch clean binary-indep binary-arch binary binary-common \ binary-gtk binary-gtk-dev binary-gtk-dbg binary-wxbase binary-wxbase-dev \ diff --git a/include/wx/dynarray.h b/include/wx/dynarray.h index 7e064dfc0b..dc550538c5 100644 --- a/include/wx/dynarray.h +++ b/include/wx/dynarray.h @@ -438,10 +438,27 @@ private: \ typedef T _A##name; \ _WX_DEFINE_SORTED_ARRAY(_A##name, name, class WXDLLEXPORT) +#define WX_DEFINE_EXPORTED_OBJARRAY(name) WX_DEFINE_OBJARRAY(name) #define WX_DECLARE_EXPORTED_OBJARRAY(T, name) \ typedef T _L##name; \ _WX_DECLARE_OBJARRAY(_L##name, name, class WXDLLEXPORT) +// ..and likewise these macros do very same thing as the ones above them too, +// but allow the user to specify the export spec. Needed if you have a dll +// that wants to export a wxArray daubed with your own import/export goo. +#define WX_DEFINE_USER_EXPORTED_ARRAY(T, name, usergoo) \ + typedef T _A##name; \ + _WX_DEFINE_ARRAY(_A##name, name, class usergoo) + +#define WX_DEFINE_SORTED_USER_EXPORTED_ARRAY(T, name, usergoo) \ + typedef T _A##name; \ + _WX_DEFINE_SORTED_ARRAY(_A##name, name, class usergoo) + +#define WX_DEFINE_USER_EXPORTED_OBJARRAY(name) WX_DEFINE_OBJARRAY(name) +#define WX_DECLARE_USER_EXPORTED_OBJARRAY(T, name, usergoo) \ + typedef T _L##name; \ + _WX_DECLARE_OBJARRAY(_L##name, name, class usergoo) + // ---------------------------------------------------------------------------- /** @name Some commonly used predefined arrays */ // ---------------------------------------------------------------------------- -- 2.45.2