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

diff --git a/debian/changelog b/debian/changelog
index bc6f0088a5803a6f7f4890d6a37549ad68b7684a..2a017cdcb2e878aac7f37181e8a947ac0e5f7862 100644 (file)
--- 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.
       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 <ron@debian.org>  Thu, 27 Sep 2001 05:55:07 -0700
 
 
  -- Ron Lee <ron@debian.org>  Thu, 27 Sep 2001 05:55:07 -0700
 


@@ -21,6 +22,12 @@ wxwindows2.3 (2.3.0) unstable; urgency=low
 
  -- Ron Lee <ron@debian.org>  Sat, 27 Jan 2001 01:51:24 -0800
 
 
  -- Ron Lee <ron@debian.org>  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 <ron@debian.org>  Mon, 12 Nov 2001 21:47:38 -0800
+

 wxwindows2.2 (2.2.8) unstable; urgency=medium
 
   * Fixed bogus samples makefile. Closes: #110061
 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 db00251df15a58bf032ad78c8a0f825245740eb3..8df000fb765c12b6432e1f4bd4c15aa399ea93b9 100644 (file)
--- a/debian/control.in
+++ b/debian/control.in
@@ -1,7 +1,7 @@
 Source: wxwindows=V
 Section: libs
 Priority: optional
 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 <ron@debian.org>
 Standards-Version: 3.5.6.0
 
 Maintainer: Ron Lee <ron@debian.org>
 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
 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
 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 99d207dcf716e0f0136d85603de79c26dc66583e..05f0096717a8de10d53d430af43e0b30820d5128 100755 (executable)
--- 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-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 \
 
 .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 7e064dfc0b725b47a427797ef6b47f3c8df9ec5f..dc550538c547be77fa25b390db55093f5d892909 100644 (file)
--- 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)
 
     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)
 
 #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 */
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 /** @name Some commonly used predefined arrays */
 // ----------------------------------------------------------------------------