From e6c95f27a380dcdc5099719f4675ffc50acfdf4a Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Tue, 4 May 1999 00:25:56 +0000 Subject: [PATCH] Some slight cleanup and reorganization Added support for making RPM distribution git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2335 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- utils/wxPython/README.txt | 4 ++ utils/wxPython/distrib/.cvsignore | 6 ++ utils/wxPython/distrib/.rpmrc | 5 ++ utils/wxPython/distrib/makerpm | 22 +++++++ utils/wxPython/distrib/maketgz | 36 ++++++++++++ utils/wxPython/distrib/wxPython.rsp | 78 +++++++++++++------------ utils/wxPython/distrib/wxPython.spec.in | 44 ++++++++++++++ utils/wxPython/src/Makefile.pre.in | 29 ++++++++- utils/wxPython/src/Setup.in | 5 +- utils/wxPython/src/gtk/cmndlgs.cpp | 8 +++ utils/wxPython/src/gtk/controls.cpp | 8 +++ utils/wxPython/src/gtk/controls2.cpp | 16 +++-- utils/wxPython/src/gtk/controls2.py | 13 +++++ utils/wxPython/src/gtk/events.cpp | 8 +++ utils/wxPython/src/gtk/frames.cpp | 8 +++ utils/wxPython/src/gtk/gdi.cpp | 8 +++ utils/wxPython/src/gtk/glcanvas.cpp | 18 ++++++ utils/wxPython/src/gtk/image.cpp | 8 +++ utils/wxPython/src/gtk/mdi.cpp | 8 +++ utils/wxPython/src/gtk/misc.cpp | 8 +++ utils/wxPython/src/gtk/stattool.cpp | 8 +++ utils/wxPython/src/gtk/windows.cpp | 8 +++ utils/wxPython/src/gtk/windows2.cpp | 8 +++ utils/wxPython/src/gtk/windows3.cpp | 8 +++ utils/wxPython/src/gtk/wx.cpp | 15 ++++- utils/wxPython/src/gtk/wx.py | 7 ++- 26 files changed, 342 insertions(+), 52 deletions(-) create mode 100644 utils/wxPython/distrib/.cvsignore create mode 100644 utils/wxPython/distrib/.rpmrc create mode 100755 utils/wxPython/distrib/makerpm create mode 100755 utils/wxPython/distrib/maketgz create mode 100644 utils/wxPython/distrib/wxPython.spec.in diff --git a/utils/wxPython/README.txt b/utils/wxPython/README.txt index 1aef53e893..ceeb4ad45c 100644 --- a/utils/wxPython/README.txt +++ b/utils/wxPython/README.txt @@ -245,6 +245,10 @@ version of Python either from the command line or from a shortcut. Unix ---- +0. I configure wxWindows like this, YMMV: + +./configure --with-gtk --without-shared --with-threads --without-unicode --with-libjpeg + 1. Change into the $(WXWIN)/utils/wxPython/src directory. diff --git a/utils/wxPython/distrib/.cvsignore b/utils/wxPython/distrib/.cvsignore new file mode 100644 index 0000000000..21d5fb12cc --- /dev/null +++ b/utils/wxPython/distrib/.cvsignore @@ -0,0 +1,6 @@ +*.gz +*.rpm +*.zip +filelist +wxPython.spec +wxp2.wse diff --git a/utils/wxPython/distrib/.rpmrc b/utils/wxPython/distrib/.rpmrc new file mode 100644 index 0000000000..1fbb510693 --- /dev/null +++ b/utils/wxPython/distrib/.rpmrc @@ -0,0 +1,5 @@ +sourcedir : . +builddir : . +rpmdir : . +srcrpmdir : . + diff --git a/utils/wxPython/distrib/makerpm b/utils/wxPython/distrib/makerpm new file mode 100755 index 0000000000..2709058383 --- /dev/null +++ b/utils/wxPython/distrib/makerpm @@ -0,0 +1,22 @@ +#!/bin/bash + +if [ -z $1 ]; then + echo "Please specify a version number on the command line." + exit 1 +fi + +if [ ! -f wxPython.spec.in ]; then + echo "Please run this script from the directory containing the wxPython.spec.in file." + exit 1 +fi + + + +mkdir i386 +strip /usr/lib/python1.5/site-packages/wxPython/wxcmodule.so + +cat wxPython.spec.in | sed s/__VERSION__/$1/g > wxPython.spec +rpm --rcfile .rpmrc -bb --clean wxPython.spec + +mv i386/*.rpm . +rm -rf i386 diff --git a/utils/wxPython/distrib/maketgz b/utils/wxPython/distrib/maketgz new file mode 100755 index 0000000000..57c33848f4 --- /dev/null +++ b/utils/wxPython/distrib/maketgz @@ -0,0 +1,36 @@ +#!/bin/bash +#---------------------------------------------------------------------- +# Make a source distribution as a tar.gz file. This script should be +# run from the directory that holds the wxPython dir (../..) and be +# given a version number as an parameter. The best way to do this is +# run "make dist" in the wxPython/src/ directory. +#---------------------------------------------------------------------- + +if [ -z $1 ]; then + echo "Please specify a version number on the command line." + exit 1 +fi + +if [ ! -d wxPython ]; then + echo "Please run this script from the directory containing the wxPython sources." + exit 1 +fi + + +rm -f wxPython/distrib/filelist +for x in `cat wxPython/distrib/wxPython.rsp`; do + ls $x >> wxPython/distrib/filelist +done + + +tar cf wxPython/distrib/dist-temp.tar -T wxPython/distrib/filelist +cd wxPython/distrib +tar xf dist-temp.tar +rm dist-temp.tar +mv wxPython wxPython-$1 + +tar cvf wxPython-$1.tar wxPython-$1 +gzip wxPython-$1.tar + +rm -rf wxPython-$1 + diff --git a/utils/wxPython/distrib/wxPython.rsp b/utils/wxPython/distrib/wxPython.rsp index 6656292fa7..3ae03f0bda 100644 --- a/utils/wxPython/distrib/wxPython.rsp +++ b/utils/wxPython/distrib/wxPython.rsp @@ -1,38 +1,44 @@ -wxPython\*.txt - -wxPython\demo\*.py -wxPython\demo\bitmaps\*.bmp -wxPython\demo\bitmaps\*.ico -wxPython\demo\README.txt - - -wxPython\src\*.i -wxPython\src\*.py -wxPython\src\*.cpp -wxPython\src\*.h -wxPython\src\*.ico -wxPython\src\*.def -wxPython\src\*.rc -wxPython\src\makefile.* -wxPython\src\Makefile.pre.in -wxPython\src\Setup.* - -wxPython\src\msw\*.cpp -wxPython\src\msw\*.h -wxPython\src\msw\*.py - -wxPython\src\gtk\*.cpp -wxPython\src\gtk\*.h -wxPython\src\gtk\*.py - -wxPython\src\motif\*.cpp -wxPython\src\motif\*.h -wxPython\src\motif\*.py - -wxPython\src\qt\*.cpp -wxPython\src\qt\*.h -wxPython\src\qt\*.py - -wxPython\SWIG.patches\*.patch +wxPython/*.txt + +wxPython/demo/*.py +wxPython/demo/bitmaps/*.bmp +wxPython/demo/bitmaps/*.ico +wxPython/demo/bitmaps/*.gif +wxPython/demo/bitmaps/*.png +wxPython/demo/bitmaps/*.jpg +wxPython/demo/README.txt + +wxPython/lib/*.py +wxPython/lib/*.txt + + +wxPython/src/*.i +wxPython/src/*.py +wxPython/src/*.cpp +wxPython/src/*.h +wxPython/src/*.ico +wxPython/src/*.def +wxPython/src/*.rc +wxPython/src/makefile.* +wxPython/src/Makefile.pre.in +wxPython/src/Setup.* + +wxPython/src/msw/*.cpp +wxPython/src/msw/*.h +wxPython/src/msw/*.py + +wxPython/src/gtk/*.cpp +wxPython/src/gtk/*.h +wxPython/src/gtk/*.py + +wxPython/src/motif/*.cpp +wxPython/src/motif/*.h +wxPython/src/motif/*.py + +wxPython/src/qt/*.cpp +wxPython/src/qt/*.h +wxPython/src/qt/*.py + +wxPython/SWIG.patches/*.patch diff --git a/utils/wxPython/distrib/wxPython.spec.in b/utils/wxPython/distrib/wxPython.spec.in new file mode 100644 index 0000000000..d083448340 --- /dev/null +++ b/utils/wxPython/distrib/wxPython.spec.in @@ -0,0 +1,44 @@ +Summary: Cross platform GUI toolkit for use with the Python language. +Name: wxPython +Version: __VERSION__ +Release: 2 +Copyright: wxWindows +Group: Development/Languages/Python +Source: http://alldunn.com/wxPython/wxPython-__VERSION__.tar.gz +Packager: Robin Dunn +Vendor: Total Control Software + + +%description + +This Python package consists of an extension module that wraps around the +wxWindows C++ class library and provides a cross platform GUI toolkit for +use with Python. Currently supported platforms are Win32 and Unix/GTK/X. + +Python is an interpreted, interactive, object-oriented programming language. +Python combines remarkable power with very clear syntax. It has modules, +classes, exceptions, very high level dynamic data types, and dynamic typing. +There are interfaces to many system calls and libraries, and new built-in +modules are easily written in C or C++. Python is also usable as an +extension language for applications that need a programmable interface. + +#%prep +#%setup +#cd wxPython-__VERSION__ +#make -f Makefile.pre.in boot +# +#%build +#make OPT=-O2 +# +# +#%install +#make install + +%files +%doc ../README.txt +/usr/lib/python1.5/site-packages/wxPython + + + + + diff --git a/utils/wxPython/src/Makefile.pre.in b/utils/wxPython/src/Makefile.pre.in index c68cfe7aab..7a08b85a75 100644 --- a/utils/wxPython/src/Makefile.pre.in +++ b/utils/wxPython/src/Makefile.pre.in @@ -324,6 +324,7 @@ distclean: clobber # Custom rules and dependencies added for wxPython # +WXP_VERSION=2.0b9 SWIGFLAGS=-c++ -shadow -python -dnone -D__WXGTK__ $(SEPARATE) @@ -386,11 +387,35 @@ wxInstall : sharedmods $(PYMODULES) -for i in $(PYMODULES); do \ cp $$i $(TARGETDIR); \ done - python $(LIBDEST)/compileall.py -l $(TARGETDIR) - python -O $(LIBDEST)/compileall.py -l $(TARGETDIR) + if [ "$(TARGETDIR)" != ".." ]; then \ + mkdir $(TARGETDIR)/lib; \ + mkdir $(TARGETDIR)/demo; \ + cp ../lib/*.py $(TARGETDIR)/lib; \ + cp ../demo/*.py $(TARGETDIR)/demo; \ + cp ../lib/*.txt $(TARGETDIR)/lib; \ + cp ../demo/*.txt $(TARGETDIR)/demo;\ + fi + if [ "$(TARGETDIR)" != ".." ]; then \ + python $(LIBDEST)/compileall.py $(TARGETDIR); \ + python -O $(LIBDEST)/compileall.py $(TARGETDIR); \ + else \ + python $(LIBDEST)/compileall.py -l $(TARGETDIR); \ + python -O $(LIBDEST)/compileall.py -l $(TARGETDIR);\ + fi + + lib : libwxPython.a libwxPython.a : lib.a cp $< $@ + +dist: tgz rpm + +tgz: + cd ../..; wxPython/distrib/maketgz $(WXP_VERSION) + +rpm: + cd ../distrib; ./makerpm $(WXP_VERSION) + diff --git a/utils/wxPython/src/Setup.in b/utils/wxPython/src/Setup.in index aa35542577..f95a4409f5 100644 --- a/utils/wxPython/src/Setup.in +++ b/utils/wxPython/src/Setup.in @@ -29,9 +29,8 @@ MY_LINKCC=$(CCC) ## Pick one of these, or set your own. This is where the wxPython module ## should be installed. It should be a subdirectory named wxPython. -TARGETDIR=.. -#TARGETDIR=$(BINLIBDEST)/site-packages/wxPython -#TARGETDIR=$(BINLIBDEST)/wxPython +#TARGETDIR=.. +TARGETDIR=$(BINLIBDEST)/site-packages/wxPython wxc wx.cpp helpers.cpp windows.cpp events.cpp misc.cpp gdi.cpp \ diff --git a/utils/wxPython/src/gtk/cmndlgs.cpp b/utils/wxPython/src/gtk/cmndlgs.cpp index 8f52607768..b0548844b1 100644 --- a/utils/wxPython/src/gtk/cmndlgs.cpp +++ b/utils/wxPython/src/gtk/cmndlgs.cpp @@ -4179,6 +4179,10 @@ SWIGEXPORT(void,initcmndlgsc)() { SWIG_RegisterMapping("_class_wxAcceleratorTable","_wxAcceleratorTable",0); SWIG_RegisterMapping("_wxDC","_class_wxDC",0); SWIG_RegisterMapping("_class_wxSingleChoiceDialog","_wxSingleChoiceDialog",0); + SWIG_RegisterMapping("_size_t","_unsigned_int",0); + SWIG_RegisterMapping("_size_t","_int",0); + SWIG_RegisterMapping("_size_t","_wxWindowID",0); + SWIG_RegisterMapping("_size_t","_uint",0); SWIG_RegisterMapping("_class_wxRealPoint","_wxRealPoint",0); SWIG_RegisterMapping("_class_wxMenuItem","_wxMenuItem",0); SWIG_RegisterMapping("_class_wxPostScriptDC","_wxPostScriptDC",0); @@ -4225,6 +4229,7 @@ SWIGEXPORT(void,initcmndlgsc)() { SWIG_RegisterMapping("_class_wxDialog","_wxDialog",0); SWIG_RegisterMapping("_wxPageSetupDialog","_class_wxPageSetupDialog",0); SWIG_RegisterMapping("_wxBrush","_class_wxBrush",0); + SWIG_RegisterMapping("_uint","_size_t",0); SWIG_RegisterMapping("_uint","_unsigned_int",0); SWIG_RegisterMapping("_uint","_int",0); SWIG_RegisterMapping("_uint","_wxWindowID",0); @@ -4321,6 +4326,7 @@ SWIGEXPORT(void,initcmndlgsc)() { SWIG_RegisterMapping("_wxScrolledWindow","_class_wxScrolledWindow",0); SWIG_RegisterMapping("_unsigned_char","_byte",0); SWIG_RegisterMapping("_class_wxMenu","_wxMenu",0); + SWIG_RegisterMapping("_unsigned_int","_size_t",0); SWIG_RegisterMapping("_unsigned_int","_uint",0); SWIG_RegisterMapping("_unsigned_int","_wxWindowID",0); SWIG_RegisterMapping("_unsigned_int","_int",0); @@ -4351,11 +4357,13 @@ SWIGEXPORT(void,initcmndlgsc)() { SWIG_RegisterMapping("_short","_unsigned_short",0); SWIG_RegisterMapping("_short","_signed_short",0); SWIG_RegisterMapping("_class_wxImageList","_wxImageList",0); + SWIG_RegisterMapping("_wxWindowID","_size_t",0); SWIG_RegisterMapping("_wxWindowID","_EBool",0); SWIG_RegisterMapping("_wxWindowID","_uint",0); SWIG_RegisterMapping("_wxWindowID","_int",0); SWIG_RegisterMapping("_wxWindowID","_signed_int",0); SWIG_RegisterMapping("_wxWindowID","_unsigned_int",0); + SWIG_RegisterMapping("_int","_size_t",0); SWIG_RegisterMapping("_int","_EBool",0); SWIG_RegisterMapping("_int","_uint",0); SWIG_RegisterMapping("_int","_wxWindowID",0); diff --git a/utils/wxPython/src/gtk/controls.cpp b/utils/wxPython/src/gtk/controls.cpp index 86f2636205..e8992c7493 100644 --- a/utils/wxPython/src/gtk/controls.cpp +++ b/utils/wxPython/src/gtk/controls.cpp @@ -6458,6 +6458,10 @@ SWIGEXPORT(void,initcontrolsc)() { SWIG_RegisterMapping("_class_wxGauge","_wxGauge",0); SWIG_RegisterMapping("_wxDC","_class_wxDC",0); SWIG_RegisterMapping("_wxSpinEvent","_class_wxSpinEvent",0); + SWIG_RegisterMapping("_size_t","_unsigned_int",0); + SWIG_RegisterMapping("_size_t","_int",0); + SWIG_RegisterMapping("_size_t","_wxWindowID",0); + SWIG_RegisterMapping("_size_t","_uint",0); SWIG_RegisterMapping("_class_wxRealPoint","_wxRealPoint",0); SWIG_RegisterMapping("_class_wxMenuItem","_wxMenuItem",0); SWIG_RegisterMapping("_class_wxPaintEvent","_wxPaintEvent",0); @@ -6477,6 +6481,7 @@ SWIGEXPORT(void,initcontrolsc)() { SWIG_RegisterMapping("_class_wxUpdateUIEvent","_wxUpdateUIEvent",0); SWIG_RegisterMapping("_wxBrush","_class_wxBrush",0); SWIG_RegisterMapping("_wxShowEvent","_class_wxShowEvent",0); + SWIG_RegisterMapping("_uint","_size_t",0); SWIG_RegisterMapping("_uint","_unsigned_int",0); SWIG_RegisterMapping("_uint","_int",0); SWIG_RegisterMapping("_uint","_wxWindowID",0); @@ -6635,6 +6640,7 @@ SWIGEXPORT(void,initcontrolsc)() { SWIG_RegisterMapping("_class_wxListBox","_class_wxCheckListBox",SwigwxCheckListBoxTowxListBox); SWIG_RegisterMapping("_class_wxListBox","_wxCheckListBox",SwigwxCheckListBoxTowxListBox); SWIG_RegisterMapping("_class_wxListBox","_wxListBox",0); + SWIG_RegisterMapping("_unsigned_int","_size_t",0); SWIG_RegisterMapping("_unsigned_int","_uint",0); SWIG_RegisterMapping("_unsigned_int","_wxWindowID",0); SWIG_RegisterMapping("_unsigned_int","_int",0); @@ -6652,11 +6658,13 @@ SWIGEXPORT(void,initcontrolsc)() { SWIG_RegisterMapping("_class_wxSlider","_wxSlider",0); SWIG_RegisterMapping("_class_wxImageList","_wxImageList",0); SWIG_RegisterMapping("_class_wxBitmapButton","_wxBitmapButton",0); + SWIG_RegisterMapping("_wxWindowID","_size_t",0); SWIG_RegisterMapping("_wxWindowID","_EBool",0); SWIG_RegisterMapping("_wxWindowID","_uint",0); SWIG_RegisterMapping("_wxWindowID","_int",0); SWIG_RegisterMapping("_wxWindowID","_signed_int",0); SWIG_RegisterMapping("_wxWindowID","_unsigned_int",0); + SWIG_RegisterMapping("_int","_size_t",0); SWIG_RegisterMapping("_int","_EBool",0); SWIG_RegisterMapping("_int","_uint",0); SWIG_RegisterMapping("_int","_wxWindowID",0); diff --git a/utils/wxPython/src/gtk/controls2.cpp b/utils/wxPython/src/gtk/controls2.cpp index 471fea9e4b..608b3e0436 100644 --- a/utils/wxPython/src/gtk/controls2.cpp +++ b/utils/wxPython/src/gtk/controls2.cpp @@ -3036,10 +3036,9 @@ static PyObject *_wrap_new_wxTreeCtrl(PyObject *self, PyObject *args) { #define wxTreeCtrl_GetCount(_swigobj) (_swigobj->GetCount()) static PyObject *_wrap_wxTreeCtrl_GetCount(PyObject *self, PyObject *args) { PyObject * _resultobj; - size_t * _result; + size_t _result; wxTreeCtrl * _arg0; char * _argc0 = 0; - char _ptemp[128]; self = self; if(!PyArg_ParseTuple(args,"s:wxTreeCtrl_GetCount",&_argc0)) @@ -3052,11 +3051,10 @@ static PyObject *_wrap_wxTreeCtrl_GetCount(PyObject *self, PyObject *args) { } { wxPy_BEGIN_ALLOW_THREADS; - _result = new size_t (wxTreeCtrl_GetCount(_arg0)); + _result = (size_t )wxTreeCtrl_GetCount(_arg0); wxPy_END_ALLOW_THREADS; -} SWIG_MakePtr(_ptemp, (void *) _result,"_size_t_p"); - _resultobj = Py_BuildValue("s",_ptemp); +} _resultobj = Py_BuildValue("i",_result); return _resultobj; } @@ -5169,6 +5167,10 @@ SWIGEXPORT(void,initcontrols2c)() { SWIG_RegisterMapping("_wxDC","_class_wxDC",0); SWIG_RegisterMapping("_wxListEvent","_class_wxListEvent",0); SWIG_RegisterMapping("_wxSpinEvent","_class_wxSpinEvent",0); + SWIG_RegisterMapping("_size_t","_unsigned_int",0); + SWIG_RegisterMapping("_size_t","_int",0); + SWIG_RegisterMapping("_size_t","_wxWindowID",0); + SWIG_RegisterMapping("_size_t","_uint",0); SWIG_RegisterMapping("_class_wxRealPoint","_wxRealPoint",0); SWIG_RegisterMapping("_class_wxMenuItem","_wxMenuItem",0); SWIG_RegisterMapping("_class_wxPaintEvent","_wxPaintEvent",0); @@ -5188,6 +5190,7 @@ SWIGEXPORT(void,initcontrols2c)() { SWIG_RegisterMapping("_class_wxUpdateUIEvent","_wxUpdateUIEvent",0); SWIG_RegisterMapping("_wxBrush","_class_wxBrush",0); SWIG_RegisterMapping("_wxShowEvent","_class_wxShowEvent",0); + SWIG_RegisterMapping("_uint","_size_t",0); SWIG_RegisterMapping("_uint","_unsigned_int",0); SWIG_RegisterMapping("_uint","_int",0); SWIG_RegisterMapping("_uint","_wxWindowID",0); @@ -5290,6 +5293,7 @@ SWIGEXPORT(void,initcontrols2c)() { SWIG_RegisterMapping("_wxControl","_wxListCtrl",SwigwxListCtrlTowxControl); SWIG_RegisterMapping("_wxControl","_class_wxControl",0); SWIG_RegisterMapping("_class_wxListBox","_wxListBox",0); + SWIG_RegisterMapping("_unsigned_int","_size_t",0); SWIG_RegisterMapping("_unsigned_int","_uint",0); SWIG_RegisterMapping("_unsigned_int","_wxWindowID",0); SWIG_RegisterMapping("_unsigned_int","_int",0); @@ -5308,11 +5312,13 @@ SWIGEXPORT(void,initcontrols2c)() { SWIG_RegisterMapping("_class_wxSlider","_wxSlider",0); SWIG_RegisterMapping("_class_wxImageList","_wxImageList",0); SWIG_RegisterMapping("_class_wxBitmapButton","_wxBitmapButton",0); + SWIG_RegisterMapping("_wxWindowID","_size_t",0); SWIG_RegisterMapping("_wxWindowID","_EBool",0); SWIG_RegisterMapping("_wxWindowID","_uint",0); SWIG_RegisterMapping("_wxWindowID","_int",0); SWIG_RegisterMapping("_wxWindowID","_signed_int",0); SWIG_RegisterMapping("_wxWindowID","_unsigned_int",0); + SWIG_RegisterMapping("_int","_size_t",0); SWIG_RegisterMapping("_int","_EBool",0); SWIG_RegisterMapping("_int","_uint",0); SWIG_RegisterMapping("_int","_wxWindowID",0); diff --git a/utils/wxPython/src/gtk/controls2.py b/utils/wxPython/src/gtk/controls2.py index 8c1ecc8460..9b1ba88428 100644 --- a/utils/wxPython/src/gtk/controls2.py +++ b/utils/wxPython/src/gtk/controls2.py @@ -593,6 +593,19 @@ class wxTreeCtrlPtr(wxControlPtr): return val def __repr__(self): return "" + + # Redefine a couple methods that SWIG gets a bit confused on... + def GetFirstChild(self,arg0,arg1): + val1, val2 = controls2c.wxTreeCtrl_GetFirstChild(self.this,arg0.this,arg1) + val1 = wxTreeItemIdPtr(val1) + val1.thisown = 1 + return (val1,val2) + def GetNextChild(self,arg0,arg1): + val1, val2 = controls2c.wxTreeCtrl_GetFirstChild(self.this,arg0.this,arg1) + val1 = wxTreeItemIdPtr(val1) + val1.thisown = 1 + return (val1,val2) + class wxTreeCtrl(wxTreeCtrlPtr): def __init__(self,arg0,*args) : argl = map(None,args) diff --git a/utils/wxPython/src/gtk/events.cpp b/utils/wxPython/src/gtk/events.cpp index 8347000787..19fc1d1436 100644 --- a/utils/wxPython/src/gtk/events.cpp +++ b/utils/wxPython/src/gtk/events.cpp @@ -3181,6 +3181,10 @@ SWIGEXPORT(void,initeventsc)() { SWIG_RegisterMapping("_wxDropFilesEvent","_class_wxDropFilesEvent",0); SWIG_RegisterMapping("_class_wxAcceleratorTable","_wxAcceleratorTable",0); SWIG_RegisterMapping("_wxSpinEvent","_class_wxSpinEvent",0); + SWIG_RegisterMapping("_size_t","_unsigned_int",0); + SWIG_RegisterMapping("_size_t","_int",0); + SWIG_RegisterMapping("_size_t","_wxWindowID",0); + SWIG_RegisterMapping("_size_t","_uint",0); SWIG_RegisterMapping("_class_wxRealPoint","_wxRealPoint",0); SWIG_RegisterMapping("_class_wxPaintEvent","_wxPaintEvent",0); SWIG_RegisterMapping("_wxSysColourChangedEvent","_class_wxSysColourChangedEvent",0); @@ -3191,6 +3195,7 @@ SWIGEXPORT(void,initeventsc)() { SWIG_RegisterMapping("_wxIdleEvent","_class_wxIdleEvent",0); SWIG_RegisterMapping("_class_wxUpdateUIEvent","_wxUpdateUIEvent",0); SWIG_RegisterMapping("_wxShowEvent","_class_wxShowEvent",0); + SWIG_RegisterMapping("_uint","_size_t",0); SWIG_RegisterMapping("_uint","_unsigned_int",0); SWIG_RegisterMapping("_uint","_int",0); SWIG_RegisterMapping("_uint","_wxWindowID",0); @@ -3291,6 +3296,7 @@ SWIGEXPORT(void,initeventsc)() { SWIG_RegisterMapping("_class_wxMaximizeEvent","_wxMaximizeEvent",0); SWIG_RegisterMapping("_class_wxAcceleratorEntry","_wxAcceleratorEntry",0); SWIG_RegisterMapping("_unsigned_char","_byte",0); + SWIG_RegisterMapping("_unsigned_int","_size_t",0); SWIG_RegisterMapping("_unsigned_int","_uint",0); SWIG_RegisterMapping("_unsigned_int","_wxWindowID",0); SWIG_RegisterMapping("_unsigned_int","_int",0); @@ -3301,11 +3307,13 @@ SWIGEXPORT(void,initeventsc)() { SWIG_RegisterMapping("_class_wxScrollEvent","_wxSpinEvent",SwigwxSpinEventTowxScrollEvent); SWIG_RegisterMapping("_class_wxScrollEvent","_wxScrollEvent",0); SWIG_RegisterMapping("_wxJoystickEvent","_class_wxJoystickEvent",0); + SWIG_RegisterMapping("_wxWindowID","_size_t",0); SWIG_RegisterMapping("_wxWindowID","_EBool",0); SWIG_RegisterMapping("_wxWindowID","_uint",0); SWIG_RegisterMapping("_wxWindowID","_int",0); SWIG_RegisterMapping("_wxWindowID","_signed_int",0); SWIG_RegisterMapping("_wxWindowID","_unsigned_int",0); + SWIG_RegisterMapping("_int","_size_t",0); SWIG_RegisterMapping("_int","_EBool",0); SWIG_RegisterMapping("_int","_uint",0); SWIG_RegisterMapping("_int","_wxWindowID",0); diff --git a/utils/wxPython/src/gtk/frames.cpp b/utils/wxPython/src/gtk/frames.cpp index ed67e96c6d..bd1a323bf8 100644 --- a/utils/wxPython/src/gtk/frames.cpp +++ b/utils/wxPython/src/gtk/frames.cpp @@ -910,6 +910,10 @@ SWIGEXPORT(void,initframesc)() { SWIG_RegisterMapping("_class_wxGauge","_wxGauge",0); SWIG_RegisterMapping("_wxDC","_class_wxDC",0); SWIG_RegisterMapping("_wxSpinEvent","_class_wxSpinEvent",0); + SWIG_RegisterMapping("_size_t","_unsigned_int",0); + SWIG_RegisterMapping("_size_t","_int",0); + SWIG_RegisterMapping("_size_t","_wxWindowID",0); + SWIG_RegisterMapping("_size_t","_uint",0); SWIG_RegisterMapping("_class_wxRealPoint","_wxRealPoint",0); SWIG_RegisterMapping("_class_wxMenuItem","_wxMenuItem",0); SWIG_RegisterMapping("_class_wxPaintEvent","_wxPaintEvent",0); @@ -932,6 +936,7 @@ SWIGEXPORT(void,initframesc)() { SWIG_RegisterMapping("_wxBrush","_class_wxBrush",0); SWIG_RegisterMapping("_wxMiniFrame","_class_wxMiniFrame",0); SWIG_RegisterMapping("_wxShowEvent","_class_wxShowEvent",0); + SWIG_RegisterMapping("_uint","_size_t",0); SWIG_RegisterMapping("_uint","_unsigned_int",0); SWIG_RegisterMapping("_uint","_int",0); SWIG_RegisterMapping("_uint","_wxWindowID",0); @@ -1022,6 +1027,7 @@ SWIGEXPORT(void,initframesc)() { SWIG_RegisterMapping("_class_wxMenu","_wxMenu",0); SWIG_RegisterMapping("_wxControl","_class_wxControl",0); SWIG_RegisterMapping("_class_wxListBox","_wxListBox",0); + SWIG_RegisterMapping("_unsigned_int","_size_t",0); SWIG_RegisterMapping("_unsigned_int","_uint",0); SWIG_RegisterMapping("_unsigned_int","_wxWindowID",0); SWIG_RegisterMapping("_unsigned_int","_int",0); @@ -1042,11 +1048,13 @@ SWIGEXPORT(void,initframesc)() { SWIG_RegisterMapping("_wxFrame","_class_wxMiniFrame",SwigwxMiniFrameTowxFrame); SWIG_RegisterMapping("_wxFrame","_wxMiniFrame",SwigwxMiniFrameTowxFrame); SWIG_RegisterMapping("_wxFrame","_class_wxFrame",0); + SWIG_RegisterMapping("_wxWindowID","_size_t",0); SWIG_RegisterMapping("_wxWindowID","_EBool",0); SWIG_RegisterMapping("_wxWindowID","_uint",0); SWIG_RegisterMapping("_wxWindowID","_int",0); SWIG_RegisterMapping("_wxWindowID","_signed_int",0); SWIG_RegisterMapping("_wxWindowID","_unsigned_int",0); + SWIG_RegisterMapping("_int","_size_t",0); SWIG_RegisterMapping("_int","_EBool",0); SWIG_RegisterMapping("_int","_uint",0); SWIG_RegisterMapping("_int","_wxWindowID",0); diff --git a/utils/wxPython/src/gtk/gdi.cpp b/utils/wxPython/src/gtk/gdi.cpp index 3bb0531df3..ff1443a723 100644 --- a/utils/wxPython/src/gtk/gdi.cpp +++ b/utils/wxPython/src/gtk/gdi.cpp @@ -6016,12 +6016,17 @@ SWIGEXPORT(void,initgdic)() { SWIG_RegisterMapping("_wxDC","_class_wxMemoryDC",SwigwxMemoryDCTowxDC); SWIG_RegisterMapping("_wxDC","_wxMemoryDC",SwigwxMemoryDCTowxDC); SWIG_RegisterMapping("_wxDC","_class_wxDC",0); + SWIG_RegisterMapping("_size_t","_unsigned_int",0); + SWIG_RegisterMapping("_size_t","_int",0); + SWIG_RegisterMapping("_size_t","_wxWindowID",0); + SWIG_RegisterMapping("_size_t","_uint",0); SWIG_RegisterMapping("_class_wxRealPoint","_wxRealPoint",0); SWIG_RegisterMapping("_class_wxPostScriptDC","_wxPostScriptDC",0); SWIG_RegisterMapping("_class_wxToolTip","_wxToolTip",0); SWIG_RegisterMapping("_class_wxMask","_wxMask",0); SWIG_RegisterMapping("_wxColour","_class_wxColour",0); SWIG_RegisterMapping("_wxBrush","_class_wxBrush",0); + SWIG_RegisterMapping("_uint","_size_t",0); SWIG_RegisterMapping("_uint","_unsigned_int",0); SWIG_RegisterMapping("_uint","_int",0); SWIG_RegisterMapping("_uint","_wxWindowID",0); @@ -6082,6 +6087,7 @@ SWIGEXPORT(void,initgdic)() { SWIG_RegisterMapping("_class_wxCursor","_wxCursor",0); SWIG_RegisterMapping("_wxPostScriptDC","_class_wxPostScriptDC",0); SWIG_RegisterMapping("_unsigned_char","_byte",0); + SWIG_RegisterMapping("_unsigned_int","_size_t",0); SWIG_RegisterMapping("_unsigned_int","_uint",0); SWIG_RegisterMapping("_unsigned_int","_wxWindowID",0); SWIG_RegisterMapping("_unsigned_int","_int",0); @@ -6091,11 +6097,13 @@ SWIGEXPORT(void,initgdic)() { SWIG_RegisterMapping("_short","_unsigned_short",0); SWIG_RegisterMapping("_short","_signed_short",0); SWIG_RegisterMapping("_class_wxImageList","_wxImageList",0); + SWIG_RegisterMapping("_wxWindowID","_size_t",0); SWIG_RegisterMapping("_wxWindowID","_EBool",0); SWIG_RegisterMapping("_wxWindowID","_uint",0); SWIG_RegisterMapping("_wxWindowID","_int",0); SWIG_RegisterMapping("_wxWindowID","_signed_int",0); SWIG_RegisterMapping("_wxWindowID","_unsigned_int",0); + SWIG_RegisterMapping("_int","_size_t",0); SWIG_RegisterMapping("_int","_EBool",0); SWIG_RegisterMapping("_int","_uint",0); SWIG_RegisterMapping("_int","_wxWindowID",0); diff --git a/utils/wxPython/src/gtk/glcanvas.cpp b/utils/wxPython/src/gtk/glcanvas.cpp index 66e34024bb..66605e1f65 100644 --- a/utils/wxPython/src/gtk/glcanvas.cpp +++ b/utils/wxPython/src/gtk/glcanvas.cpp @@ -9123,6 +9123,7 @@ SWIGEXPORT(void,initglcanvasc)() { SWIG_RegisterMapping("_GLsizei","_wxWindowID",0); SWIG_RegisterMapping("_GLsizei","_uint",0); SWIG_RegisterMapping("_GLsizei","_EBool",0); + SWIG_RegisterMapping("_GLsizei","_size_t",0); SWIG_RegisterMapping("_GLsizei","_GLenum",0); SWIG_RegisterMapping("_GLsizei","_GLbitfield",0); SWIG_RegisterMapping("_GLsizei","_GLint",0); @@ -9159,6 +9160,7 @@ SWIGEXPORT(void,initglcanvasc)() { SWIG_RegisterMapping("_GLenum","_int",0); SWIG_RegisterMapping("_GLenum","_wxWindowID",0); SWIG_RegisterMapping("_GLenum","_uint",0); + SWIG_RegisterMapping("_GLenum","_size_t",0); SWIG_RegisterMapping("_class_wxPrintDialogData","_wxPrintDialogData",0); SWIG_RegisterMapping("_wxGLContext","_class_wxGLContext",0); SWIG_RegisterMapping("_class_wxAcceleratorTable","_wxAcceleratorTable",0); @@ -9172,6 +9174,15 @@ SWIGEXPORT(void,initglcanvasc)() { SWIG_RegisterMapping("_class_wxBMPHandler","_wxBMPHandler",0); SWIG_RegisterMapping("_wxSpinEvent","_class_wxSpinEvent",0); SWIG_RegisterMapping("_wxSashLayoutWindow","_class_wxSashLayoutWindow",0); + SWIG_RegisterMapping("_size_t","_GLuint",0); + SWIG_RegisterMapping("_size_t","_GLsizei",0); + SWIG_RegisterMapping("_size_t","_GLint",0); + SWIG_RegisterMapping("_size_t","_GLbitfield",0); + SWIG_RegisterMapping("_size_t","_GLenum",0); + SWIG_RegisterMapping("_size_t","_unsigned_int",0); + SWIG_RegisterMapping("_size_t","_int",0); + SWIG_RegisterMapping("_size_t","_wxWindowID",0); + SWIG_RegisterMapping("_size_t","_uint",0); SWIG_RegisterMapping("_class_wxRealPoint","_wxRealPoint",0); SWIG_RegisterMapping("_class_wxMenuItem","_wxMenuItem",0); SWIG_RegisterMapping("_class_wxPaintEvent","_wxPaintEvent",0); @@ -9205,6 +9216,7 @@ SWIGEXPORT(void,initglcanvasc)() { SWIG_RegisterMapping("_GLuint","_int",0); SWIG_RegisterMapping("_GLuint","_wxWindowID",0); SWIG_RegisterMapping("_GLuint","_uint",0); + SWIG_RegisterMapping("_GLuint","_size_t",0); SWIG_RegisterMapping("_GLuint","_GLenum",0); SWIG_RegisterMapping("_GLuint","_GLbitfield",0); SWIG_RegisterMapping("_GLuint","_GLint",0); @@ -9215,6 +9227,7 @@ SWIGEXPORT(void,initglcanvasc)() { SWIG_RegisterMapping("_uint","_GLint",0); SWIG_RegisterMapping("_uint","_GLbitfield",0); SWIG_RegisterMapping("_uint","_GLenum",0); + SWIG_RegisterMapping("_uint","_size_t",0); SWIG_RegisterMapping("_uint","_unsigned_int",0); SWIG_RegisterMapping("_uint","_int",0); SWIG_RegisterMapping("_uint","_wxWindowID",0); @@ -9251,6 +9264,7 @@ SWIGEXPORT(void,initglcanvasc)() { SWIG_RegisterMapping("_GLbitfield","_int",0); SWIG_RegisterMapping("_GLbitfield","_wxWindowID",0); SWIG_RegisterMapping("_GLbitfield","_uint",0); + SWIG_RegisterMapping("_GLbitfield","_size_t",0); SWIG_RegisterMapping("_GLbitfield","_GLenum",0); SWIG_RegisterMapping("_class_wxPyEvent","_wxPyEvent",0); SWIG_RegisterMapping("_wxTextEntryDialog","_class_wxTextEntryDialog",0); @@ -9375,6 +9389,7 @@ SWIGEXPORT(void,initglcanvasc)() { SWIG_RegisterMapping("_unsigned_int","_GLint",0); SWIG_RegisterMapping("_unsigned_int","_GLbitfield",0); SWIG_RegisterMapping("_unsigned_int","_GLenum",0); + SWIG_RegisterMapping("_unsigned_int","_size_t",0); SWIG_RegisterMapping("_unsigned_int","_uint",0); SWIG_RegisterMapping("_unsigned_int","_wxWindowID",0); SWIG_RegisterMapping("_unsigned_int","_int",0); @@ -9410,6 +9425,7 @@ SWIGEXPORT(void,initglcanvasc)() { SWIG_RegisterMapping("_wxWindowID","_GLint",0); SWIG_RegisterMapping("_wxWindowID","_GLbitfield",0); SWIG_RegisterMapping("_wxWindowID","_GLenum",0); + SWIG_RegisterMapping("_wxWindowID","_size_t",0); SWIG_RegisterMapping("_wxWindowID","_EBool",0); SWIG_RegisterMapping("_wxWindowID","_uint",0); SWIG_RegisterMapping("_wxWindowID","_int",0); @@ -9420,6 +9436,7 @@ SWIGEXPORT(void,initglcanvasc)() { SWIG_RegisterMapping("_int","_GLint",0); SWIG_RegisterMapping("_int","_GLbitfield",0); SWIG_RegisterMapping("_int","_GLenum",0); + SWIG_RegisterMapping("_int","_size_t",0); SWIG_RegisterMapping("_int","_EBool",0); SWIG_RegisterMapping("_int","_uint",0); SWIG_RegisterMapping("_int","_wxWindowID",0); @@ -9466,6 +9483,7 @@ SWIGEXPORT(void,initglcanvasc)() { SWIG_RegisterMapping("_GLint","_wxWindowID",0); SWIG_RegisterMapping("_GLint","_uint",0); SWIG_RegisterMapping("_GLint","_EBool",0); + SWIG_RegisterMapping("_GLint","_size_t",0); SWIG_RegisterMapping("_GLint","_GLenum",0); SWIG_RegisterMapping("_GLint","_GLbitfield",0); SWIG_RegisterMapping("_wxActivateEvent","_class_wxActivateEvent",0); diff --git a/utils/wxPython/src/gtk/image.cpp b/utils/wxPython/src/gtk/image.cpp index 6b70a687c4..926a90675e 100644 --- a/utils/wxPython/src/gtk/image.cpp +++ b/utils/wxPython/src/gtk/image.cpp @@ -1486,6 +1486,10 @@ SWIGEXPORT(void,initimagec)() { SWIG_RegisterMapping("_class_wxAcceleratorTable","_wxAcceleratorTable",0); SWIG_RegisterMapping("_wxDC","_class_wxDC",0); SWIG_RegisterMapping("_class_wxBMPHandler","_wxBMPHandler",0); + SWIG_RegisterMapping("_size_t","_unsigned_int",0); + SWIG_RegisterMapping("_size_t","_int",0); + SWIG_RegisterMapping("_size_t","_wxWindowID",0); + SWIG_RegisterMapping("_size_t","_uint",0); SWIG_RegisterMapping("_class_wxRealPoint","_wxRealPoint",0); SWIG_RegisterMapping("_class_wxGIFHandler","_wxGIFHandler",0); SWIG_RegisterMapping("_class_wxPostScriptDC","_wxPostScriptDC",0); @@ -1494,6 +1498,7 @@ SWIGEXPORT(void,initimagec)() { SWIG_RegisterMapping("_class_wxPNGHandler","_wxPNGHandler",0); SWIG_RegisterMapping("_wxColour","_class_wxColour",0); SWIG_RegisterMapping("_wxBrush","_class_wxBrush",0); + SWIG_RegisterMapping("_uint","_size_t",0); SWIG_RegisterMapping("_uint","_unsigned_int",0); SWIG_RegisterMapping("_uint","_int",0); SWIG_RegisterMapping("_uint","_wxWindowID",0); @@ -1548,6 +1553,7 @@ SWIGEXPORT(void,initimagec)() { SWIG_RegisterMapping("_class_wxImageHandler","_wxPNGHandler",SwigwxPNGHandlerTowxImageHandler); SWIG_RegisterMapping("_class_wxImageHandler","_wxImageHandler",0); SWIG_RegisterMapping("_unsigned_char","_byte",0); + SWIG_RegisterMapping("_unsigned_int","_size_t",0); SWIG_RegisterMapping("_unsigned_int","_uint",0); SWIG_RegisterMapping("_unsigned_int","_wxWindowID",0); SWIG_RegisterMapping("_unsigned_int","_int",0); @@ -1558,11 +1564,13 @@ SWIGEXPORT(void,initimagec)() { SWIG_RegisterMapping("_short","_signed_short",0); SWIG_RegisterMapping("_class_wxImageList","_wxImageList",0); SWIG_RegisterMapping("_wxJPEGHandler","_class_wxJPEGHandler",0); + SWIG_RegisterMapping("_wxWindowID","_size_t",0); SWIG_RegisterMapping("_wxWindowID","_EBool",0); SWIG_RegisterMapping("_wxWindowID","_uint",0); SWIG_RegisterMapping("_wxWindowID","_int",0); SWIG_RegisterMapping("_wxWindowID","_signed_int",0); SWIG_RegisterMapping("_wxWindowID","_unsigned_int",0); + SWIG_RegisterMapping("_int","_size_t",0); SWIG_RegisterMapping("_int","_EBool",0); SWIG_RegisterMapping("_int","_uint",0); SWIG_RegisterMapping("_int","_wxWindowID",0); diff --git a/utils/wxPython/src/gtk/mdi.cpp b/utils/wxPython/src/gtk/mdi.cpp index 9f6cc05dea..f1eef83a8e 100644 --- a/utils/wxPython/src/gtk/mdi.cpp +++ b/utils/wxPython/src/gtk/mdi.cpp @@ -674,6 +674,10 @@ SWIGEXPORT(void,initmdic)() { SWIG_RegisterMapping("_class_wxGauge","_wxGauge",0); SWIG_RegisterMapping("_wxDC","_class_wxDC",0); SWIG_RegisterMapping("_wxSpinEvent","_class_wxSpinEvent",0); + SWIG_RegisterMapping("_size_t","_unsigned_int",0); + SWIG_RegisterMapping("_size_t","_int",0); + SWIG_RegisterMapping("_size_t","_wxWindowID",0); + SWIG_RegisterMapping("_size_t","_uint",0); SWIG_RegisterMapping("_class_wxRealPoint","_wxRealPoint",0); SWIG_RegisterMapping("_class_wxMenuItem","_wxMenuItem",0); SWIG_RegisterMapping("_class_wxPaintEvent","_wxPaintEvent",0); @@ -696,6 +700,7 @@ SWIGEXPORT(void,initmdic)() { SWIG_RegisterMapping("_wxBrush","_class_wxBrush",0); SWIG_RegisterMapping("_wxMiniFrame","_class_wxMiniFrame",0); SWIG_RegisterMapping("_wxShowEvent","_class_wxShowEvent",0); + SWIG_RegisterMapping("_uint","_size_t",0); SWIG_RegisterMapping("_uint","_unsigned_int",0); SWIG_RegisterMapping("_uint","_int",0); SWIG_RegisterMapping("_uint","_wxWindowID",0); @@ -792,6 +797,7 @@ SWIGEXPORT(void,initmdic)() { SWIG_RegisterMapping("_class_wxMenu","_wxMenu",0); SWIG_RegisterMapping("_wxControl","_class_wxControl",0); SWIG_RegisterMapping("_class_wxListBox","_wxListBox",0); + SWIG_RegisterMapping("_unsigned_int","_size_t",0); SWIG_RegisterMapping("_unsigned_int","_uint",0); SWIG_RegisterMapping("_unsigned_int","_wxWindowID",0); SWIG_RegisterMapping("_unsigned_int","_int",0); @@ -814,11 +820,13 @@ SWIGEXPORT(void,initmdic)() { SWIG_RegisterMapping("_wxFrame","_class_wxMDIParentFrame",SwigwxMDIParentFrameTowxFrame); SWIG_RegisterMapping("_wxFrame","_wxMDIParentFrame",SwigwxMDIParentFrameTowxFrame); SWIG_RegisterMapping("_wxFrame","_class_wxFrame",0); + SWIG_RegisterMapping("_wxWindowID","_size_t",0); SWIG_RegisterMapping("_wxWindowID","_EBool",0); SWIG_RegisterMapping("_wxWindowID","_uint",0); SWIG_RegisterMapping("_wxWindowID","_int",0); SWIG_RegisterMapping("_wxWindowID","_signed_int",0); SWIG_RegisterMapping("_wxWindowID","_unsigned_int",0); + SWIG_RegisterMapping("_int","_size_t",0); SWIG_RegisterMapping("_int","_EBool",0); SWIG_RegisterMapping("_int","_uint",0); SWIG_RegisterMapping("_int","_wxWindowID",0); diff --git a/utils/wxPython/src/gtk/misc.cpp b/utils/wxPython/src/gtk/misc.cpp index 1cbc459b8c..1ffbd96657 100644 --- a/utils/wxPython/src/gtk/misc.cpp +++ b/utils/wxPython/src/gtk/misc.cpp @@ -4177,8 +4177,13 @@ SWIGEXPORT(void,initmiscc)() { SWIG_RegisterMapping("_long","_unsigned_long",0); SWIG_RegisterMapping("_long","_signed_long",0); SWIG_RegisterMapping("_class_wxAcceleratorTable","_wxAcceleratorTable",0); + SWIG_RegisterMapping("_size_t","_unsigned_int",0); + SWIG_RegisterMapping("_size_t","_int",0); + SWIG_RegisterMapping("_size_t","_wxWindowID",0); + SWIG_RegisterMapping("_size_t","_uint",0); SWIG_RegisterMapping("_class_wxRealPoint","_wxRealPoint",0); SWIG_RegisterMapping("_class_wxToolTip","_wxToolTip",0); + SWIG_RegisterMapping("_uint","_size_t",0); SWIG_RegisterMapping("_uint","_unsigned_int",0); SWIG_RegisterMapping("_uint","_int",0); SWIG_RegisterMapping("_uint","_wxWindowID",0); @@ -4209,17 +4214,20 @@ SWIGEXPORT(void,initmiscc)() { SWIG_RegisterMapping("_signed_short","_short",0); SWIG_RegisterMapping("_class_wxAcceleratorEntry","_wxAcceleratorEntry",0); SWIG_RegisterMapping("_unsigned_char","_byte",0); + SWIG_RegisterMapping("_unsigned_int","_size_t",0); SWIG_RegisterMapping("_unsigned_int","_uint",0); SWIG_RegisterMapping("_unsigned_int","_wxWindowID",0); SWIG_RegisterMapping("_unsigned_int","_int",0); SWIG_RegisterMapping("_short","_WXTYPE",0); SWIG_RegisterMapping("_short","_unsigned_short",0); SWIG_RegisterMapping("_short","_signed_short",0); + SWIG_RegisterMapping("_wxWindowID","_size_t",0); SWIG_RegisterMapping("_wxWindowID","_EBool",0); SWIG_RegisterMapping("_wxWindowID","_uint",0); SWIG_RegisterMapping("_wxWindowID","_int",0); SWIG_RegisterMapping("_wxWindowID","_signed_int",0); SWIG_RegisterMapping("_wxWindowID","_unsigned_int",0); + SWIG_RegisterMapping("_int","_size_t",0); SWIG_RegisterMapping("_int","_EBool",0); SWIG_RegisterMapping("_int","_uint",0); SWIG_RegisterMapping("_int","_wxWindowID",0); diff --git a/utils/wxPython/src/gtk/stattool.cpp b/utils/wxPython/src/gtk/stattool.cpp index 74d1285d35..bb4d2e58df 100644 --- a/utils/wxPython/src/gtk/stattool.cpp +++ b/utils/wxPython/src/gtk/stattool.cpp @@ -1957,6 +1957,10 @@ SWIGEXPORT(void,initstattoolc)() { SWIG_RegisterMapping("_class_wxGauge","_wxGauge",0); SWIG_RegisterMapping("_wxDC","_class_wxDC",0); SWIG_RegisterMapping("_wxSpinEvent","_class_wxSpinEvent",0); + SWIG_RegisterMapping("_size_t","_unsigned_int",0); + SWIG_RegisterMapping("_size_t","_int",0); + SWIG_RegisterMapping("_size_t","_wxWindowID",0); + SWIG_RegisterMapping("_size_t","_uint",0); SWIG_RegisterMapping("_class_wxRealPoint","_wxRealPoint",0); SWIG_RegisterMapping("_class_wxMenuItem","_wxMenuItem",0); SWIG_RegisterMapping("_class_wxPaintEvent","_wxPaintEvent",0); @@ -1978,6 +1982,7 @@ SWIGEXPORT(void,initstattoolc)() { SWIG_RegisterMapping("_wxToolBar","_class_wxToolBar",0); SWIG_RegisterMapping("_wxBrush","_class_wxBrush",0); SWIG_RegisterMapping("_wxShowEvent","_class_wxShowEvent",0); + SWIG_RegisterMapping("_uint","_size_t",0); SWIG_RegisterMapping("_uint","_unsigned_int",0); SWIG_RegisterMapping("_uint","_int",0); SWIG_RegisterMapping("_uint","_wxWindowID",0); @@ -2070,6 +2075,7 @@ SWIGEXPORT(void,initstattoolc)() { SWIG_RegisterMapping("_wxControl","_wxToolBar",SwigwxToolBarTowxControl); SWIG_RegisterMapping("_wxControl","_class_wxControl",0); SWIG_RegisterMapping("_class_wxListBox","_wxListBox",0); + SWIG_RegisterMapping("_unsigned_int","_size_t",0); SWIG_RegisterMapping("_unsigned_int","_uint",0); SWIG_RegisterMapping("_unsigned_int","_wxWindowID",0); SWIG_RegisterMapping("_unsigned_int","_int",0); @@ -2087,11 +2093,13 @@ SWIGEXPORT(void,initstattoolc)() { SWIG_RegisterMapping("_class_wxSlider","_wxSlider",0); SWIG_RegisterMapping("_class_wxImageList","_wxImageList",0); SWIG_RegisterMapping("_class_wxBitmapButton","_wxBitmapButton",0); + SWIG_RegisterMapping("_wxWindowID","_size_t",0); SWIG_RegisterMapping("_wxWindowID","_EBool",0); SWIG_RegisterMapping("_wxWindowID","_uint",0); SWIG_RegisterMapping("_wxWindowID","_int",0); SWIG_RegisterMapping("_wxWindowID","_signed_int",0); SWIG_RegisterMapping("_wxWindowID","_unsigned_int",0); + SWIG_RegisterMapping("_int","_size_t",0); SWIG_RegisterMapping("_int","_EBool",0); SWIG_RegisterMapping("_int","_uint",0); SWIG_RegisterMapping("_int","_wxWindowID",0); diff --git a/utils/wxPython/src/gtk/windows.cpp b/utils/wxPython/src/gtk/windows.cpp index ce5b45d9aa..5f2c7c73c0 100644 --- a/utils/wxPython/src/gtk/windows.cpp +++ b/utils/wxPython/src/gtk/windows.cpp @@ -5276,6 +5276,10 @@ SWIGEXPORT(void,initwindowsc)() { SWIG_RegisterMapping("_wxImageList","_class_wxImageList",0); SWIG_RegisterMapping("_class_wxAcceleratorTable","_wxAcceleratorTable",0); SWIG_RegisterMapping("_wxDC","_class_wxDC",0); + SWIG_RegisterMapping("_size_t","_unsigned_int",0); + SWIG_RegisterMapping("_size_t","_int",0); + SWIG_RegisterMapping("_size_t","_wxWindowID",0); + SWIG_RegisterMapping("_size_t","_uint",0); SWIG_RegisterMapping("_class_wxRealPoint","_wxRealPoint",0); SWIG_RegisterMapping("_class_wxMenuItem","_wxMenuItem",0); SWIG_RegisterMapping("_class_wxPostScriptDC","_wxPostScriptDC",0); @@ -5287,6 +5291,7 @@ SWIGEXPORT(void,initwindowsc)() { SWIG_RegisterMapping("_wxColour","_class_wxColour",0); SWIG_RegisterMapping("_class_wxDialog","_wxDialog",0); SWIG_RegisterMapping("_wxBrush","_class_wxBrush",0); + SWIG_RegisterMapping("_uint","_size_t",0); SWIG_RegisterMapping("_uint","_unsigned_int",0); SWIG_RegisterMapping("_uint","_int",0); SWIG_RegisterMapping("_uint","_wxWindowID",0); @@ -5348,6 +5353,7 @@ SWIGEXPORT(void,initwindowsc)() { SWIG_RegisterMapping("_class_wxMenu","_class_wxPyMenu",SwigwxPyMenuTowxMenu); SWIG_RegisterMapping("_class_wxMenu","_wxPyMenu",SwigwxPyMenuTowxMenu); SWIG_RegisterMapping("_class_wxMenu","_wxMenu",0); + SWIG_RegisterMapping("_unsigned_int","_size_t",0); SWIG_RegisterMapping("_unsigned_int","_uint",0); SWIG_RegisterMapping("_unsigned_int","_wxWindowID",0); SWIG_RegisterMapping("_unsigned_int","_int",0); @@ -5359,11 +5365,13 @@ SWIGEXPORT(void,initwindowsc)() { SWIG_RegisterMapping("_short","_unsigned_short",0); SWIG_RegisterMapping("_short","_signed_short",0); SWIG_RegisterMapping("_class_wxImageList","_wxImageList",0); + SWIG_RegisterMapping("_wxWindowID","_size_t",0); SWIG_RegisterMapping("_wxWindowID","_EBool",0); SWIG_RegisterMapping("_wxWindowID","_uint",0); SWIG_RegisterMapping("_wxWindowID","_int",0); SWIG_RegisterMapping("_wxWindowID","_signed_int",0); SWIG_RegisterMapping("_wxWindowID","_unsigned_int",0); + SWIG_RegisterMapping("_int","_size_t",0); SWIG_RegisterMapping("_int","_EBool",0); SWIG_RegisterMapping("_int","_uint",0); SWIG_RegisterMapping("_int","_wxWindowID",0); diff --git a/utils/wxPython/src/gtk/windows2.cpp b/utils/wxPython/src/gtk/windows2.cpp index 8a02b4aa56..bb2304b467 100644 --- a/utils/wxPython/src/gtk/windows2.cpp +++ b/utils/wxPython/src/gtk/windows2.cpp @@ -4234,6 +4234,10 @@ SWIGEXPORT(void,initwindows2c)() { SWIG_RegisterMapping("_class_wxGauge","_wxGauge",0); SWIG_RegisterMapping("_wxDC","_class_wxDC",0); SWIG_RegisterMapping("_wxSpinEvent","_class_wxSpinEvent",0); + SWIG_RegisterMapping("_size_t","_unsigned_int",0); + SWIG_RegisterMapping("_size_t","_int",0); + SWIG_RegisterMapping("_size_t","_wxWindowID",0); + SWIG_RegisterMapping("_size_t","_uint",0); SWIG_RegisterMapping("_class_wxRealPoint","_wxRealPoint",0); SWIG_RegisterMapping("_class_wxMenuItem","_wxMenuItem",0); SWIG_RegisterMapping("_class_wxPaintEvent","_wxPaintEvent",0); @@ -4257,6 +4261,7 @@ SWIGEXPORT(void,initwindows2c)() { SWIG_RegisterMapping("_wxBrush","_class_wxBrush",0); SWIG_RegisterMapping("_class_wxNotebookEvent","_wxNotebookEvent",0); SWIG_RegisterMapping("_wxShowEvent","_class_wxShowEvent",0); + SWIG_RegisterMapping("_uint","_size_t",0); SWIG_RegisterMapping("_uint","_unsigned_int",0); SWIG_RegisterMapping("_uint","_int",0); SWIG_RegisterMapping("_uint","_wxWindowID",0); @@ -4359,6 +4364,7 @@ SWIGEXPORT(void,initwindows2c)() { SWIG_RegisterMapping("_wxControl","_wxNotebook",SwigwxNotebookTowxControl); SWIG_RegisterMapping("_wxControl","_class_wxControl",0); SWIG_RegisterMapping("_class_wxListBox","_wxListBox",0); + SWIG_RegisterMapping("_unsigned_int","_size_t",0); SWIG_RegisterMapping("_unsigned_int","_uint",0); SWIG_RegisterMapping("_unsigned_int","_wxWindowID",0); SWIG_RegisterMapping("_unsigned_int","_int",0); @@ -4377,11 +4383,13 @@ SWIGEXPORT(void,initwindows2c)() { SWIG_RegisterMapping("_class_wxImageList","_wxImageList",0); SWIG_RegisterMapping("_class_wxBitmapButton","_wxBitmapButton",0); SWIG_RegisterMapping("_class_wxNotebook","_wxNotebook",0); + SWIG_RegisterMapping("_wxWindowID","_size_t",0); SWIG_RegisterMapping("_wxWindowID","_EBool",0); SWIG_RegisterMapping("_wxWindowID","_uint",0); SWIG_RegisterMapping("_wxWindowID","_int",0); SWIG_RegisterMapping("_wxWindowID","_signed_int",0); SWIG_RegisterMapping("_wxWindowID","_unsigned_int",0); + SWIG_RegisterMapping("_int","_size_t",0); SWIG_RegisterMapping("_int","_EBool",0); SWIG_RegisterMapping("_int","_uint",0); SWIG_RegisterMapping("_int","_wxWindowID",0); diff --git a/utils/wxPython/src/gtk/windows3.cpp b/utils/wxPython/src/gtk/windows3.cpp index 8cd9312f17..28478c5940 100644 --- a/utils/wxPython/src/gtk/windows3.cpp +++ b/utils/wxPython/src/gtk/windows3.cpp @@ -1691,6 +1691,10 @@ SWIGEXPORT(void,initwindows3c)() { SWIG_RegisterMapping("_wxDC","_class_wxDC",0); SWIG_RegisterMapping("_wxSpinEvent","_class_wxSpinEvent",0); SWIG_RegisterMapping("_wxSashLayoutWindow","_class_wxSashLayoutWindow",0); + SWIG_RegisterMapping("_size_t","_unsigned_int",0); + SWIG_RegisterMapping("_size_t","_int",0); + SWIG_RegisterMapping("_size_t","_wxWindowID",0); + SWIG_RegisterMapping("_size_t","_uint",0); SWIG_RegisterMapping("_class_wxRealPoint","_wxRealPoint",0); SWIG_RegisterMapping("_class_wxMenuItem","_wxMenuItem",0); SWIG_RegisterMapping("_class_wxPaintEvent","_wxPaintEvent",0); @@ -1719,6 +1723,7 @@ SWIGEXPORT(void,initwindows3c)() { SWIG_RegisterMapping("_class_wxSashWindow","_wxSashLayoutWindow",SwigwxSashLayoutWindowTowxSashWindow); SWIG_RegisterMapping("_class_wxSashWindow","_wxSashWindow",0); SWIG_RegisterMapping("_wxShowEvent","_class_wxShowEvent",0); + SWIG_RegisterMapping("_uint","_size_t",0); SWIG_RegisterMapping("_uint","_unsigned_int",0); SWIG_RegisterMapping("_uint","_int",0); SWIG_RegisterMapping("_uint","_wxWindowID",0); @@ -1828,6 +1833,7 @@ SWIGEXPORT(void,initwindows3c)() { SWIG_RegisterMapping("_class_wxMenu","_wxMenu",0); SWIG_RegisterMapping("_wxControl","_class_wxControl",0); SWIG_RegisterMapping("_class_wxListBox","_wxListBox",0); + SWIG_RegisterMapping("_unsigned_int","_size_t",0); SWIG_RegisterMapping("_unsigned_int","_uint",0); SWIG_RegisterMapping("_unsigned_int","_wxWindowID",0); SWIG_RegisterMapping("_unsigned_int","_int",0); @@ -1850,11 +1856,13 @@ SWIGEXPORT(void,initwindows3c)() { SWIG_RegisterMapping("_class_wxBitmapButton","_wxBitmapButton",0); SWIG_RegisterMapping("_wxFrame","_class_wxFrame",0); SWIG_RegisterMapping("_class_wxNotebook","_wxNotebook",0); + SWIG_RegisterMapping("_wxWindowID","_size_t",0); SWIG_RegisterMapping("_wxWindowID","_EBool",0); SWIG_RegisterMapping("_wxWindowID","_uint",0); SWIG_RegisterMapping("_wxWindowID","_int",0); SWIG_RegisterMapping("_wxWindowID","_signed_int",0); SWIG_RegisterMapping("_wxWindowID","_unsigned_int",0); + SWIG_RegisterMapping("_int","_size_t",0); SWIG_RegisterMapping("_int","_EBool",0); SWIG_RegisterMapping("_int","_uint",0); SWIG_RegisterMapping("_int","_wxWindowID",0); diff --git a/utils/wxPython/src/gtk/wx.cpp b/utils/wxPython/src/gtk/wx.cpp index ec47e248b9..0d97dad234 100644 --- a/utils/wxPython/src/gtk/wx.cpp +++ b/utils/wxPython/src/gtk/wx.cpp @@ -33,9 +33,10 @@ * and things like that. * * $Log$ - * Revision 1.10 1999/05/01 04:41:07 RD - * wxPython 2.0b9, second phase (gtk) - * Added gobs of stuff, see wxPython/README.txt for details + * Revision 1.11 1999/05/04 00:25:56 RD + * Some slight cleanup and reorganization + * + * Added support for making RPM distribution * ************************************************************************/ @@ -1932,6 +1933,10 @@ SWIGEXPORT(void,initwxc)() { SWIG_RegisterMapping("_class_wxBMPHandler","_wxBMPHandler",0); SWIG_RegisterMapping("_wxSpinEvent","_class_wxSpinEvent",0); SWIG_RegisterMapping("_wxSashLayoutWindow","_class_wxSashLayoutWindow",0); + SWIG_RegisterMapping("_size_t","_unsigned_int",0); + SWIG_RegisterMapping("_size_t","_int",0); + SWIG_RegisterMapping("_size_t","_wxWindowID",0); + SWIG_RegisterMapping("_size_t","_uint",0); SWIG_RegisterMapping("_class_wxRealPoint","_wxRealPoint",0); SWIG_RegisterMapping("_class_wxMenuItem","_wxMenuItem",0); SWIG_RegisterMapping("_class_wxPaintEvent","_wxPaintEvent",0); @@ -1961,6 +1966,7 @@ SWIGEXPORT(void,initwxc)() { SWIG_RegisterMapping("_class_wxNotebookEvent","_wxNotebookEvent",0); SWIG_RegisterMapping("_class_wxSashWindow","_wxSashWindow",0); SWIG_RegisterMapping("_wxShowEvent","_class_wxShowEvent",0); + SWIG_RegisterMapping("_uint","_size_t",0); SWIG_RegisterMapping("_uint","_unsigned_int",0); SWIG_RegisterMapping("_uint","_int",0); SWIG_RegisterMapping("_uint","_wxWindowID",0); @@ -2076,6 +2082,7 @@ SWIGEXPORT(void,initwxc)() { SWIG_RegisterMapping("_class_wxMenu","_wxMenu",0); SWIG_RegisterMapping("_wxControl","_class_wxControl",0); SWIG_RegisterMapping("_class_wxListBox","_wxListBox",0); + SWIG_RegisterMapping("_unsigned_int","_size_t",0); SWIG_RegisterMapping("_unsigned_int","_uint",0); SWIG_RegisterMapping("_unsigned_int","_wxWindowID",0); SWIG_RegisterMapping("_unsigned_int","_int",0); @@ -2101,11 +2108,13 @@ SWIGEXPORT(void,initwxc)() { SWIG_RegisterMapping("_wxFrame","_class_wxFrame",0); SWIG_RegisterMapping("_class_wxNotebook","_wxNotebook",0); SWIG_RegisterMapping("_wxJPEGHandler","_class_wxJPEGHandler",0); + SWIG_RegisterMapping("_wxWindowID","_size_t",0); SWIG_RegisterMapping("_wxWindowID","_EBool",0); SWIG_RegisterMapping("_wxWindowID","_uint",0); SWIG_RegisterMapping("_wxWindowID","_int",0); SWIG_RegisterMapping("_wxWindowID","_signed_int",0); SWIG_RegisterMapping("_wxWindowID","_unsigned_int",0); + SWIG_RegisterMapping("_int","_size_t",0); SWIG_RegisterMapping("_int","_EBool",0); SWIG_RegisterMapping("_int","_uint",0); SWIG_RegisterMapping("_int","_wxWindowID",0); diff --git a/utils/wxPython/src/gtk/wx.py b/utils/wxPython/src/gtk/wx.py index def69b42cf..341541cca7 100644 --- a/utils/wxPython/src/gtk/wx.py +++ b/utils/wxPython/src/gtk/wx.py @@ -1318,9 +1318,10 @@ class wxApp(wxPyApp): #---------------------------------------------------------------------------- # # $Log$ -# Revision 1.9 1999/05/01 04:41:08 RD -# wxPython 2.0b9, second phase (gtk) -# Added gobs of stuff, see wxPython/README.txt for details +# Revision 1.10 1999/05/04 00:25:56 RD +# Some slight cleanup and reorganization +# +# Added support for making RPM distribution # # Revision 1.12 1999/04/30 03:29:18 RD # -- 2.45.2