Updates for 2.3.3 debs.

Typo fix for start of local event id's.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16697 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/Makefile.in b/Makefile.in
index 1618f514f7b868f5df4cc5aff367656477063f76..078eba971e186e3b1d54a6a3b36ea958e5715f51 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -1354,11 +1354,14 @@ PYTHON_DIST:
        mkdir $(DISTDIR)/wxPython/demo/dllwidget
        mkdir $(DISTDIR)/wxPython/src
        mkdir $(DISTDIR)/wxPython/src/gtk
+       mkdir $(DISTDIR)/wxPython/scripts
        mkdir $(DISTDIR)/wxPython/wxPython
        mkdir $(DISTDIR)/wxPython/wxPython/lib
        mkdir $(DISTDIR)/wxPython/wxPython/lib/PyCrust
        mkdir $(DISTDIR)/wxPython/wxPython/lib/editor
        mkdir $(DISTDIR)/wxPython/wxPython/lib/mixins
+       mkdir $(DISTDIR)/wxPython/wxPython/tools
+       mkdir $(DISTDIR)/wxPython/wxPython/tools/XRCed
 
        cp $(WXDIR)/wxPython/*.txt $(DISTDIR)/wxPython
        cp $(WXDIR)/wxPython/*.py $(DISTDIR)/wxPython
@@ -1378,6 +1381,7 @@ PYTHON_DIST:
        -cp $(WXDIR)/wxPython/demo/data/* $(DISTDIR)/wxPython/demo/data
        -cp $(WXDIR)/wxPython/demo/dllwidget/Makefile $(DISTDIR)/wxPython/demo/dllwidget
        -cp $(WXDIR)/wxPython/demo/dllwidget/test_* $(DISTDIR)/wxPython/demo/dllwidget
+       -cp $(WXDIR)/wxPython/scripts/* $(DISTDIR)/wxPython/scripts
        -cp $(WXDIR)/wxPython/src/* $(DISTDIR)/wxPython/src
        cp $(WXDIR)/wxPython/src/gtk/*.py $(DISTDIR)/wxPython/src/gtk
        cp $(WXDIR)/wxPython/src/gtk/*.cpp $(DISTDIR)/wxPython/src/gtk
@@ -1385,6 +1389,8 @@ PYTHON_DIST:
        cp $(WXDIR)/wxPython/wxPython/lib/PyCrust/*.py $(DISTDIR)/wxPython/wxPython/lib/PyCrust
        cp $(WXDIR)/wxPython/wxPython/lib/editor/*.py $(DISTDIR)/wxPython/wxPython/lib/editor
        cp $(WXDIR)/wxPython/wxPython/lib/mixins/*.py $(DISTDIR)/wxPython/wxPython/lib/mixins
+       cp $(WXDIR)/wxPython/wxPython/tools/*.py $(DISTDIR)/wxPython/wxPython/tools
+       cp $(WXDIR)/wxPython/wxPython/tools/XRCed/*.{py,ico,sh,xrc} $(DISTDIR)/wxPython/wxPython/tools/XRCed
 
 distclean:
        $(RM) -r _dist_dir

diff --git a/debian/control.in b/debian/control.in
index 3e3f8779cab86939375a6a98bf789126cf6ab2b1..8adf00effdb29d3b0de94dbbfb120fbede433686 100644 (file)
--- 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 (>=2.1), python (<<2.2), python2.1-dev, zlib1g-dev, libjpeg62-dev, libpng2-dev, libtiff3g-dev, libgl-dev, libesd0-dev
+Build-Depends: debhelper (>=2.0), flex, bison, gettext, libgtk1.2-dev, python (>=2.1), python (<<2.2), python2.1-dev, zlib1g-dev, libjpeg62-dev, libpng-dev, libtiff3g-dev, libgl-dev, libesd0-dev
 Maintainer: Ron Lee <ron@debian.org>
 Standards-Version: 3.5.6.0
 
@@ -81,7 +81,7 @@ Description: wxWindows Cross-platform C++ GUI toolkit (GTK+ runtime)
 Package: libwxgtk=V-dev
 Architecture: any
 Section: devel
-Depends: wxwin=V-headers (= ${Source-Version}), libwxgtk=V (= ${Source-Version}), libgtk1.2-dev, zlib1g-dev, libjpeg62-dev, libpng2-dev, libtiff3g-dev, libc6-dev
+Depends: wxwin=V-headers (= ${Source-Version}), libwxgtk=V (= ${Source-Version}), libgtk1.2-dev, zlib1g-dev, libjpeg62-dev, libpng-dev, libtiff3g-dev, libc6-dev
 Suggests: wxwin=V-doc, libstdc++-dev, gettext, libgl-dev
 Conflicts: libwxgtk-dev
 Replaces: libwxgtk-dev, wxgtk2.1-dev
@@ -143,7 +143,7 @@ Description: wxWindows Cross-platform C++ GUI toolkit (runtime contrib libs)
 Package: libwxgtk=V-univ
 Architecture: any
 Section: libs
-Depends: wxwin=V-headers (= ${Source-Version}), libwxgtk=V (= ${Source-Version}), libgtk1.2-dev, zlib1g-dev, libjpeg62-dev, libpng2-dev, libtiff3g-dev, libc6-dev, ${shlibs:Depends}
+Depends: wxwin=V-headers (= ${Source-Version}), libwxgtk=V (= ${Source-Version}), libgtk1.2-dev, zlib1g-dev, libjpeg62-dev, libpng-dev, libtiff3g-dev, libc6-dev, ${shlibs:Depends}
 Suggests: wxwin=V-doc, libstdc++-dev, gettext, libgl-dev
 Description: wxWindows Cross-platform C++ GUI toolkit (wxUNIVERSAL widgets)
  wxWindows is a class library for C++ providing GUI (Graphical User

diff --git a/debian/rules b/debian/rules
index bc44d142a2fbe6a02ac84ed9d886e31141a59970..03e582f94328341902bdc142611306c973d168f0 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -271,6 +271,7 @@ build-gtk-shared-stamp:
                                --with-libjpeg=sys \
                                --with-libpng=sys \
                                --with-libtiff=sys \
+                               --enable-dynamic-loader \
                && $(MAKE)
        touch $@
 
@@ -287,6 +288,7 @@ build-gtk-static-stamp:
                                --with-libjpeg=sys \
                                --with-libpng=sys \
                                --with-libtiff=sys \
+                               --enable-dynamic-loader \
                && $(MAKE)
        touch $@
 
@@ -304,6 +306,7 @@ build-gtk-debug-stamp:
                                --with-libjpeg=sys \
                                --with-libpng=sys \
                                --with-libtiff=sys \
+                               --enable-dynamic-loader \
                && $(MAKE)
        touch $@
 
@@ -321,6 +324,7 @@ build-gtk-univ-stamp:
                                --with-libjpeg=sys \
                                --with-libpng=sys \
                                --with-libtiff=sys \
+                               --enable-dynamic-loader \
                && $(MAKE)
        touch $@
 

diff --git a/include/wx/event.h b/include/wx/event.h
index 90838281b479f212c224693258b956f489368037..4a4bb50f76bbec79e08d71224649af6a75ef34da 100644 (file)
--- a/include/wx/event.h
+++ b/include/wx/event.h
@@ -74,7 +74,7 @@ typedef int wxEventType;
 #define BEGIN_DECLARE_EVENT_TYPES() enum {
 #define END_DECLARE_EVENT_TYPES() };
 #define DECLARE_EVENT_TYPE(name, value) name = wxEVT_FIRST + value,
-#define DECLARE_LOCAL_EVENT_TYPE(name, value) name = wxEVT_FIRST + value,
+#define DECLARE_LOCAL_EVENT_TYPE(name, value) name = wxEVT_USER_FIRST + value,
 #define DEFINE_EVENT_TYPE(name)
 #define DEFINE_LOCAL_EVENT_TYPE(name)