From fdb599058daa9249a03eafa9d4b8066e85e2cef9 Mon Sep 17 00:00:00 2001 From: Ron Lee Date: Fri, 23 Aug 2002 03:33:12 +0000 Subject: [PATCH] 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 --- Makefile.in | 6 ++++++ debian/control.in | 6 +++--- debian/rules | 4 ++++ include/wx/event.h | 2 +- 4 files changed, 14 insertions(+), 4 deletions(-) diff --git a/Makefile.in b/Makefile.in index 1618f514f7..078eba971e 100644 --- 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 3e3f8779ca..8adf00effd 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 (>=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 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 bc44d142a2..03e582f943 100755 --- 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 90838281b4..4a4bb50f76 100644 --- 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) -- 2.45.2