Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updates for 2.3.3 debs.

Browse Source 
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
This commit is contained in:
Ron Lee
2002-08-23 03:33:12 +00:00
parent 72383a729f
commit fdb599058d
4 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile.in
View File

@@ -1354,11 +1354,14 @@ PYTHON_DIST:
mkdir $(DISTDIR)/wxPython/demo/dllwidget mkdir $(DISTDIR)/wxPython/demo/dllwidget
mkdir $(DISTDIR)/wxPython/src mkdir $(DISTDIR)/wxPython/src
mkdir $(DISTDIR)/wxPython/src/gtk mkdir $(DISTDIR)/wxPython/src/gtk
mkdir $(DISTDIR)/wxPython/scripts
mkdir $(DISTDIR)/wxPython/wxPython mkdir $(DISTDIR)/wxPython/wxPython
mkdir $(DISTDIR)/wxPython/wxPython/lib mkdir $(DISTDIR)/wxPython/wxPython/lib
mkdir $(DISTDIR)/wxPython/wxPython/lib/PyCrust mkdir $(DISTDIR)/wxPython/wxPython/lib/PyCrust
mkdir $(DISTDIR)/wxPython/wxPython/lib/editor mkdir $(DISTDIR)/wxPython/wxPython/lib/editor
mkdir $(DISTDIR)/wxPython/wxPython/lib/mixins 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/*.txt $(DISTDIR)/wxPython
cp $(WXDIR)/wxPython/*.py $(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/data/* $(DISTDIR)/wxPython/demo/data
-cp $(WXDIR)/wxPython/demo/dllwidget/Makefile $(DISTDIR)/wxPython/demo/dllwidget -cp $(WXDIR)/wxPython/demo/dllwidget/Makefile $(DISTDIR)/wxPython/demo/dllwidget
-cp $(WXDIR)/wxPython/demo/dllwidget/test_* $(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/* $(DISTDIR)/wxPython/src
cp $(WXDIR)/wxPython/src/gtk/*.py $(DISTDIR)/wxPython/src/gtk cp $(WXDIR)/wxPython/src/gtk/*.py $(DISTDIR)/wxPython/src/gtk
cp $(WXDIR)/wxPython/src/gtk/*.cpp $(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/PyCrust/*.py $(DISTDIR)/wxPython/wxPython/lib/PyCrust
cp $(WXDIR)/wxPython/wxPython/lib/editor/*.py $(DISTDIR)/wxPython/wxPython/lib/editor 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/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: distclean:
$(RM) -r _dist_dir $(RM) -r _dist_dir

6
debian/control.in vendored
View File

@@ -1,7 +1,7 @@
Source: wxwindows=V Source: wxwindows=V
Section: libs Section: libs
Priority: optional 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> Maintainer: Ron Lee <ron@debian.org>
Standards-Version: 3.5.6.0 Standards-Version: 3.5.6.0
@@ -81,7 +81,7 @@ Description: wxWindows Cross-platform C++ GUI toolkit (GTK+ runtime)
Package: libwxgtk=V-dev Package: libwxgtk=V-dev
Architecture: any Architecture: any
Section: devel 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 Suggests: wxwin=V-doc, libstdc++-dev, gettext, libgl-dev
Conflicts: libwxgtk-dev Conflicts: libwxgtk-dev
Replaces: libwxgtk-dev, wxgtk2.1-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 Package: libwxgtk=V-univ
Architecture: any Architecture: any
Section: libs 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 Suggests: wxwin=V-doc, libstdc++-dev, gettext, libgl-dev
Description: wxWindows Cross-platform C++ GUI toolkit (wxUNIVERSAL widgets) Description: wxWindows Cross-platform C++ GUI toolkit (wxUNIVERSAL widgets)
wxWindows is a class library for C++ providing GUI (Graphical User wxWindows is a class library for C++ providing GUI (Graphical User

4
debian/rules vendored
View File

@@ -271,6 +271,7 @@ build-gtk-shared-stamp:
--with-libjpeg=sys \ --with-libjpeg=sys \
--with-libpng=sys \ --with-libpng=sys \
--with-libtiff=sys \ --with-libtiff=sys \
--enable-dynamic-loader \
&& $(MAKE) && $(MAKE)
touch $@ touch $@
@@ -287,6 +288,7 @@ build-gtk-static-stamp:
--with-libjpeg=sys \ --with-libjpeg=sys \
--with-libpng=sys \ --with-libpng=sys \
--with-libtiff=sys \ --with-libtiff=sys \
--enable-dynamic-loader \
&& $(MAKE) && $(MAKE)
touch $@ touch $@
@@ -304,6 +306,7 @@ build-gtk-debug-stamp:
--with-libjpeg=sys \ --with-libjpeg=sys \
--with-libpng=sys \ --with-libpng=sys \
--with-libtiff=sys \ --with-libtiff=sys \
--enable-dynamic-loader \
&& $(MAKE) && $(MAKE)
touch $@ touch $@
@@ -321,6 +324,7 @@ build-gtk-univ-stamp:
--with-libjpeg=sys \ --with-libjpeg=sys \
--with-libpng=sys \ --with-libpng=sys \
--with-libtiff=sys \ --with-libtiff=sys \
--enable-dynamic-loader \
&& $(MAKE) && $(MAKE)
touch $@ touch $@

2
include/wx/event.h
View File

@@ -74,7 +74,7 @@ typedef int wxEventType;
#define BEGIN_DECLARE_EVENT_TYPES() enum { #define BEGIN_DECLARE_EVENT_TYPES() enum {
#define END_DECLARE_EVENT_TYPES() }; #define END_DECLARE_EVENT_TYPES() };
#define DECLARE_EVENT_TYPE(name, value) name = wxEVT_FIRST + value, #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_EVENT_TYPE(name)
#define DEFINE_LOCAL_EVENT_TYPE(name) #define DEFINE_LOCAL_EVENT_TYPE(name)