Added wxWindow_FromHWND(hWnd) for wxMSW to construct a wxWindow from a

window handle.  If you can get the window handle into the python code,
it should just work...  More news on this later.

Added wxImageList, wxToolTip.

Re-enabled wxConfig.DeleteAll() since it is reportedly fixed for the
wxRegConfig class.

As usual, some bug fixes, tweaks, etc.

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

diff --git a/utils/wxPython/README.txt b/utils/wxPython/README.txt
index a43350f9a7ed6c2c5c60243e6a19684ce4810951..bd752eb529b7a08215fd7182c8b31cc541f09e81 100644 (file)
--- a/utils/wxPython/README.txt
+++ b/utils/wxPython/README.txt
@@ -35,11 +35,48 @@ working the same as described in the wxWindows documents the best
 thing to do is to scan through the wxPython sources, especially the .i
 files, as that is where the interfaces for wxPython are defined.
 
 thing to do is to scan through the wxPython sources, especially the .i
 files, as that is where the interfaces for wxPython are defined.
 

-Currently this extension module is designed such that the entire
-application will be written in Python.  I havn't tried it yet, but I
-am sure that attempting to embed wxPython in a C++ wxWindows
-application will cause problems.  However there is a plan to support
-this in the future.
+I have reports of successfully embedding wxPython within a wxWindows
+C++ app on GTK.  It hasn't yet been attempted on MSW (to my knowledge)
+so I don't know how successful such an attempt would be.  However it
+is certainly possible.
+
+
+
+Getting Help
+------------
+
+Since wxPython is a blending of multiple technologies, help comes from
+multiple sources.  See the http://alldunn.com/wxPython for details on
+various sources of help, but probably the best source is the
+wxPython-users mail list.  You can view the archive or subscribe by
+going to
+
+       http://starship.python.net/mailman/listinfo/wxpython-users
+
+Or you can send mail directly to the list using this address:
+
+       wxpython-users@starship.python.net
+
+
+
+
+What's new in 2.0b5
+-------------------
+Well obviously the numbering scheme has changed.  I did this to
+reflect the fact that this truly is the second major revision of
+wxPython, (well the third actually if you count the one I did for
+wxWindows 1.68 and then threw away...) and also that it is associated
+with the 2.0 version of wxWindows.
+
+I have finally started documenting wxPython.  There are several pages
+in the wxWindows documentation tree specifically about wxPython, and I
+have added notes within the class references about where wxPython
+diverges from wxWindows.
+
+[[  What else have I done??? ]]
+
+As usual, some bug fixes, tweaks, etc.
+

 
 
 What's new in 0.5.3
 
 
 What's new in 0.5.3

diff --git a/utils/wxPython/TODO.txt b/utils/wxPython/TODO.txt
deleted file mode 100644 (file)
index e0cd903..0000000
--- a/utils/wxPython/TODO.txt
+++ /dev/null
@@ -1,43 +0,0 @@
-wxPython TODO List
-------------------
-
-These are the major tasks to be done on wxPython:
-
-1. Get it working for wxGTK.
-
-2. Figure out how to do embedding of wxPython in a wxWindows C++
-   application.
-
-    Actually, now that I think about it it might actually work.  We
-    just need to move some of the wxWindows initialization stuff out
-    of wxpcinit, ensure that __wxStart is not called and that a wxApp
-    is not created.  So this task becomes: Create a test case for
-    embedding wxPython in a C++ app.  Should also create some helper
-    functions for passing window objects into the Python code, etc.
-
-    Test this with M.
-
-
-3. Add significantly to the tests.
-
-4. Derived Python classes should have the ability to call the standard
-   On** methods in the base class.
-
-5. There are some virtual On** and other methods in wxWindows that
-   should end up being callbacks in derived python classes, but they
-   are not called via the standard event system.  Is there any way to
-   hook into these and call Python methods (if they exist in the
-   derived class) without having to derive a specialized C++ class?
-
-6. Add the Doc/View related classes
-
-7. Add the Printing related classes
-
-8. Document the differences (method signatures, new methods to
-   compensate for no overloading, etc.) between wxPython and wxWindows.
-
-9. Create some larger-scale sample application with wxPython to show
-   it can be done and the simplicity that it will provide...  Test
-   distribution with Freeze.
-
-

diff --git a/utils/wxPython/distrib/SelfInst-README.txt b/utils/wxPython/distrib/SelfInst-README.txt
new file mode 100644 (file)
index 0000000..5ec99b9
--- /dev/null
+++ b/utils/wxPython/distrib/SelfInst-README.txt
@@ -0,0 +1,135 @@
+wxPython README
+---------------
+
+Welcome to the wonderful world of wxPython!
+
+Now that you have installed the Win32 extension module, you can try it
+out by going to the [install dir]\wxPython\demo directory and typing:
+
+    python test1.py
+
+There are also some other sample files there for you to play with and
+learn from.
+
+If you selected to install the documentation then point your browser
+to [install dir]\wxPython\docs\index.htm and you will then be looking
+at the docs for wxWindows.  For the most part you can use the C++ docs
+as most classes and methods are used identically.  Where there are
+differences they are documented with a "wxPython Note."
+
+
+
+Getting Help
+------------
+
+Since wxPython is a blending of multiple technologies, help comes from
+multiple sources.  See the http://alldunn.com/wxPython for details on
+various sources of help, but probably the best source is the
+wxPython-users mail list.  You can view the archive or subscribe by
+going to
+
+       http://starship.python.net/mailman/listinfo/wxpython-users
+
+Or you can send mail directly to the list using this address:
+
+       wxpython-users@starship.python.net
+
+
+
+
+What's new in 2.0b5
+-------------------
+Well obviously the numbering scheme has changed.  I did this to
+reflect the fact that this truly is the second major revision of
+wxPython, (well the third actually if you count the one I did for
+wxWindows 1.68 and then threw away...) and also that it is associated
+with the 2.0 version of wxWindows.
+
+I have finally started documenting wxPython.  There are several pages
+in the wxWindows documentation tree specifically about wxPython, and I
+have added notes within the class references about where and how wxPython
+diverges from wxWindows.
+
+Added wxWindow_FromHWND(hWnd) for wxMSW to construct a wxWindow from a
+window handle.  If you can get the window handle into the python code,
+it should just work...  More news on this later.
+
+Added wxImageList, wxToolTip.
+
+Re-enabled wxConfig.DeleteAll() since it is reportedly fixed for the
+wxRegConfig class.
+
+As usual, some bug fixes, tweaks, etc.
+
+
+
+What's new in 0.5.3
+-------------------
+Added wxSashWindow, wxSashEvent, wxLayoutAlgorithm, etc.
+
+Various cleanup, tweaks, minor additions, etc. to maintain
+compatibility with the current wxWindows.
+
+
+
+What's new in 0.5.0
+-------------------
+Changed the import semantics from "from wxPython import *" to "from
+wxPython.wx import *"  This is for people who are worried about
+namespace pollution, they can use "from wxPython import wx" and then
+prefix all the wxPython identifiers with "wx."
+
+Added wxTaskbarIcon for wxMSW.
+
+Made the events work for wxGrid.
+
+Added wxConfig.
+
+Added wxMiniFrame for wxGTK.
+
+Changed many of the args and return values that were pointers to gdi
+objects to references to reflect changes in the wxWindows API.
+
+Other assorted fixes and additions.
+
+
+
+
+What's new in 0.4.2
+-------------------
+
+wxPython on wxGTK works!!!  Both dynamic and static on Linux and
+static on Solaris have been tested.  Many thanks go to Harm
+<H.v.d.Heijden@phys.tue.nl> for his astute detective work on tracking
+down a nasty DECREF bug.  Okay so I have to confess that it was just a
+DSM (Dumb Stupid Mistake) on my part but it was nasty none the less
+because the behavior was so different on different platforms.
+
+
+The dynamicly loaded module on Solaris is still segfaulting, so it
+must have been a different issue all along...
+
+
+
+What's New in 0.4
+-----------------
+
+1. Worked on wxGTK compatibility.  It is partially working.  On a
+Solaris/Sparc box wxPython is working but only when it is statically
+linked with the Python interpreter.  When built as a dyamically loaded
+extension module, things start acting weirdly and it soon seg-faults.
+And on Linux both the statically linked and the dynamically linked
+version segfault shortly after starting up.
+
+2. Added Toolbar, StatusBar and SplitterWindow classes.
+
+3. Varioius bug fixes, enhancements, etc.
+
+
+
+----------------
+Robin Dunn
+robin@alldunn.com
+
+
+

diff --git a/utils/wxPython/distrib/wxPython.bmp b/utils/wxPython/distrib/wxPython.bmp
new file mode 100644 (file)
index 0000000..e66da76
Binary files /dev/null and b/utils/wxPython/distrib/wxPython.bmp differ

diff --git a/utils/wxPython/distrib/wxPython.rsp b/utils/wxPython/distrib/wxPython.rsp
index e713594679a3d3d4959b02e904b525afd6c5a121..0b8a5ee73fc05dd7aa341bb233d0cfdcf9f8bc75 100644 (file)
--- a/utils/wxPython/distrib/wxPython.rsp
+++ b/utils/wxPython/distrib/wxPython.rsp
@@ -1,11 +1,9 @@
-wxPython\*.pyd
-wxPython\*.pyc
-wxPython\*.pyo
-wxPython\*.py

 wxPython\*.txt
 
 wxPython\tests\*.py
 wxPython\*.txt
 
 wxPython\tests\*.py

-wxPython\tests\bitmaps
+wxPython\tests\bitmaps\*.bmp
+wxPython\tests\bitmaps\*.ico
+

 
 
 wxPython\src\*.i
 
 
 wxPython\src\*.i


@@ -17,7 +15,7 @@ wxPython\src\*.def
 wxPython\src\*.rc
 wxPython\src\makefile.*
 wxPython\src\Makefile.pre.in
 wxPython\src\*.rc
 wxPython\src\makefile.*
 wxPython\src\Makefile.pre.in

-wxPython\src\Setup.in
+wxPython\src\Setup.*

 
 wxPython\src\msw\*.cpp
 wxPython\src\msw\*.h
 
 wxPython\src\msw\*.cpp
 wxPython\src\msw\*.h

diff --git a/utils/wxPython/distrib/wxPython.wse b/utils/wxPython/distrib/wxPython.wse
new file mode 100644 (file)
index 0000000..5b76837
--- /dev/null
+++ b/utils/wxPython/distrib/wxPython.wse
@@ -0,0 +1,1484 @@
+Document Type: WSE
+item: Global
+  Version=6.01
+  Title=wxPython 2.0 Installation
+  Flags=10010111
+  Languages=65 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+  Japanese Font Name=MS Gothic
+  Japanese Font Size=10
+  Progress Bar DLL=%_WISE_%\Progress\WIZ%_EXE_OS_TYPE_%.DLL
+  Start Gradient=128 128 255
+  End Gradient=64 0 128
+  Windows Flags=00000100000000010010110000001000
+  Log Pathname=%MAINDIR%\INSTALL.LOG
+  Message Font=MS Sans Serif
+  Font Size=8
+  Disk Filename=SETUP
+  Patch Flags=0000000000001001
+  Patch Threshold=85
+  Patch Memory=4000
+  EXE Filename=wxPython-2.0b5.exe
+  FTP Cluster Size=20
+  Per-User Version ID=1
+  Dialogs Version=6
+  Variable Name1=_SYS_
+  Variable Default1=C:\WINNT\System32
+  Variable Flags1=00001000
+  Variable Name2=_WISE_
+  Variable Default2=E:\Tools\Wise
+  Variable Flags2=00001000
+  Variable Name3=_ODBC16_
+  Variable Default3=C:\WINNT\System32
+  Variable Flags3=00001000
+  Variable Name4=_ODBC32_
+  Variable Default4=C:\WINNT\System32
+  Variable Flags4=00001000
+  Variable Name5=_ALIASNAME_
+  Variable Flags5=00001000
+  Variable Name6=_ALIASPATH_
+  Variable Flags6=00001000
+  Variable Name7=_ALIASTYPE_
+  Variable Flags7=00001000
+end
+item: Open/Close INSTALL.LOG
+  Flags=00000001
+end
+item: Check if File/Dir Exists
+  Pathname=%SYS%
+  Flags=10000100
+end
+item: Set Variable
+  Variable=SYS
+  Value=%WIN%
+end
+item: End Block
+end
+item: Set Variable
+  Variable=APPTITLE
+  Value=wxPython 2.0
+  Flags=10000000
+end
+item: Set Variable
+  Variable=GROUP
+  Flags=10000000
+end
+item: Set Variable
+  Variable=DISABLED
+  Value=!
+end
+item: Set Variable
+  Variable=MAINDIR
+  Value=wxPython
+  Flags=10000000
+end
+item: Check Configuration
+  Flags=10111011
+end
+item: Get Registry Key Value
+  Variable=PYTHONVER
+  Key=SOFTWARE\Python\PythonCore\CurrentVersion
+  Default=None
+  Flags=00000100
+end
+item: If/While Statement
+  Variable=PYTHONVER
+  Value=None
+end
+item: Display Message
+  Title=Installation Error
+  Text=Existing Python installation was not found, wxPython installation can not proceed.  Please download and install the Python core interpreter and library (version 1.5.1 or greater) from http://www.python.org/download/
+  Flags=00001000
+end
+item: Exit Installation
+end
+item: End Block
+end
+item: Get Registry Key Value
+  Variable=PYTHONDIR
+  Key=SOFTWARE\Python\PythonCore\%PYTHONVER%\InstallPath
+  Flags=00000100
+end
+item: Set Variable
+  Variable=MAINDIR
+  Value=%PYTHONDIR%
+end
+item: Set Variable
+  Variable=EXPLORER
+  Value=1
+end
+item: Get Registry Key Value
+  Variable=COMMON
+  Key=SOFTWARE\Microsoft\Windows\CurrentVersion
+  Default=C:\Program Files\Common Files
+  Value Name=CommonFilesDir
+  Flags=00000100
+end
+item: Get Registry Key Value
+  Variable=PROGRAM_FILES
+  Key=SOFTWARE\Microsoft\Windows\CurrentVersion
+  Default=C:\Program Files
+  Value Name=ProgramFilesDir
+  Flags=00000100
+end
+item: Else Statement
+end
+item: Set Variable
+  Variable=MAINDIR
+  Value=C:\%MAINDIR%
+end
+item: End Block
+end
+item: Set Variable
+  Variable=BACKUP
+  Value=%MAINDIR%\wxPython\BACKUP
+  Flags=10000000
+end
+item: Set Variable
+  Variable=DOBACKUP
+  Value=B
+  Flags=10000000
+end
+item: Set Variable
+  Variable=COMPONENTS
+  Value=A
+  Flags=10000000
+end
+item: Set Variable
+  Variable=BRANDING
+  Value=0
+end
+item: If/While Statement
+  Variable=BRANDING
+  Value=1
+end
+item: Read INI Value
+  Variable=NAME
+  Pathname=%INST%\CUSTDATA.INI
+  Section=Registration
+  Item=Name
+end
+item: Read INI Value
+  Variable=COMPANY
+  Pathname=%INST%\CUSTDATA.INI
+  Section=Registration
+  Item=Company
+end
+item: If/While Statement
+  Variable=NAME
+end
+item: Set Variable
+  Variable=DOBRAND
+  Value=1
+end
+item: End Block
+end
+item: End Block
+end
+item: Display Graphic
+  Pathname=e:\Projects\wxPython\distrib\wxPython.BMP
+  X Position=32784
+  Y Position=16
+  Flags=0000001010000000
+end
+item: Wizard Block
+  Direction Variable=DIRECTION
+  Display Variable=DISPLAY
+  Bitmap Pathname=%_WISE_%\DIALOGS\TEMPLATE\WIZARD.BMP
+  X Position=9
+  Y Position=10
+  Filler Color=8421440
+  Dialog=Select Program Manager Group
+  Dialog=Select Backup Directory
+  Dialog=Display Registration Information
+  Dialog=Get Registration Information
+  Variable=EXPLORER
+  Variable=DOBACKUP
+  Variable=DOBRAND
+  Variable=DOBRAND
+  Value=1
+  Value=A
+  Value=1
+  Value=1
+  Compare=0
+  Compare=1
+  Compare=0
+  Compare=1
+  Flags=00000011
+end
+item: Custom Dialog Set
+  Name=Welcome
+  Display Variable=DISPLAY
+  item: Dialog
+    Title=Welcome
+    Title French=Bienvenue
+    Title German=Willkommen
+    Title Portuguese=Bem-vindo 
+    Title Spanish=Bienvenido
+    Title Italian=Benvenuto
+    Title Danish=Velkommen
+    Title Dutch=Welkom
+    Title Norwegian=Velkommen
+    Title Swedish=Välkommen
+    Width=280
+    Height=224
+    Font Name=Helv
+    Font Size=8
+    item: Push Button
+      Rectangle=172 185 214 199
+      Variable=DIRECTION
+      Value=N
+      Create Flags=01010000000000010000000000000001
+      Text=&Next >
+      Text French=&Suivant>
+      Text German=&Weiter>
+      Text Portuguese=&Próximo>
+      Text Spanish=&Siguiente >
+      Text Italian=&Avanti >
+      Text Danish=&Næste>
+      Text Dutch=&Volgende>
+      Text Norwegian=&Neste>
+      Text Swedish=&Nästa >
+    end
+    item: Push Button
+      Rectangle=222 185 264 199
+      Action=3
+      Create Flags=01010000000000010000000000000000
+      Text=Cancel
+      Text French=Annuler
+      Text German=Abbrechen
+      Text Portuguese=Cancelar
+      Text Spanish=Cancelar
+      Text Italian=Annulla
+      Text Danish=Annuller
+      Text Dutch=Annuleren
+      Text Norwegian=Avbryt
+      Text Swedish=Avbryt
+    end
+    item: Static
+      Rectangle=9 177 263 178
+      Action=3
+      Create Flags=01010000000000000000000000000111
+    end
+    item: Static
+      Rectangle=83 8 121 33
+      Action=2
+      Enabled Color=00000000000000001111111111111111
+      Create Flags=01010000000000000000000000001011
+      Pathname=%_WISE_%\dialogs\template\install.grf
+      Pathname French=%_WISE_%\dialogs\template\install.grf
+      Pathname German=%_WISE_%\dialogs\template\install.grf
+      Pathname Portuguese=%_WISE_%\dialogs\template\install.grf
+      Pathname Spanish=%_WISE_%\dialogs\template\install.grf
+      Pathname Italian=%_WISE_%\dialogs\template\install.grf
+      Pathname Danish=%_WISE_%\dialogs\template\install.grf
+      Pathname Dutch=%_WISE_%\dialogs\template\install.grf
+      Pathname Norwegian=%_WISE_%\dialogs\template\install.grf
+      Pathname Swedish=%_WISE_%\dialogs\template\install.grf
+    end
+    item: Static
+      Rectangle=121 10 258 44
+      Enabled Color=00000000000000001111111111111111
+      Create Flags=01010000000000000000000000000000
+      Text=Welcome to %APPTITLE% Setup program. This program will install %APPTITLE% on your computer.
+      Text French=Bienvenue sur le programme d'installation %APPTITLE%. Ce programme va installer %APPTITLE% sur votre ordinateur.
+      Text German=Willkommen im Installationsprogramm für %APPTITLE%. Dieses Programm installiert  %APPTITLE% auf Ihrem Computer.
+      Text Portuguese=Bem-vindo ao programa de configuração %APPTITLE%. Este programa instalará %APPTITLE% no seu computador
+      Text Spanish=Bienvenido al programa de Configuración %APPTITLE%. Este programa instalará %APPTITLE en su ordenador
+      Text Italian=Benvenuto nel programma di installazione di %APPTITLE%. Con questo programma puoi installare %APPTITLE% sul tuo computer.
+      Text Danish=Velkommen til %APPTITLE% installationsprogrammet. Dette program installerer %APPTITLE% på computeren.
+      Text Dutch=Welkom bij het %APPTITLE% installatieprogramma. Dit programma installeert %APPTITLE% op uw computer.
+      Text Norwegian=Velkommen til %APPTITLE% Oppsett-program. Dette programmet vil installere %APPTITLE% på datamaskinen din.
+      Text Swedish=Välkommen till installationsprogrammet för %APPTITLE%. Detta program installerar %APPTITLE% på din dator.
+    end
+    item: Static
+      Rectangle=90 45 260 175
+      Enabled Color=00000000000000001111111111111111
+      Create Flags=01010000000000000000000000000000
+      Text=It is strongly recommended that you exit all Windows programs before running this Setup Program.
+      Text=
+      Text=Click Cancel to quit Setup and close any programs you have running.  Click Next to continue with the Setup program .
+      Text=
+      Text=WARNING: This program is protected by copyright law and international treaties.
+      Text=
+      Text=Unauthorized reproduction or distribution of this program, or any portion of it, may result in severe civil and criminal penalties, and will be prosecuted to the maximum extent possible under law.
+      Text French=Il vous est fortement recommandé de fermer tous les programmes Windows avant d'exécuter le Programme d'Installation
+      Text French=
+      Text French=Cliquez sur Annuler pour quitter l'Installation et fermez tous les programmes actuellement utilisés. Cliquez sur Suivant pour continuer l'installation
+      Text French=
+      Text French=ATTENTION : Ce programme est protégé par la loi sur les droits d'exploitation et par les traités internationaux
+      Text French=
+      Text French=Toute reproduction ou distribution, même partielle, de ce programme qui n'aura pas reçu d'autorisation préalable fera l'objet de poursuites et sera sévèrement sanctionnée par le droit civil et pénal
+      Text German=Wir empfehlen nachdrücklich, vor Ausführen dieses Installationsprogramms alle Windows-Programme zu beenden. 
+      Text German=
+      Text German=Auf Abbrechen klicken, um die Installation zu beenden und alle laufenden Programme zu schließen. Auf Weiter klicken, um mit dem Installationsprogramm beginnen.
+      Text German=
+      Text German=WARNUNG: Dieses Programm ist urheberrechtlich sowie durch internationale Verträge geschützt. 
+      Text German=
+      Text German=Die unzulässige Vervielfältigung oder Verbreitung dieses Programms, ob ganz oder auszugsweise, kann schwere zivil- und strafrechtliche Konsequenzen nach sich ziehen und wird unter voller Ausschöpfung der Rechtsmittel geahndet.
+      Text Portuguese=Recomenda-se insistentemente que saia de todos os programas do Windows antes de executar este Programa de Configuração.
+      Text Portuguese=
+      Text Portuguese=Faça um clique sobre Cancelar para sair da Configuração e feche todos os programas que estiver a executar. Faça um clique sobre Próximo para continuar com o programa de configuração
+      Text Portuguese=
+      Text Portuguese=AVISO: Este programa está protegido pela lei de direitos do autor e tratados internacionais
+      Text Portuguese=
+      Text Portuguese=A reprodução e a distribuição sem autorização deste programa, ou qualquer parte dele, pode dar lugar à aplicação de severas sanções civis e criminais, e serão perseguidas à extensão máxima permitida pela lei.
+      Text Spanish=Se recomienda encarecidamente que salga de todos los programas Windows antes de ejecutar este programa de Configuración.
+      Text Spanish=
+      Text Spanish=Haga un clic en Cancelar para abandonar la Configuración y cerrar cualquier programa que haya estado ejecutando. Haga un clic en Siguiente para continuar con el programa de Configuración.
+      Text Spanish=
+      Text Spanish=AVISO: Este programa está protegido por las leyes de derechos de autor y tratados internacionales.
+      Text Spanish=
+      Text Spanish=La reproducción o distribución no autorizadas de este programa, o cualquier parte de él, podría dar como resultado rigurosas multas civiles y penales, y se entablará la máxima acción judicial que permita la ley.
+      Text Italian=Ti consigliamo di uscire da tutti i programmi Windows prima di eseguire questo programma di installazione.
+      Text Italian=
+      Text Italian=Fai clic su Annulla per uscire dal programma di installazione e chiudi tutti i programmi aperti. Fai clic su Avanti per continuare con il programma di Installazione.
+      Text Italian=
+      Text Italian=AVVERTENZA: Questo programma è protetto ai sensi delle norme di legge e delle convenzioni internazionali in materia di diritti di copyright.
+      Text Italian=
+      Text Italian=La riproduzione o la distribuzione totale o parziale non autorizzata di questo programma potrà essere soggetta a penalità civili e penali, e sarà punita con la massima severità possibile a norma di legge.
+      Text Danish=Det anbefales kraftigt at afslutte alle Windows programmer, inden man kører dette installationsprogram.
+      Text Danish=
+      Text Danish=Klik på Annuller for at forlade installationsprogrammet og lukke alle igangværende programmer. Klik på Næste for at fortsætte med installationsprogrammet.
+      Text Danish=
+      Text Danish=ADVARSEL: Dette program er beskyttet af copyright og internationale traktater. 
+      Text Danish=
+      Text Danish=Uautoriseret gengivelse eller videresalg af dette program eller dele heraf kan føre til streng civil- og/eller kriminel stra. Retsforfølgning heraf vil finde sted i det videste omfang der hjemles muligt.
+      Text Dutch=Het wordt aangeraden om alle Windows programma's af te sluiten voordat u met de installatie van dit programma begint.
+      Text Dutch=
+      Text Dutch=Klik op Annuleren om de installatie te verlaten en eventueel nog lopende programma's af te sluiten. Klik op Volgende om verder te gaan met het Installatieprogramma.
+      Text Dutch=
+      Text Dutch=WAARSCHUWING: dit computerprogramma is auteursrechtelijk beschermd.
+      Text Dutch=
+      Text Dutch=Onrechtmatige verveelvoudiging of distributie van dit programma of een gedeelte ervan is verboden en strafbaar en zal met alle beschikbare juridische middelen worden bestreden.
+      Text Norwegian=Det anbefales på det sterkeste at du avslutter alle Windows-programmer før du kjører dette Oppsett-programmet.
+      Text Norwegian=
+      Text Norwegian=Velg Avbryt for å avbryte Oppsett og lukk alle programmer som er i bruk. Velg Neste for å fortsette med Oppsett-programmet.
+      Text Norwegian=
+      Text Norwegian=ADVARSEL: Dette programmet er beskyttet i henhold til lover om opphavsrett og internasjonale konvensjoner.
+      Text Norwegian=
+      Text Norwegian=Uautorisert kopiering eller distribuering av dette programmet eller deler av det, vil resultere i alvorlig sivil og kriminell straff og vil føre til saksmål i høyest mulig utstrekning i henhold til loven. 
+      Text Swedish=Du tillråds bestämt att gå ur alla Windows-program innan du kör installationsprogrammet.
+      Text Swedish=
+      Text Swedish=Klicka på Avbryt för att gå ur installationsprogrammet och stäng eventuella program som du har laddade. Klicka på Nästa för att fortsätta med installationen.
+      Text Swedish=
+      Text Swedish=VARNING: Detta program är skyddat av upphovsrätten och internationella avtal.
+      Text Swedish=
+      Text Swedish=Om du utan tillstånd kopierar eller distribuerar detta program eller delar av det kan det bli allvarliga civilrättsliga och brottsrättliga straffpåföljder. Vi beivrar sådana överträdelser i den allra högsta utsträckning som lagen tillåter.
+    end
+  end
+end
+item: Custom Dialog Set
+  Name=Select Destination Directory
+  Display Variable=DISPLAY
+  item: Dialog
+    Title=Choose Destination Location
+    Title French=Choisissez la localisation de destination
+    Title German=Zielpfad wählen
+    Title Portuguese=Escolher Local de Destino
+    Title Spanish=Elegir una localización de destino
+    Title Italian=Scegli Posizione di Destinazione
+    Title Danish=Vælg destinationsmappe
+    Title Dutch=Kies doellocatie
+    Title Norwegian=Velg målplassering
+    Title Swedish=Välj ställe för installationen
+    Width=280
+    Height=224
+    Font Name=Helv
+    Font Size=8
+    item: Push Button
+      Rectangle=172 185 214 199
+      Variable=DIRECTION
+      Value=N
+      Create Flags=01010000000000010000000000000001
+      Text=&Next >
+      Text French=&Suivant>
+      Text German=&Weiter>
+      Text Portuguese=&Próximo>
+      Text Spanish=&Siguiente >
+      Text Italian=&Avanti >
+      Text Danish=&Næste>
+      Text Dutch=&Volgende>
+      Text Norwegian=&Neste>
+      Text Swedish=&Nästa >
+    end
+    item: Push Button
+      Rectangle=130 185 172 199
+      Variable=DIRECTION
+      Value=B
+      Create Flags=01010000000000010000000000000000
+      Flags=0000000000000001
+      Text=< &Back
+      Text French=<&Retour
+      Text German=<&Zurück
+      Text Portuguese=<&Retornar
+      Text Spanish=<&Retroceder
+      Text Italian=< &Indietro
+      Text Danish=<&Tilbage
+      Text Dutch=<&Terug
+      Text Norwegian=<&Tilbake
+      Text Swedish=< &Tillbaka
+    end
+    item: Push Button
+      Rectangle=222 185 264 199
+      Action=3
+      Create Flags=01010000000000010000000000000000
+      Text=Cancel
+      Text French=Annuler
+      Text German=Abbrechen
+      Text Portuguese=Cancelar
+      Text Spanish=Cancelar
+      Text Italian=Annulla
+      Text Danish=Annuller
+      Text Dutch=Annuleren
+      Text Norwegian=Avbryt
+      Text Swedish=Avbryt
+    end
+    item: Static
+      Rectangle=9 177 263 178
+      Action=3
+      Create Flags=01010000000000000000000000000111
+    end
+    item: Static
+      Rectangle=89 10 260 74
+      Create Flags=01010000000000000000000000000000
+      Text=Setup will install %APPTITLE% in the following folder.
+      Text=
+      Text=To install into a different folder, click Browse, and select another folder. 
+      Text=
+      Text=You can choose not to install %APPTITLE% by clicking Cancel to exit Setup.
+      Text French=%APPTITLE% va être installé dans le répertoire ci-dessous
+      Text French=
+      Text French=Pour l'installer dans un répertoire différent, cliquez sur Parcourir et sélectionnez un autre répertoire
+      Text French=
+      Text French=Vous pouvez choisir de ne pas installer %APPTITLE% en cliquant sur Annuler pour quitter l'Installation
+      Text German=Installation speichert %APPTITLE% im unten angegebenen Ordner:
+      Text German=
+      Text German=Zur Installation in einem anderen Ordner auf Blättern klicken und einen anderen Ordner wählen.
+      Text German=
+      Text German=Wenn Sie %APPTITLE% nicht installieren möchten, können Sie durch Klicken auf Abbrechen die Installation beenden.
+      Text Portuguese=Configuração instalará %APPTITLE% na seguinte pasta
+      Text Portuguese=
+      Text Portuguese=Para instalar numa pasta diferente, faça um clique sobre Procurar, e seleccione uma outra pasta.
+      Text Portuguese=
+      Text Portuguese=Pode escolher não instalar %APPTITLE% clicando no botão Cancelar para sair da Configuração
+      Text Spanish=El programa de Configuración instalará %APPTITLE% en la siguiente carpeta.
+      Text Spanish=
+      Text Spanish=Para instalar en una carpeta diferente, haga un clic en Visualizar, y seleccione otra carpeta.
+      Text Spanish=
+      Text Spanish=Puede elegir no instalar %APPTITLE% haciendo un clic en Cancelar para salir de Configuración.
+      Text Italian=Il programma di installazione installerà %APPTITLE% nella seguente cartella.
+      Text Italian=
+      Text Italian=Per effettuare l\92installazione in una cartella diversa, fai clic su Sfoglia, e scegli un\92altra cartella.
+      Text Italian=
+      Text Italian=Puoi scegliere di non installare %APPTITLE% facendo clic su Annulla per uscire dal programma di installazione
+      Text Danish=Installationsprogrammet installerer %APPTITLE% i denne mappe.
+      Text Danish=
+      Text Danish=Man installerer i en anden mappe ved at klikke på Browse og vælge en anden mappe.
+      Text Danish=
+      Text Danish=Man kan vælge ikke at installere %APPTITLE% ved at klikke på Slet og forlade installationsprogrammet.
+      Text Dutch=Het installatieprogramma installeert %APPTITLE% in de volgende directory.
+      Text Dutch=
+      Text Dutch=Als u het in een andere directory wilt installeren, klik dan op Bladeren en kies een andere locatie.
+      Text Dutch=
+      Text Dutch=U kunt ervoor kiezen om %APPTITLE% niet te installeren: klik op Annuleren om het installatieprogramma te verlaten.
+      Text Norwegian=Oppsett vil installere %APPTITLE% i følgende mappe.
+      Text Norwegian=
+      Text Norwegian=For å installere i en annen mappe, klikk Bla igjennom og velg en annen mappe.
+      Text Norwegian=
+      Text Norwegian=Du kan velge å ikke installere %APPTITLE% ved å velge Avbryt for å gå ut av Oppsett.
+      Text Swedish=Installationsprogrammet installerar %APPTITLE% i följande mapp.
+      Text Swedish=
+      Text Swedish=Om du vill att installationen ska göras i en annan mapp, klickar du på Bläddra och väljer en annan mapp.
+      Text Swedish=
+      Text Swedish=Du kan välja att inte installera %APPTITLE% genom att klicka på Avbryt för att lämna installationsprogrammet.
+    end
+    item: Static
+      Rectangle=90 134 260 162
+      Action=1
+      Create Flags=01010000000000000000000000000111
+      Text=Destination Folder
+      Text French=Répertoire de destination
+      Text German=Zielordner
+      Text Portuguese=Pasta de Destino
+      Text Spanish=Carpeta de Destino
+      Text Italian=Cartella di destinazione
+      Text Danish=Destinationsmappe
+      Text Dutch=Doeldirectory
+      Text Norwegian=Målmappe
+      Text Swedish=Destinationsmapp
+    end
+    item: Push Button
+      Rectangle=213 143 255 157
+      Variable=MAINDIR_SAVE
+      Value=%MAINDIR%
+      Destination Dialog=1
+      Action=2
+      Create Flags=01010000000000010000000000000000
+      Text=B&rowse...
+      Text French=P&arcourir
+      Text German=B&lättern...
+      Text Portuguese=P&rocurar
+      Text Spanish=V&isualizar...
+      Text Italian=Sfoglia...
+      Text Danish=&Gennemse...
+      Text Dutch=B&laderen...
+      Text Norwegian=Bla igjennom
+      Text Swedish=&Bläddra
+    end
+    item: Static
+      Rectangle=95 146 211 157
+      Destination Dialog=2
+      Create Flags=01010000000000000000000000000000
+      Text=%MAINDIR%
+      Text French=%MAINDIR%
+      Text German=%MAINDIR%
+      Text Portuguese=%MAINDIR%
+      Text Spanish=%MAINDIR%
+      Text Italian=%MAINDIR%
+      Text Danish=%MAINDIR%
+      Text Dutch=%MAINDIR%
+      Text Norwegian=%MAINDIR%
+      Text Swedish=%MAINDIR%
+    end
+    item: Static
+      Rectangle=94 81 138 96
+      Enabled Color=00000000000000001111111111111111
+      Create Flags=01010000000000000000000000000000
+      Flags=0000000000000001
+      Name=MS Sans Serif
+      Font Style=-11 0 0 0 700 0 0 0 0 1 2 1 34
+      Text=Please note:
+    end
+    item: Static
+      Rectangle=138 82 254 106
+      Enabled Color=00000000000000001111111111111111
+      Create Flags=01010000000000000000000000000000
+      Text=wxPython will be installed in a subdirectory of the path specfied below.
+    end
+    item: Static
+      Rectangle=91 74 259 113
+      Action=1
+      Enabled Color=00000000000000001111111111111111
+      Create Flags=01010000000000000000000000000111
+    end
+  end
+  item: Dialog
+    Title=Select Destination Directory
+    Title French=Choisissez le répertoire de destination
+    Title German=Zielverzeichnis wählen
+    Title Portuguese=Seleccionar Directório de Destino
+    Title Spanish=Seleccione el Directorio de Destino
+    Title Italian=Seleziona Directory di destinazione
+    Title Danish=Vælg Destinationsbibliotek
+    Title Dutch=Kies doeldirectory
+    Title Norwegian=Velg målkatalog
+    Title Swedish=Välj destinationskalatog
+    Width=221
+    Height=173
+    Font Name=Helv
+    Font Size=8
+    item: Listbox
+      Rectangle=5 2 160 149
+      Variable=MAINDIR
+      Create Flags=01010000100000010000000101000000
+      Flags=0000110000100010
+      Text=%MAINDIR%
+      Text French=%MAINDIR%
+      Text German=%MAINDIR%
+      Text Portuguese=%MAINDIR%
+      Text Spanish=%MAINDIR%
+      Text Italian=%MAINDIR%
+      Text Danish=%MAINDIR%
+      Text Dutch=%MAINDIR%
+      Text Norwegian=%MAINDIR%
+      Text Swedish=%MAINDIR%
+    end
+    item: Push Button
+      Rectangle=167 6 212 21
+      Create Flags=01010000000000010000000000000001
+      Text=OK
+      Text French=OK
+      Text German=OK
+      Text Portuguese=OK
+      Text Spanish=ACEPTAR
+      Text Italian=OK
+      Text Danish=OK
+      Text Dutch=OK
+      Text Norwegian=OK
+      Text Swedish=OK
+    end
+    item: Push Button
+      Rectangle=167 25 212 40
+      Variable=MAINDIR
+      Value=%MAINDIR_SAVE%
+      Create Flags=01010000000000010000000000000000
+      Flags=0000000000000001
+      Text=Cancel
+      Text French=Annuler
+      Text German=Abbrechen 
+      Text Portuguese=Cancelar
+      Text Spanish=Cancelar
+      Text Italian=Annulla
+      Text Danish=Slet
+      Text Dutch=Annuleren
+      Text Norwegian=Avbryt
+      Text Swedish=Avbryt
+    end
+  end
+end
+item: Custom Dialog Set
+  Name=Select Components
+  Display Variable=DISPLAY
+  Flags=00000001
+  item: Dialog
+    Title=Select Components 
+    Title French=Sélectionner les éléments
+    Title German=Komponenten auswählen
+    Title Portuguese=Seleccionar Componentes
+    Title Spanish=Seleccione los Componentes
+    Title Italian=Seleziona Componenti
+    Title Danish=Vælg komponenter
+    Title Dutch=Selecteer onderdelen
+    Title Norwegian=Velg komponenter
+    Title Swedish=Välj komponenter
+    Width=280
+    Height=224
+    Font Name=Helv
+    Font Size=8
+    item: Push Button
+      Rectangle=172 185 214 199
+      Variable=DIRECTION
+      Value=N
+      Create Flags=01010000000000010000000000000001
+      Text=&Next >
+      Text French=&Suivant>
+      Text German=&Weiter>
+      Text Portuguese=&Próximo>
+      Text Spanish=&Siguiente >
+      Text Italian=&Avanti >
+      Text Danish=&Næste>
+      Text Dutch=&Volgende>
+      Text Norwegian=&Neste>
+      Text Swedish=&Nästa >
+    end
+    item: Push Button
+      Rectangle=130 185 172 199
+      Variable=DIRECTION
+      Value=B
+      Create Flags=01010000000000010000000000000000
+      Text=< &Back
+      Text French=<&Retour
+      Text German=<&Zurück
+      Text Portuguese=<&Retornar
+      Text Spanish=<&Retroceder
+      Text Italian=< &Indietro
+      Text Danish=<&Tilbage
+      Text Dutch=<&Terug
+      Text Norwegian=<&Tilbake
+      Text Swedish=< &Tillbaka
+    end
+    item: Push Button
+      Rectangle=222 185 264 199
+      Action=3
+      Create Flags=01010000000000010000000000000000
+      Text=Cancel
+      Text French=Annuler
+      Text German=Abbrechen
+      Text Portuguese=Cancelar
+      Text Spanish=Cancelar
+      Text Italian=Annulla
+      Text Danish=Annuller
+      Text Dutch=Annuleren
+      Text Norwegian=Avbryt
+      Text Swedish=Avbryt
+    end
+    item: Static
+      Rectangle=9 177 263 178
+      Action=3
+      Create Flags=01010000000000000000000000000111
+    end
+    item: Static
+      Rectangle=205 156 253 166
+      Variable=COMPONENTS
+      Value=MAINDIR
+      Create Flags=01010000000000000000000000000010
+    end
+    item: Static
+      Rectangle=205 148 253 157
+      Variable=COMPONENTS
+      Create Flags=01010000000000000000000000000010
+    end
+    item: Static
+      Rectangle=95 147 184 158
+      Create Flags=01010000000000000000000000000000
+      Text=Disk Space Required:
+      Text French=Espace disque requis
+      Text German=Benötigter Festplattenspeicher:
+      Text Portuguese=Espaço de disco necessário:
+      Text Spanish=Espacio de Disco Requerido:
+      Text Italian=Spazio su disco richiesto:
+      Text Danish=Nødvendig diskplads:
+      Text Dutch=Vereiste hoeveelheid schijfruimte
+      Text Norwegian=Diskplass nødvendig:
+      Text Swedish=Erforderligt diskutrymme
+    end
+    item: Static
+      Rectangle=95 157 190 167
+      Create Flags=01010000000000000000000000000000
+      Text=Disk Space Remaining:
+      Text French=Espace disque disponible
+      Text German=Verbleibender Festplattenspeicher:
+      Text Portuguese=Espaço de disco restante:
+      Text Spanish=Espacio de Disco Remanente:
+      Text Italian=Spazio su disco rimanente:
+      Text Danish=Ledig diskplads:
+      Text Dutch=Resterende schijfruimte
+      Text Norwegian=Ledig diskplass:
+      Text Swedish=Återstående diskutrymme
+    end
+    item: Static
+      Rectangle=90 138 264 168
+      Action=1
+      Create Flags=01010000000000000000000000000111
+    end
+    item: Static
+      Rectangle=90 8 260 41
+      Create Flags=01010000000000000000000000000000
+      Text=In the options list below, select the checkboxes for the options that you would like to have installed.  The disk space fields reflect the requirements of the options you have selected.
+      Text French=Dans la liste d'options suivante, veuillez sélectionner les cases des options que vous désirez installer. Le champ d'espace disque indique les conditions requises pour les options choisies
+      Text German=Wählen Sie in der Optionenliste unten die Kontrollkästchen für diejenigen Optionen, die Sie installieren möchten. Die Speicherfelder zeigen die benötigte Speicherkapazität für die gewählten Optionen an.
+      Text Portuguese=Na lista de opções abaixo, seleccione as caixas de verificação para as opções que gostaria de ter instalado. Os campos de espaço de disco reflectem os requerimentos das opções que seleccionou.
+      Text Spanish=En la lista de opciones que se ofrece a continuación, seleccione las casillas de comprobación para las opciones que desea instalar. Los campos del espacio en el disco reflejan los requerimientos de las opciones que ha seleccionado.
+      Text Italian=Nell\92elenco delle opzioni sotto, marca le caselle di controllo delle opzioni che vuoi installare. I campi dello spazio sul disco riflettono i requisiti delle opzioni selezionate.
+      Text Danish=Marker afkrydsningsfelterne for de komponenter, der skal installeres, på listen herunder. Diskpladsfelterne angiver pladskravene for de valgte komponenter.
+      Text Dutch=Kruis in de onderstaande lijst het vakje aan naast de opties die u wilt installeren. Achter elke optie staat de benodigde schijfruimte vermeld.
+      Text Norwegian=I listen over alternativer nedenfor, klikk i kontrollrutene for de alternativene du ønsker å installere. Diskplassfeltene gjenspeiler kravene for de alternativene du har valgt.
+      Text Swedish=Kryssa för i rutorna nedan vilka alternativ du vill få installerade. I diskutrymmesfälten anges utrymmesbehoven för de alternativ du väljer.
+    end
+    item: Listbox
+      Rectangle=90 42 263 133
+      Variable=COMPONENTS
+      Create Flags=01010000101000010000000101010001
+      Flags=0000010001000111
+      Text=wxPython package
+      Text=wxPython documentation
+      Text=
+      Text French=wxPython package
+      Text French=wxPython documentation
+      Text French=
+      Text German=wxPython package
+      Text German=wxPython documentation
+      Text German=
+      Text Portuguese=%1%
+      Text Portuguese=
+      Text Spanish=wxPython package
+      Text Spanish=wxPython documentation
+      Text Spanish=
+      Text Italian=wxPython package
+      Text Italian=wxPython documentation
+      Text Italian=
+      Text Danish=%1%
+      Text Danish=
+      Text Dutch=%1%
+      Text Dutch=
+      Text Norwegian=%1%
+      Text Norwegian=
+      Text Swedish=%1%
+      Text Swedish=
+    end
+  end
+end
+item: Custom Dialog Set
+  Name=Start Installation
+  Display Variable=DISPLAY
+  item: Dialog
+    Title=Start Installation
+    Title French=Commencer l'installation
+    Title German=Installation beginnen
+    Title Portuguese=Iniciar Instalação
+    Title Spanish=Comenzar la Instalación
+    Title Italian=Avvia Installazione
+    Title Danish=Start installationen
+    Title Dutch=Start de installatie
+    Title Norwegian=Start installeringen
+    Title Swedish=Starta installationen
+    Width=280
+    Height=224
+    Font Name=Helv
+    Font Size=8
+    item: Push Button
+      Rectangle=172 185 214 199
+      Variable=DIRECTION
+      Value=N
+      Create Flags=01010000000000010000000000000001
+      Text=&Next >
+      Text French=&Suivant>
+      Text German=&Weiter>
+      Text Portuguese=&Próximo>
+      Text Spanish=&Siguiente >
+      Text Italian=&Avanti >
+      Text Danish=&Næste>
+      Text Dutch=&Volgende>
+      Text Norwegian=&Neste>
+      Text Swedish=&Nästa >
+    end
+    item: Push Button
+      Rectangle=130 185 172 199
+      Variable=DIRECTION
+      Value=B
+      Create Flags=01010000000000010000000000000000
+      Text=< &Back
+      Text French=<&Retour
+      Text German=<&Zurück
+      Text Portuguese=<&Retornar
+      Text Spanish=<&Retroceder
+      Text Italian=< &Indietro
+      Text Danish=<&Tilbage
+      Text Dutch=<&Terug
+      Text Norwegian=<&Tilbake
+      Text Swedish=< &Tillbaka
+    end
+    item: Push Button
+      Rectangle=222 185 264 199
+      Action=3
+      Create Flags=01010000000000010000000000000000
+      Text=Cancel
+      Text French=Annuler
+      Text German=Abbrechen
+      Text Portuguese=Cancelar
+      Text Spanish=Cancelar
+      Text Italian=Annulla
+      Text Danish=Annuller
+      Text Dutch=Annuleren
+      Text Norwegian=Avbryt
+      Text Swedish=Avbryt
+    end
+    item: Static
+      Rectangle=9 177 263 178
+      Action=3
+      Create Flags=01010000000000000000000000000111
+    end
+    item: Static
+      Rectangle=90 10 260 70
+      Create Flags=01010000000000000000000000000000
+      Text=You are now ready to install %APPTITLE%.
+      Text=
+      Text=Press the Next button to begin the installation or the Back button to reenter the installation information.
+      Text French=Vous êtes maintenant prêt à installer %APPTITLE%
+      Text French=
+      Text French=Cliquez sur Suivant pour commencer l'installation ou Retour pour entrer à nouveau les informations d'installation
+      Text German=Sie sind jetzt zur Installation von %APPTITLE% bereit.
+      Text German=
+      Text German=Auf die Schaltfläche Weiter klicken, um mit dem Start der Installation zu beginnen, oder auf die Schaltfläche Zurück, um die Installationsinformationen nochmals aufzurufen.
+      Text Portuguese=Está agora pronto para instalar %APPTITLE%
+      Text Portuguese=
+      Text Portuguese=Pressione o botão Próximo para começar a instalação ou o botão Retornar para introduzir novamente a informação sobre a instalação
+      Text Spanish=Ahora estará listo para instalar %APPTITLE%.
+      Text Spanish=
+      Text Spanish=Pulse el botón de Siguiente para comenzar la instalación o el botón Retroceder para volver a introducir la información sobre la instalación.
+      Text Italian=Sei pronto ad installare %APPTITLE%.
+      Text Italian=
+      Text Italian=Premi il tasto Avanti per iniziare l\92installazione o il tasto Indietro per rientrare nuovamente nei dati sull\92installazione
+      Text Danish=Du er nu klar til at installere %APPTITLE%.
+      Text Danish=
+      Text Danish=Klik på Næste for at starte installationen eller på Tilbage for at ændre installationsoplysningerne.
+      Text Dutch=U bent nu klaar om %APPTITLE% te installeren.
+      Text Dutch=
+      Text Dutch=Druk op Volgende om met de installatie te beginnen of op Terug om de installatie-informatie opnieuw in te voeren.
+      Text Norwegian=Du er nå klar til å installere %APPTITLE%
+      Text Norwegian=
+      Text Norwegian=Trykk på Neste-tasten for å starte installeringen, eller Tilbake-tasten for å taste inn installasjonsinformasjonen på nytt.
+      Text Swedish=Du är nu redo att installera %APPTITLE%.
+      Text Swedish=
+      Text Swedish=Tryck på Nästa för att starta installationen eller på Tillbaka för att skriva in installationsinformationen på nytt.
+    end
+  end
+end
+item: If/While Statement
+  Variable=DISPLAY
+  Value=Select Destination Directory
+end
+item: Set Variable
+  Variable=BACKUP
+  Value=%MAINDIR%\wxPython\BACKUP
+end
+item: End Block
+end
+item: End Block
+end
+item: If/While Statement
+  Variable=DOBACKUP
+  Value=A
+end
+item: Set Variable
+  Variable=BACKUPDIR
+  Value=%BACKUP%
+end
+item: End Block
+end
+item: If/While Statement
+  Variable=BRANDING
+  Value=1
+end
+item: If/While Statement
+  Variable=DOBRAND
+  Value=1
+end
+item: Edit INI File
+  Pathname=%INST%\CUSTDATA.INI
+  Settings=[Registration]
+  Settings=NAME=%NAME%
+  Settings=COMPANY=%COMPANY%
+  Settings=
+end
+item: End Block
+end
+item: End Block
+end
+item: Remark
+end
+item: Set Variable
+  Variable=INST_LOG_PATH
+  Value=%MAINDIR%\wxPython\install.log
+end
+item: Open/Close INSTALL.LOG
+  Pathname=%INST_LOG_PATH%
+  Flags=00000010
+end
+item: Check Disk Space
+  Component=COMPONENTS
+end
+item: Remark
+end
+item: If/While Statement
+  Variable=COMPONENTS
+  Value=A
+  Flags=00001010
+end
+item: Install File
+  Source=e:\Projects\wx\lib\wx200.dll
+  Destination=%SYS%\wx200.dll
+  Flags=0000001010010010
+end
+item: Install File
+  Source=e:\Projects\wxPython\tests\bitmaps\tog1.bmp
+  Destination=%MAINDIR%\wxPython\demo\bitmaps\tog1.bmp
+  Flags=0000000010000010
+end
+item: Install File
+  Source=e:\Projects\wxPython\tests\bitmaps\test2.bmp
+  Destination=%MAINDIR%\wxPython\demo\bitmaps\test2.bmp
+  Flags=0000000010000010
+end
+item: Install File
+  Source=e:\Projects\wxPython\tests\bitmaps\tog2.bmp
+  Destination=%MAINDIR%\wxPython\demo\bitmaps\tog2.bmp
+  Flags=0000000010000010
+end
+item: Install File
+  Source=e:\Projects\wxPython\__init__.py
+  Destination=%MAINDIR%\wxPython\__init__.py
+  Flags=0000000010000010
+end
+item: Install File
+  Source=e:\Projects\wxPython\cmndlgs.py
+  Destination=%MAINDIR%\wxPython\cmndlgs.py
+  Flags=0000000010000010
+end
+item: Install File
+  Source=e:\Projects\wxPython\controls2.py
+  Destination=%MAINDIR%\wxPython\controls2.py
+  Flags=0000000010000010
+end
+item: Install File
+  Source=e:\Projects\wxPython\events.py
+  Destination=%MAINDIR%\wxPython\events.py
+  Flags=0000000010000010
+end
+item: Install File
+  Source=e:\Projects\wxPython\frames.py
+  Destination=%MAINDIR%\wxPython\frames.py
+  Flags=0000000010000010
+end
+item: Install File
+  Source=e:\Projects\wxPython\gdi.py
+  Destination=%MAINDIR%\wxPython\gdi.py
+  Flags=0000000010000010
+end
+item: Install File
+  Source=e:\Projects\wxPython\mdi.py
+  Destination=%MAINDIR%\wxPython\mdi.py
+  Flags=0000000010000010
+end
+item: Install File
+  Source=e:\Projects\wxPython\misc.py
+  Destination=%MAINDIR%\wxPython\misc.py
+  Flags=0000000010000010
+end
+item: Install File
+  Source=e:\Projects\wxPython\stattool.py
+  Destination=%MAINDIR%\wxPython\stattool.py
+  Flags=0000000010000010
+end
+item: Install File
+  Source=e:\Projects\wxPython\utils.py
+  Destination=%MAINDIR%\wxPython\utils.py
+  Flags=0000000010000010
+end
+item: Install File
+  Source=e:\Projects\wxPython\windows.py
+  Destination=%MAINDIR%\wxPython\windows.py
+  Flags=0000000010000010
+end
+item: Install File
+  Source=e:\Projects\wxPython\windows2.py
+  Destination=%MAINDIR%\wxPython\windows2.py
+  Flags=0000000010000010
+end
+item: Install File
+  Source=e:\Projects\wxPython\windows3.py
+  Destination=%MAINDIR%\wxPython\windows3.py
+  Flags=0000000010000010
+end
+item: Install File
+  Source=e:\Projects\wxPython\wx.py
+  Destination=%MAINDIR%\wxPython\wx.py
+  Flags=0000000010000010
+end
+item: Install File
+  Source=e:\Projects\wxPython\wxc.pyd
+  Destination=%MAINDIR%\wxPython\wxc.pyd
+  Flags=0000000010000010
+end
+item: Install File
+  Source=e:\Projects\wxPython\distrib\SelfInst-README.txt
+  Destination=%MAINDIR%\wxPython\README.txt
+  Flags=0000000010000010
+end
+item: Install File
+  Source=e:\Projects\wxPython\tests\test1.py
+  Destination=%MAINDIR%\wxPython\demo\test1.py
+  Flags=0000000010000010
+end
+item: Install File
+  Source=e:\Projects\wxPython\tests\test2.py
+  Destination=%MAINDIR%\wxPython\demo\test2.py
+  Flags=0000000010000010
+end
+item: Install File
+  Source=e:\Projects\wxPython\tests\test3.py
+  Destination=%MAINDIR%\wxPython\demo\test3.py
+  Flags=0000000010000010
+end
+item: Install File
+  Source=e:\Projects\wxPython\tests\test4.py
+  Destination=%MAINDIR%\wxPython\demo\test4.py
+  Flags=0000000010000010
+end
+item: Install File
+  Source=e:\Projects\wxPython\tests\test5.py
+  Destination=%MAINDIR%\wxPython\demo\test5.py
+  Flags=0000000010000010
+end
+item: Install File
+  Source=e:\Projects\wxPython\tests\test6.py
+  Destination=%MAINDIR%\wxPython\demo\test6.py
+  Flags=0000000010000010
+end
+item: Install File
+  Source=e:\Projects\wxPython\tests\test7.py
+  Destination=%MAINDIR%\wxPython\demo\test7.py
+  Flags=0000000010000010
+end
+item: Install File
+  Source=e:\Projects\wxPython\tests\wxSlash.py
+  Destination=%MAINDIR%\wxPython\demo\wxSlash.py
+  Flags=0000000010000010
+end
+item: Install File
+  Source=e:\Projects\wxPython\tests\bitmaps\copy.bmp
+  Destination=%MAINDIR%\wxPython\demo\bitmaps\copy.bmp
+  Flags=0000000010000010
+end
+item: Install File
+  Source=e:\Projects\wxPython\tests\bitmaps\mondrian.ico
+  Destination=%MAINDIR%\wxPython\demo\bitmaps\mondrian.ico
+  Flags=0000000010000010
+end
+item: Install File
+  Source=e:\Projects\wxPython\tests\bitmaps\new.bmp
+  Destination=%MAINDIR%\wxPython\demo\bitmaps\new.bmp
+  Flags=0000000010000010
+end
+item: Install File
+  Source=e:\Projects\wxPython\tests\bitmaps\open.bmp
+  Destination=%MAINDIR%\wxPython\demo\bitmaps\open.bmp
+  Flags=0000000010000010
+end
+item: Install File
+  Source=e:\Projects\wxPython\tests\bitmaps\paste.bmp
+  Destination=%MAINDIR%\wxPython\demo\bitmaps\paste.bmp
+  Flags=0000000010000010
+end
+item: Install File
+  Source=e:\Projects\wxPython\tests\bitmaps\smiles.ico
+  Destination=%MAINDIR%\wxPython\demo\bitmaps\smiles.ico
+  Flags=0000000010000010
+end
+item: Install File
+  Source=e:\Projects\wxPython\controls.py
+  Destination=%MAINDIR%\wxPython\controls.py
+  Flags=0000000010000010
+end
+item: End Block
+end
+item: Remark
+end
+item: If/While Statement
+  Variable=COMPONENTS
+  Value=B
+  Flags=00001010
+end
+item: Install File
+  Source=e:\projects\wx\docs\html\wx\*.*
+  Destination=%MAINDIR%\wxPython\docs
+  Flags=0000000010000010
+end
+item: Install File
+  Source=e:\projects\wx\docs\html\wx\wx.htm
+  Destination=%MAINDIR%\wxPython\docs\index.htm
+  Flags=0000000010000010
+end
+item: End Block
+end
+item: Remark
+end
+item: Remark
+  Text=     Install Support for uninstalling the application.
+end
+item: Set Variable
+  Variable=UNINSTALL_PATH
+  Value=%MAINDIR%\wxPython\UNWISE.EXE
+end
+item: Compiler Variable If
+  Variable=_EXE_OS_TYPE_
+  Value=WIN32
+end
+item: Install File
+  Source=%_WISE_%\UNWISE32.EXE
+  Destination=%UNINSTALL_PATH%
+  Flags=0000000000000010
+end
+item: Compiler Variable Else
+end
+item: Install File
+  Source=%_WISE_%\UNWISE.EXE
+  Destination=%UNINSTALL_PATH%
+  Flags=0000000000000010
+end
+item: Compiler Variable End
+end
+item: Remark
+end
+item: Remark
+  Text=     Install the add/remove or uninstall icon
+end
+item: Set Variable
+  Variable=UNINSTALL_PATH
+  Value=%UNINSTALL_PATH%
+  Flags=00010100
+end
+item: Set Variable
+  Variable=INST_LOG_PATH
+  Value=%INST_LOG_PATH%
+  Flags=00010100
+end
+item: Check Configuration
+  Flags=10111011
+end
+item: Edit Registry
+  Total Keys=1
+  Key=Software\Microsoft\Windows\CurrentVersion\Uninstall\%APPTITLE%
+  New Value=%APPTITLE%
+  Value Name=DisplayName
+  Root=2
+end
+item: Edit Registry
+  Total Keys=1
+  Key=Software\Microsoft\Windows\CurrentVersion\Uninstall\%APPTITLE%
+  New Value=%UNINSTALL_PATH% /A %INST_LOG_PATH%
+  New Value=
+  Value Name=UninstallString
+  Root=2
+end
+item: Else Statement
+end
+item: Add ProgMan Icon
+  Group=%GROUP%
+  Icon Name=Uninstall %APPTITLE%
+  Command Line=%UNINSTALL_PATH% %INST_LOG_PATH%
+end
+item: End Block
+end
+item: Remark
+end
+item: Remark
+end
+item: Add Text to INSTALL.LOG
+  Text=File Tree: %MAINDIR%\wxPython\*.*
+end
+item: Remark
+end
+item: Set Variable
+  Variable=COMMON
+  Value=%COMMON%
+  Flags=00010100
+end
+item: Set Variable
+  Variable=MAINDIR
+  Value=%MAINDIR%
+  Flags=00010100
+end
+item: Check Configuration
+  Flags=10111011
+end
+item: Get Registry Key Value
+  Variable=STARTUPDIR
+  Key=Software\Microsoft\Windows\CurrentVersion\Explorer\Shell Folders
+  Default=%WIN%\Start Menu\Programs\StartUp
+  Value Name=StartUp
+  Flags=00000010
+end
+item: Get Registry Key Value
+  Variable=DESKTOPDIR
+  Key=Software\Microsoft\Windows\CurrentVersion\Explorer\Shell Folders
+  Default=%WIN%\Desktop
+  Value Name=Desktop
+  Flags=00000010
+end
+item: Get Registry Key Value
+  Variable=STARTMENUDIR
+  Key=Software\Microsoft\Windows\CurrentVersion\Explorer\Shell Folders
+  Default=%WIN%\Start Menu
+  Value Name=Start Menu
+  Flags=00000010
+end
+item: Get Registry Key Value
+  Variable=GROUPDIR
+  Key=Software\Microsoft\Windows\CurrentVersion\Explorer\Shell Folders
+  Default=%WIN%\Start Menu\Programs
+  Value Name=Programs
+  Flags=00000010
+end
+item: Get Registry Key Value
+  Variable=CSTARTUPDIR
+  Key=Software\Microsoft\Windows\CurrentVersion\Explorer\Shell Folders
+  Default=%STARTUPDIR%
+  Value Name=Common Startup
+  Flags=00000100
+end
+item: Get Registry Key Value
+  Variable=CDESKTOPDIR
+  Key=Software\Microsoft\Windows\CurrentVersion\Explorer\Shell Folders
+  Default=%DESKTOPDIR%
+  Value Name=Common Desktop
+  Flags=00000100
+end
+item: Get Registry Key Value
+  Variable=CSTARTMENUDIR
+  Key=Software\Microsoft\Windows\CurrentVersion\Explorer\Shell Folders
+  Default=%STARTMENUDIR%
+  Value Name=Common Start Menu
+  Flags=00000100
+end
+item: Get Registry Key Value
+  Variable=CGROUPDIR
+  Key=Software\Microsoft\Windows\CurrentVersion\Explorer\Shell Folders
+  Default=%GROUPDIR%
+  Value Name=Common Programs
+  Flags=00000100
+end
+item: Set Variable
+  Variable=CGROUP_SAVE
+  Value=%GROUP%
+end
+item: Set Variable
+  Variable=GROUP
+  Value=%GROUPDIR%\%GROUP%
+end
+item: Else Statement
+end
+item: End Block
+end
+item: Self-Register OCXs/DLLs
+  Description=Updating System Configuration, Please Wait...
+end
+item: Edit Registry
+  Total Keys=1
+  Key=SOFTWARE\Python\PythonCore\%PYTHONVER%\PythonPath\wxPython
+  New Value=%MAINDIR%
+  New Value=
+  Root=2
+end
+item: Wizard Block
+  Direction Variable=DIRECTION
+  Display Variable=DISPLAY
+  Bitmap Pathname=%_WISE_%\DIALOGS\TEMPLATE\WIZARD.BMP
+  X Position=9
+  Y Position=10
+  Filler Color=8421440
+  Flags=00000011
+end
+item: Custom Dialog Set
+  Name=Finished
+  Display Variable=DISPLAY
+  item: Dialog
+    Title=Installation Complete
+    Title French=Installation en cours
+    Title German=Installation abgeschlossen
+    Title Portuguese=Instalação Completa 
+    Title Spanish=Se ha completado la Instalación
+    Title Italian=Installazione completata
+    Title Danish=Installation gennemført
+    Title Dutch=Installatie afgerond
+    Title Norwegian=Installasjonen er fullført
+    Title Swedish=Installationen klar
+    Width=280
+    Height=224
+    Font Name=Helv
+    Font Size=8
+    item: Push Button
+      Rectangle=170 185 212 199
+      Variable=DIRECTION
+      Value=N
+      Create Flags=01010000000000010000000000000001
+      Text=&Finish >
+      Text French=&Terminer>
+      Text German=&Fertigstellen>
+      Text Portuguese=&Terminar >
+      Text Spanish=&Finalizar>
+      Text Italian=&Fine >
+      Text Danish=&Afslut >
+      Text Dutch=&Klaar>
+      Text Norwegian=&Avslutt>
+      Text Swedish=&Sluta>
+    end
+    item: Push Button
+      Control Name=CANCEL
+      Rectangle=222 185 264 199
+      Action=3
+      Create Flags=01010000000000010000000000000000
+      Text=Cancel
+      Text French=Annuler
+      Text German=Abbrechen
+      Text Portuguese=Cancelar
+      Text Spanish=Cancelar
+      Text Italian=Annulla
+      Text Danish=Annuller
+      Text Dutch=Annuleren
+      Text Norwegian=Avbryt
+      Text Swedish=Avbryt
+    end
+    item: Static
+      Rectangle=9 177 263 178
+      Action=3
+      Create Flags=01010000000000000000000000000111
+    end
+    item: Static
+      Rectangle=90 10 260 63
+      Enabled Color=00000000000000001111111111111111
+      Create Flags=01010000000000000000000000000000
+      Text=%APPTITLE% has been successfully installed.
+      Text=
+      Text=
+      Text=Press the Finish button to exit this installation.
+      Text=
+      Text French=L'installation de %APPTITLE% est réussie
+      Text French=
+      Text French=
+      Text French=Cliquez sur Terminer pour quitter cette installation
+      Text French=
+      Text German=%APPTITLE% wurde erfolgreich installiert.
+      Text German=
+      Text German=
+      Text German=Zum Beenden dieser Installation Fertigstellen anklicken.
+      Text German=
+      Text Portuguese=%APPTITLE% foi instalado com êxito
+      Text Portuguese=
+      Text Portuguese=
+      Text Portuguese=Pressionar o botão Terminar para sair desta instalação
+      Text Portuguese=
+      Text Spanish=%APPTITLE% se ha instalado con éxito.
+      Text Spanish=
+      Text Spanish=
+      Text Spanish=Pulse el botón de Finalizar para salir de esta instalación.
+      Text Spanish=
+      Text Italian=%APPTITLE% è stato installato.
+      Text Italian=
+      Text Italian=
+      Text Italian=Premi il pulsante Fine per uscire dal programma di installazione
+      Text Italian=
+      Text Danish=%APPTITLE% er nu installeret korrekt.
+      Text Danish=
+      Text Danish=
+      Text Danish=Klik på Afslut for at afslutte installationen.
+      Text Danish=
+      Text Dutch=%APPTITLE% is met succes geïnstalleerd.
+      Text Dutch=
+      Text Dutch=
+      Text Dutch=Druk op Klaar om deze installatie af te ronden.
+      Text Dutch=
+      Text Norwegian=Installasjonen av %APPTITLE% er vellykket.
+      Text Norwegian=
+      Text Norwegian=
+      Text Norwegian=Trykk på Avslutt-tasten for å avslutte denne installasjonen.
+      Text Norwegian=
+      Text Swedish=Installationen av %APPTITLE% har lyckats.
+      Text Swedish=
+      Text Swedish=
+      Text Swedish=Tryck på Sluta för att gå ur installationsprogrammet.
+      Text Swedish=
+    end
+    item: Push Button
+      Control Name=BACK
+      Rectangle=128 185 170 199
+      Variable=DIRECTION
+      Value=B
+      Create Flags=01010000000000010000000000000000
+      Text=< &Back
+      Text French=<&Retour
+      Text German=<&Zurück
+      Text Portuguese=<&Retornar
+      Text Spanish=<&Retroceder
+      Text Italian=< &Indietro
+      Text Danish=<&Tilbage
+      Text Dutch=<&Terug
+      Text Norwegian=<&Tilbake
+      Text Swedish=< &Tillbaka
+    end
+    item: Push Button
+      Rectangle=90 68 153 82
+      Alternate=0\7f\7f%MAINDIR%\wxPython\README.txt\7f
+      Action=6
+      Enabled Color=00000000000000001111111111111111
+      Create Flags=01010000000000010000000000000000
+      Text=View README.txt
+    end
+    item: Set Control Attribute
+      Control Name=BACK
+      Operation=1
+    end
+    item: Set Control Attribute
+      Control Name=CANCEL
+      Operation=1
+    end
+  end
+end
+item: End Block
+end
+item: New Event
+  Name=Cancel
+end
+item: Include Script
+  Pathname=%_WISE_%\INCLUDE\rollback.wse
+end

diff --git a/utils/wxPython/distrib/wxPython.wsm b/utils/wxPython/distrib/wxPython.wsm
new file mode 100644 (file)
index 0000000..4b05b63
Binary files /dev/null and b/utils/wxPython/distrib/wxPython.wsm differ

diff --git a/utils/wxPython/distrib/zipit.bat b/utils/wxPython/distrib/zipit.bat
index 318bf6ba188d79d1fe27b8ce7b3c708b2bd7b208..e03747b615681ab08815960d6f69b628a9e923ef 100755 (executable)
--- a/utils/wxPython/distrib/zipit.bat
+++ b/utils/wxPython/distrib/zipit.bat
@@ -1,8 +1,6 @@
 
 @echo off
 
 
 @echo off
 

-rem cd %WXWIN%\utils

 
 

-zip -@ -r wxPython\wxPython-%1.zip < wxPython\distrib\wxPython.rsp
+zip -@ -r wxPython\wxPython-src-%1.zip < wxPython\distrib\wxPython.rsp

 
 

-cd -

diff --git a/utils/wxPython/src/_defs.i b/utils/wxPython/src/_defs.i
index b6f1c1141b7ee25097c7b5f6f00a55d18298f301..72b0cd85a1b873ab7db725fc011056f5d54b1194 100644 (file)
--- a/utils/wxPython/src/_defs.i
+++ b/utils/wxPython/src/_defs.i
@@ -15,85 +15,133 @@
 //---------------------------------------------------------------------------
 // Forward declares...
 
 //---------------------------------------------------------------------------
 // Forward declares...
 

-class wxPyApp;
-class wxEvtHandler;
-class wxWindow;
-class wxFrame;
-class wxMiniFrame;
-class wxPanel;
-class wxDialog;
-class wxMenu;
-class wxPyMenu;
-class wxMenuBar;
-class wxMenuItem;
-class wxEvent;
-class wxSizeEvent;
+class wxAcceleratorEntry;
+class wxAcceleratorTable;
+class wxActivateEvent;
+class wxBitmapButton;
+class wxBitmap;
+class wxBrush;
+class wxButton;
+class wxCalculateLayoutEvent;
+class wxCheckBox;
+class wxCheckListBox;
+class wxChoice;
+class wxClientDC;

 class wxCloseEvent;
 class wxCloseEvent;

+class wxColourData;
+class wxColourDialog;
+class wxColour;
+class wxComboBox;

 class wxCommandEvent;
 class wxCommandEvent;

-class wxScrollEvent;
-class wxMouseEvent;
-class wxKeyEvent;
-class wxMoveEvent;
-class wxPaintEvent;
+class wxConfig;
+class wxControl;
+class wxCursor;
+class wxDC;
+class wxDialog;
+class wxDirDialog;
+class wxDropFilesEvent;

 class wxEraseEvent;
 class wxEraseEvent;

+class wxEvent;
+class wxEvtHandler;
+class wxFileDialog;

 class wxFocusEvent;
 class wxFocusEvent;

-class wxActivateEvent;
-class wxInitDialogEvent;
-class wxMenuEvent;
-class wxShowEvent;
+class wxFontData;
+class wxFontDialog;
+class wxFont;
+class wxFrame;
+class wxGauge;
+class wxGridCell;
+class wxGridEvent;
+class wxGrid;

 class wxIconizeEvent;
 class wxIconizeEvent;

-class wxMaximizeEvent;
-class wxJoystickEvent;
-class wxDropFilesEvent;
+class wxIcon;

 class wxIdleEvent;
 class wxIdleEvent;

-class wxUpdateUIEvent;
-class wxSysColourChangedEvent;
-class wxSize;
-class wxRealPoint;
-class wxPoint;
-class wxRect;
-class wxBitmap;
+class wxImageList;
+class wxIndividualLayoutConstraint;
+class wxInitDialogEvent;
+class wxJoystickEvent;
+class wxKeyEvent;
+class wxLayoutAlgorithm;
+class wxLayoutConstraints;
+class wxListBox;
+class wxListCtrl;
+class wxListEvent;
+class wxListItem;
+class wxMDIChildFrame;
+class wxMDIClientWindow;
+class wxMDIParentFrame;

 class wxMask;
 class wxMask;

-class wxIcon;
-class wxCursor;
-class wxFont;
-class wxColour;
-class wxPen;
-class wxBrush;
-class wxDC;
+class wxMaximizeEvent;

 class wxMemoryDC;
 class wxMemoryDC;

-class wxScreenDC;
-class wxClientDC;
+class wxMenuBar;
+class wxMenuEvent;
+class wxMenuItem;
+class wxMenu;
+class wxMessageDialog;
+class wxMetaFileDC;
+class wxMiniFrame;
+class wxMouseEvent;
+class wxMoveEvent;
+class wxNotebookEvent;
+class wxNotebook;
+class wxPageSetupData;
+class wxPageSetupDialog;

 class wxPaintDC;
 class wxPaintDC;

+class wxPaintEvent;
+class wxPalette;
+class wxPanel;
+class wxPen;
+class wxPoint;

 class wxPostScriptDC;
 class wxPostScriptDC;

+class wxPrintData;
+class wxPrintDialog;

 class wxPrinterDC;
 class wxPrinterDC;

-class wxMetaFileDC;
-class wxMDIParentFrame;
-class wxMDIChildFrame;
-class wxMDIClientWindow;
-class wxControl;
-class wxButton;
-class wxBitmapButton;
-class wxCheckBox;
-class wxChoice;
-class wxComboBox;
-class wxGauge;
-class wxStaticBox;
-class wxStaticText;
-class wxListBox;
-class wxTextCtrl;
-class wxScrollBar;
-class wxSpinButton;
-class wxStaticBitmap;
+class wxQueryLayoutInfoEvent;

 class wxRadioBox;
 class wxRadioButton;
 class wxRadioBox;
 class wxRadioButton;

+class wxRealPoint;
+class wxRect;
+class wxRegionIterator;
+class wxRegion;
+class wxSashEvent;
+class wxSashLayoutWindow;
+class wxSashWindow;
+class wxScreenDC;
+class wxScrollBar;
+class wxScrollEvent;
+class wxScrolledWindow;
+class wxShowEvent;
+class wxSingleChoiceDialog;
+class wxSizeEvent;
+class wxSize;

 class wxSlider;
 class wxSlider;

+class wxSpinButton;
+class wxSpinEvent;
+class wxSplitterWindow;
+class wxStaticBitmap;
+class wxStaticBox;
+class wxStaticText;
+class wxStatusBar;
+class wxSysColourChangedEvent;
+class wxTaskBarIcon;
+class wxTextCtrl;
+class wxTextEntryDialog;
+class wxTimer;
+class wxToolBarTool;
+class wxToolBar;
+class wxToolTip;
+class wxTreeCtrl;
+class wxTreeEvent;
+class wxTreeItemData;
+class wxTreeItemId;
+class wxUpdateUIEvent;
+class wxWindowDC;
+class wxWindow;

 
 

+class wxPyApp;
+class wxPyMenu;

 class wxPyTimer;
 class wxPyTimer;

-class wxIndividualLayoutConstraint;
-class wxLayoutConstraints;
-class wxToolBar;
-class wxStatusBar;
+

 
 //---------------------------------------------------------------------------
 
 
 //---------------------------------------------------------------------------
 


@@ -531,6 +579,7 @@ typedef enum {
 #define TRUE 1
 #define true 1
 
 #define TRUE 1
 #define true 1
 

+const char* wxVERSION_STRING;

 
 //---------------------------------------------------------------------------
 //---------------------------------------------------------------------------
 
 //---------------------------------------------------------------------------
 //---------------------------------------------------------------------------


@@ -705,7 +754,20 @@ enum wxEventType {
 /////////////////////////////////////////////////////////////////////////////
 //
 // $Log$
 /////////////////////////////////////////////////////////////////////////////
 //
 // $Log$

+// Revision 1.11  1999/02/20 09:02:54  RD
+// Added wxWindow_FromHWND(hWnd) for wxMSW to construct a wxWindow from a
+// window handle.  If you can get the window handle into the python code,
+// it should just work...  More news on this later.
+//
+// Added wxImageList, wxToolTip.
+//
+// Re-enabled wxConfig.DeleteAll() since it is reportedly fixed for the
+// wxRegConfig class.
+//
+// As usual, some bug fixes, tweaks, etc.
+//

 // Revision 1.10  1999/01/30 07:30:08  RD
 // Revision 1.10  1999/01/30 07:30:08  RD

+//

 // Added wxSashWindow, wxSashEvent, wxLayoutAlgorithm, etc.
 //
 // Various cleanup, tweaks, minor additions, etc. to maintain
 // Added wxSashWindow, wxSashEvent, wxLayoutAlgorithm, etc.
 //
 // Various cleanup, tweaks, minor additions, etc. to maintain

diff --git a/utils/wxPython/src/_extras.py b/utils/wxPython/src/_extras.py
index 02b053f9c48ad73a5ed8997062996b840f61b13f..cb5bf56702e6e0ecfde0cde6936fc4eddb224f6a 100644 (file)
--- a/utils/wxPython/src/_extras.py
+++ b/utils/wxPython/src/_extras.py
@@ -548,6 +548,15 @@ wxPyDefaultSize.Set(-1,-1)
 wxDefaultPosition = wxPyDefaultPosition
 wxDefaultSize     = wxPyDefaultSize
 
 wxDefaultPosition = wxPyDefaultPosition
 wxDefaultSize     = wxPyDefaultSize
 

+
+# This is to cover up a bug in SWIG.  We are redefining
+# the shadow class that is generated for wxAcceleratorTable
+# because SWIG incorrectly uses "arg0.this"
+class wxAcceleratorTable(wxAcceleratorTablePtr):
+    def __init__(self,arg0) :
+        self.this = miscc.new_wxAcceleratorTable(arg0)
+        self.thisown = 1
+

 #----------------------------------------------------------------------
 
 ## class wxPyStdOutWindow(wxFrame):
 #----------------------------------------------------------------------
 
 ## class wxPyStdOutWindow(wxFrame):


@@ -615,7 +624,20 @@ class wxApp(wxPyApp):
 #----------------------------------------------------------------------------
 #
 # $Log$
 #----------------------------------------------------------------------------
 #
 # $Log$

+# Revision 1.11  1999/02/20 09:02:55  RD
+# Added wxWindow_FromHWND(hWnd) for wxMSW to construct a wxWindow from a
+# window handle.  If you can get the window handle into the python code,
+# it should just work...  More news on this later.
+#
+# Added wxImageList, wxToolTip.
+#
+# Re-enabled wxConfig.DeleteAll() since it is reportedly fixed for the
+# wxRegConfig class.
+#
+# As usual, some bug fixes, tweaks, etc.
+#

 # Revision 1.10  1999/02/01 00:10:39  RD
 # Revision 1.10  1999/02/01 00:10:39  RD

+#

 # Added the missing EVT_LIST_ITEM_SELECTED and friends.
 #
 # Revision 1.9  1999/01/30 07:30:09  RD
 # Added the missing EVT_LIST_ITEM_SELECTED and friends.
 #
 # Revision 1.9  1999/01/30 07:30:09  RD

diff --git a/utils/wxPython/src/controls2.i b/utils/wxPython/src/controls2.i
index 17906593c008987651e5e67bef755753d94f4927..78f4ad82be7f8a7b9ccfdf9bcc88423bf2d797f4 100644 (file)
--- a/utils/wxPython/src/controls2.i
+++ b/utils/wxPython/src/controls2.i
@@ -41,6 +41,52 @@ extern wxValidator wxPyDefaultValidator;
 
 //----------------------------------------------------------------------
 
 
 //----------------------------------------------------------------------
 

+enum {
+    wxLIST_MASK_TEXT,
+    wxLIST_MASK_IMAGE,
+    wxLIST_MASK_DATA,
+    wxLIST_MASK_WIDTH,
+    wxLIST_MASK_FORMAT,
+    wxLIST_STATE_DONTCARE,
+    wxLIST_STATE_DROPHILITED,
+    wxLIST_STATE_FOCUSED,
+    wxLIST_STATE_SELECTED,
+    wxLIST_STATE_CUT,
+    wxLIST_HITTEST_ABOVE,
+    wxLIST_HITTEST_BELOW,
+    wxLIST_HITTEST_NOWHERE,
+    wxLIST_HITTEST_ONITEMICON,
+    wxLIST_HITTEST_ONITEMLABEL,
+    wxLIST_HITTEST_ONITEMRIGHT,
+    wxLIST_HITTEST_ONITEMSTATEICON,
+    wxLIST_HITTEST_TOLEFT,
+    wxLIST_HITTEST_TORIGHT,
+    wxLIST_HITTEST_ONITEM,
+    wxLIST_NEXT_ABOVE,
+    wxLIST_NEXT_ALL,
+    wxLIST_NEXT_BELOW,
+    wxLIST_NEXT_LEFT,
+    wxLIST_NEXT_RIGHT,
+    wxLIST_ALIGN_DEFAULT,
+    wxLIST_ALIGN_LEFT,
+    wxLIST_ALIGN_TOP,
+    wxLIST_ALIGN_SNAP_TO_GRID,
+    wxLIST_FORMAT_LEFT,
+    wxLIST_FORMAT_RIGHT,
+    wxLIST_FORMAT_CENTRE,
+    wxLIST_FORMAT_CENTER,
+    wxLIST_AUTOSIZE,
+    wxLIST_AUTOSIZE_USEHEADER,
+    wxLIST_RECT_BOUNDS,
+    wxLIST_RECT_ICON,
+    wxLIST_RECT_LABEL,
+    wxLIST_FIND_UP,
+    wxLIST_FIND_DOWN,
+    wxLIST_FIND_LEFT,
+    wxLIST_FIND_RIGHT,
+};
+
+

 class wxListItem {
 public:
     long            m_mask;     // Indicates what fields are valid
 class wxListItem {
 public:
     long            m_mask;     // Indicates what fields are valid


@@ -156,9 +202,11 @@ public:
     bool SetColumn(int col, wxListItem& item);
     bool SetColumnWidth(int col, int width);
     void SetImageList(wxImageList* imageList, int which);
     bool SetColumn(int col, wxListItem& item);
     bool SetColumnWidth(int col, int width);
     void SetImageList(wxImageList* imageList, int which);

+

     bool SetItem(wxListItem& info);
     bool SetItem(wxListItem& info);

-    %name(SetItemString)long SetItem(long index, int col, const wxString& label,
+    %name(SetStringItem)long SetItem(long index, int col, const wxString& label,

                                      int imageId = -1);
                                      int imageId = -1);

+

     bool SetItemData(long item, long data);
     bool SetItemImage(long item, int image, int selImage);
     bool SetItemPosition(long item, const wxPoint& pos);
     bool SetItemData(long item, long data);
     bool SetItemImage(long item, int image, int selImage);
     bool SetItemPosition(long item, const wxPoint& pos);


@@ -371,7 +419,20 @@ public:
 /////////////////////////////////////////////////////////////////////////////
 //
 // $Log$
 /////////////////////////////////////////////////////////////////////////////
 //
 // $Log$

+// Revision 1.15  1999/02/20 09:02:56  RD
+// Added wxWindow_FromHWND(hWnd) for wxMSW to construct a wxWindow from a
+// window handle.  If you can get the window handle into the python code,
+// it should just work...  More news on this later.
+//
+// Added wxImageList, wxToolTip.
+//
+// Re-enabled wxConfig.DeleteAll() since it is reportedly fixed for the
+// wxRegConfig class.
+//
+// As usual, some bug fixes, tweaks, etc.
+//

 // Revision 1.14  1999/01/30 07:30:10  RD
 // Revision 1.14  1999/01/30 07:30:10  RD

+//

 // Added wxSashWindow, wxSashEvent, wxLayoutAlgorithm, etc.
 //
 // Various cleanup, tweaks, minor additions, etc. to maintain
 // Added wxSashWindow, wxSashEvent, wxLayoutAlgorithm, etc.
 //
 // Various cleanup, tweaks, minor additions, etc. to maintain

diff --git a/utils/wxPython/src/events.i b/utils/wxPython/src/events.i
index 9128338b4927c96ad495b88dc76c1fff112cc45c..da2653c5947e1f02dc46261421c138a1d4cbf19f 100644 (file)
--- a/utils/wxPython/src/events.i
+++ b/utils/wxPython/src/events.i
@@ -138,9 +138,6 @@ public:
     bool ShiftDown();
     long KeyCode();
 
     bool ShiftDown();
     long KeyCode();
 

-//  void Position(float *OUTPUT, float *OUTPUT);
-//  float GetX();
-//  float GetY();

 };
 
 //---------------------------------------------------------------------------
 };
 
 //---------------------------------------------------------------------------


@@ -298,7 +295,20 @@ public:
 /////////////////////////////////////////////////////////////////////////////
 //
 // $Log$
 /////////////////////////////////////////////////////////////////////////////
 //
 // $Log$

+// Revision 1.7  1999/02/20 09:02:57  RD
+// Added wxWindow_FromHWND(hWnd) for wxMSW to construct a wxWindow from a
+// window handle.  If you can get the window handle into the python code,
+// it should just work...  More news on this later.
+//
+// Added wxImageList, wxToolTip.
+//
+// Re-enabled wxConfig.DeleteAll() since it is reportedly fixed for the
+// wxRegConfig class.
+//
+// As usual, some bug fixes, tweaks, etc.
+//

 // Revision 1.6  1999/02/06 22:55:00  RD
 // Revision 1.6  1999/02/06 22:55:00  RD

+//

 // Follow up for changes in wxWindows to various event classes
 //
 // Revision 1.5  1998/12/15 20:41:17  RD
 // Follow up for changes in wxWindows to various event classes
 //
 // Revision 1.5  1998/12/15 20:41:17  RD

diff --git a/utils/wxPython/src/gdi.i b/utils/wxPython/src/gdi.i
index 88c48fe92de3ed26ea107c61d2bf50d880216194..c4fa456c05dc5e9d21b9fd441b15895787185433 100644 (file)
--- a/utils/wxPython/src/gdi.i
+++ b/utils/wxPython/src/gdi.i
@@ -16,6 +16,7 @@
 %{
 #include "helpers.h"
 #include <wx/metafile.h>
 %{
 #include "helpers.h"
 #include <wx/metafile.h>

+#include <wx/imaglist.h>

 #ifndef __WXMSW__
 #include <wx/dcps.h>
 #endif
 #ifndef __WXMSW__
 #include <wx/dcps.h>
 #endif


@@ -307,8 +308,10 @@ public:
     }
     void GetSize(int* OUTPUT, int* OUTPUT); //void GetSize(long* OUTPUT, long* OUTPUT);
     wxColour& GetTextBackground();
     }
     void GetSize(int* OUTPUT, int* OUTPUT); //void GetSize(long* OUTPUT, long* OUTPUT);
     wxColour& GetTextBackground();

-    void GetTextExtent(const wxString& string, long *OUTPUT, long *OUTPUT,
-                       long *OUTPUT, long *OUTPUT);
+    void GetTextExtent(const wxString& string, long *OUTPUT, long *OUTPUT);
+    %name(GetFullTextExtent)void GetTextExtent(const wxString& string,
+                       long *OUTPUT, long *OUTPUT, long *OUTPUT, long* OUTPUT,
+                       const wxFont* font = NULL);

     wxColour& GetTextForeground();
     long LogicalToDeviceX(long x);
     long LogicalToDeviceXRel(long x);
     wxColour& GetTextForeground();
     long LogicalToDeviceX(long x);
     long LogicalToDeviceXRel(long x);


@@ -436,6 +439,9 @@ public:
 
 
 %readonly
 
 
 %readonly

+%{
+#if 0
+%}

 extern wxFont *wxNORMAL_FONT;
 extern wxFont *wxSMALL_FONT;
 extern wxFont *wxITALIC_FONT;
 extern wxFont *wxNORMAL_FONT;
 extern wxFont *wxSMALL_FONT;
 extern wxFont *wxITALIC_FONT;


@@ -484,6 +490,11 @@ extern wxPalette wxNullPalette;
 extern wxFont   wxNullFont;
 extern wxColour wxNullColour;
 
 extern wxFont   wxNullFont;
 extern wxColour wxNullColour;
 

+%readwrite
+%{
+#endif
+%}
+

 //---------------------------------------------------------------------------
 
 class wxPalette {
 //---------------------------------------------------------------------------
 
 class wxPalette {


@@ -498,13 +509,55 @@ public:
 
 //---------------------------------------------------------------------------
 
 
 //---------------------------------------------------------------------------
 

+enum {
+    wxIMAGELIST_DRAW_NORMAL ,
+    wxIMAGELIST_DRAW_TRANSPARENT,
+    wxIMAGELIST_DRAW_SELECTED,
+    wxIMAGELIST_DRAW_FOCUSED,
+    wxIMAGE_LIST_NORMAL,
+    wxIMAGE_LIST_SMALL,
+    wxIMAGE_LIST_STATE
+};
+
+class wxImageList {
+public:
+    wxImageList(int width, int height, const bool mask=TRUE, int initialCount=1);
+    ~wxImageList();
+
+    int Add(const wxBitmap& bitmap, const wxBitmap& mask = wxNullBitmap);
+    %name(AddWithColourMask)int Add(const wxBitmap& bitmap, const wxColour& maskColour);
+    %name(AddIcon)int Add(const wxIcon& icon);
+
+    bool Draw(int index, wxDC& dc, int x, int x, int flags = wxIMAGELIST_DRAW_NORMAL,
+              const bool solidBackground = FALSE);
+
+    int GetImageCount();
+    bool Remove(int index);
+    bool RemoveAll();
+    bool Replace(int index, const wxBitmap& bitmap, const wxBitmap& mask = wxNullBitmap);
+    %name(ReplaceIcon)bool Replace(int index, const wxIcon& icon);
+};
+

 
 //---------------------------------------------------------------------------
 
 /////////////////////////////////////////////////////////////////////////////
 //
 // $Log$
 
 //---------------------------------------------------------------------------
 
 /////////////////////////////////////////////////////////////////////////////
 //
 // $Log$

+// Revision 1.13  1999/02/20 09:02:58  RD
+// Added wxWindow_FromHWND(hWnd) for wxMSW to construct a wxWindow from a
+// window handle.  If you can get the window handle into the python code,
+// it should just work...  More news on this later.
+//
+// Added wxImageList, wxToolTip.
+//
+// Re-enabled wxConfig.DeleteAll() since it is reportedly fixed for the
+// wxRegConfig class.
+//
+// As usual, some bug fixes, tweaks, etc.
+//

 // Revision 1.12  1999/01/30 07:30:11  RD
 // Revision 1.12  1999/01/30 07:30:11  RD

+//

 // Added wxSashWindow, wxSashEvent, wxLayoutAlgorithm, etc.
 //
 // Various cleanup, tweaks, minor additions, etc. to maintain
 // Added wxSashWindow, wxSashEvent, wxLayoutAlgorithm, etc.
 //
 // Various cleanup, tweaks, minor additions, etc. to maintain

diff --git a/utils/wxPython/src/helpers.cpp b/utils/wxPython/src/helpers.cpp
index ae7a8321aea6a16236aa717780aca749647ec418..3dc40d736254d2c290338066585d9153f405e63c 100644 (file)
--- a/utils/wxPython/src/helpers.cpp
+++ b/utils/wxPython/src/helpers.cpp
@@ -10,12 +10,6 @@
 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __WXMSW__
-#include <windows.h>
-#undef FindWindow
-#undef GetCharWidth
-#undef LoadAccelerators
-#endif

 
 #ifdef __WXGTK__
 #include "gtk/gtk.h"
 
 #ifdef __WXGTK__
 #include "gtk/gtk.h"


@@ -24,6 +18,14 @@
 #undef DEBUG
 #include <Python.h>
 #include "helpers.h"
 #undef DEBUG
 #include <Python.h>
 #include "helpers.h"

+#ifdef __WXMSW__
+#include <wx/msw/private.h>
+#undef FindWindow
+#undef GetCharWidth
+#undef LoadAccelerators
+#undef GetClassInfo
+#undef GetClassName
+#endif

 #include <wx/module.h>
 
 //---------------------------------------------------------------------------
 #include <wx/module.h>
 
 //---------------------------------------------------------------------------


@@ -38,8 +40,6 @@ wxString    wxPyEmptyStr("");
 
 
 #ifdef __WXMSW__             // If building for win32...
 
 
 #ifdef __WXMSW__             // If building for win32...

-extern HINSTANCE wxhInstance;
-

 //----------------------------------------------------------------------
 // This gets run when the DLL is loaded.  We just need to save a handle.
 //----------------------------------------------------------------------
 //----------------------------------------------------------------------
 // This gets run when the DLL is loaded.  We just need to save a handle.
 //----------------------------------------------------------------------


@@ -50,7 +50,7 @@ BOOL WINAPI DllMain(
     LPVOID      lpvReserved  // reserved
    )
 {
     LPVOID      lpvReserved  // reserved
    )
 {

-    wxhInstance = hinstDLL;
+    wxSetInstance(hinstDLL);

     return 1;
 }
 #endif
     return 1;
 }
 #endif


@@ -73,6 +73,7 @@ int  wxPyApp::MainLoop(void) {
     return retval;
 }
 
     return retval;
 }
 

+

 void wxPyApp::AfterMainLoop(void) {
     // more stuff from wxEntry...
 
 void wxPyApp::AfterMainLoop(void) {
     // more stuff from wxEntry...
 


@@ -583,7 +584,20 @@ wxAcceleratorEntry* wxAcceleratorEntry_LIST_helper(PyObject* source) {
 /////////////////////////////////////////////////////////////////////////////
 //
 // $Log$
 /////////////////////////////////////////////////////////////////////////////
 //
 // $Log$

+// Revision 1.19  1999/02/20 09:02:59  RD
+// Added wxWindow_FromHWND(hWnd) for wxMSW to construct a wxWindow from a
+// window handle.  If you can get the window handle into the python code,
+// it should just work...  More news on this later.
+//
+// Added wxImageList, wxToolTip.
+//
+// Re-enabled wxConfig.DeleteAll() since it is reportedly fixed for the
+// wxRegConfig class.
+//
+// As usual, some bug fixes, tweaks, etc.
+//

 // Revision 1.18  1999/01/30 08:17:27  RD
 // Revision 1.18  1999/01/30 08:17:27  RD

+//

 // Added wxSashWindow, wxSashEvent, wxLayoutAlgorithm, etc.
 //
 // Various cleanup, tweaks, minor additions, etc. to maintain
 // Added wxSashWindow, wxSashEvent, wxLayoutAlgorithm, etc.
 //
 // Various cleanup, tweaks, minor additions, etc. to maintain

diff --git a/utils/wxPython/src/makefile.vc b/utils/wxPython/src/makefile.vc
index 4080f85d6891737db5c682dc6f829b8b2ab6a1c2..7a85a3523cdddb0a1d384e07c7d710f548319700 100644 (file)
--- a/utils/wxPython/src/makefile.vc
+++ b/utils/wxPython/src/makefile.vc
@@ -1,6 +1,6 @@
 #----------------------------------------------------------------------------
 # Name:                makefile.nt
 #----------------------------------------------------------------------------
 # Name:                makefile.nt

-# Purpose:     Win32, VC++ 5 makefile for wxPython
+# Purpose:     Win32, VC++ 5/6 makefile for wxPython

 #
 # Author:       Robin Dunn
 #
 #
 # Author:       Robin Dunn
 #


@@ -9,7 +9,7 @@
 # Copyright:    (c) 1998 by Total Control Software
 # Licence:      wxWindows license
 #----------------------------------------------------------------------------
 # Copyright:    (c) 1998 by Total Control Software
 # Licence:      wxWindows license
 #----------------------------------------------------------------------------

-VERSION=0.5.4
+VERSION=2.0b5

 
 # Set WXDIR to the root wxWindows directory for your system
 WXDIR = $(WXWIN)
 
 # Set WXDIR to the root wxWindows directory for your system
 WXDIR = $(WXWIN)


@@ -30,18 +30,22 @@ TARGETDIR=..
 # runtime.
 COMPILEPY=0
 
 # runtime.
 COMPILEPY=0
 

+# If your wxWindows is built as a DLL, set this to 1.  Using 0 means
+# that wxWindows will be staticaly linked with wxPython.
+WXUSINGDLL=1
+
+# (experimental)

 SEPARATE=0
 
 #----------------------------------------------------------------------
 
 SEPARATE=0
 
 #----------------------------------------------------------------------
 

-WXUSINGDLL=0

 NOPCH=1
 THISDIR=$(WXDIR)\utils\wxPython
 
 EXTRALIBS=$(PYTHONDIR)\libs\python15.lib
 EXTRAINC=-I$(PYTHONDIR)\include -I.
 EXTRAFLAGS=/Fpwxp.pch /YXhelpers.h -DSWIG_GLOBAL -DHAVE_CONFIG_H
 NOPCH=1
 THISDIR=$(WXDIR)\utils\wxPython
 
 EXTRALIBS=$(PYTHONDIR)\libs\python15.lib
 EXTRAINC=-I$(PYTHONDIR)\include -I.
 EXTRAFLAGS=/Fpwxp.pch /YXhelpers.h -DSWIG_GLOBAL -DHAVE_CONFIG_H

-OVERRIDEFLAGS=/GX-
+OVERRIDEFLAGS=/GX- /DwxUSE_GLOBAL_MEMORY_OPERATORS=0

 
 
 SWIGFLAGS=-c++ -shadow -python -dnone -D__WXMSW__
 
 
 SWIGFLAGS=-c++ -shadow -python -dnone -D__WXMSW__


@@ -172,6 +176,8 @@ clean:
        -erase $(TARGETDIR)\*.pyo
 
 
        -erase $(TARGETDIR)\*.pyo
 
 

+showflags:
+       @echo $(CPPFLAGS)

 
 #------------------------------------------------------------------------
 
 
 #------------------------------------------------------------------------
 


@@ -268,7 +274,20 @@ dist:
 #------------------------------------------------------------------------
 #
 # $Log$
 #------------------------------------------------------------------------
 #
 # $Log$

+# Revision 1.2  1999/02/20 09:03:00  RD
+# Added wxWindow_FromHWND(hWnd) for wxMSW to construct a wxWindow from a
+# window handle.  If you can get the window handle into the python code,
+# it should just work...  More news on this later.
+#
+# Added wxImageList, wxToolTip.
+#
+# Re-enabled wxConfig.DeleteAll() since it is reportedly fixed for the
+# wxRegConfig class.
+#
+# As usual, some bug fixes, tweaks, etc.
+#

 # Revision 1.1  1999/02/06 23:47:03  RD
 # Revision 1.1  1999/02/06 23:47:03  RD

+#

 # Changing makefile.nt to makefile.vc as in rest of wxWindows
 #
 # Revision 1.10  1999/02/01 00:10:40  RD
 # Changing makefile.nt to makefile.vc as in rest of wxWindows
 #
 # Revision 1.10  1999/02/01 00:10:40  RD

diff --git a/utils/wxPython/src/misc.i b/utils/wxPython/src/misc.i
index cededae34a01c1d543656419ad0a996267022da4..b0b149507d5ae1f372bac3d09dd71742ff5f2aa2 100644 (file)
--- a/utils/wxPython/src/misc.i
+++ b/utils/wxPython/src/misc.i
@@ -15,6 +15,7 @@
 %{
 #include "helpers.h"
 #include <wx/resource.h>
 %{
 #include "helpers.h"
 #include <wx/resource.h>

+#include <wx/tooltip.h>

 %}
 
 //----------------------------------------------------------------------
 %}
 
 //----------------------------------------------------------------------


@@ -31,23 +32,30 @@
 
 class wxSize {
 public:
 
 class wxSize {
 public:

+    long x;
+    long y;

     %name(width) long x;
     %name(height)long y;
 
     wxSize(long w=0, long h=0);
     ~wxSize();
     void Set(long w, long h);
     %name(width) long x;
     %name(height)long y;
 
     wxSize(long w=0, long h=0);
     ~wxSize();
     void Set(long w, long h);

+    long GetX();
+    long GetY();

     %name(GetWidth) long GetX();
     %name(GetHeight)long GetY();
 
     %addmethods {
     %name(GetWidth) long GetX();
     %name(GetHeight)long GetY();
 
     %addmethods {

-        PyObject* __str__() {
+        PyObject* asTuple() {

             PyObject* tup = PyTuple_New(2);
             PyTuple_SET_ITEM(tup, 0, PyInt_FromLong(self->x));
             PyTuple_SET_ITEM(tup, 1, PyInt_FromLong(self->y));
             return tup;
         }
     }
             PyObject* tup = PyTuple_New(2);
             PyTuple_SET_ITEM(tup, 0, PyInt_FromLong(self->x));
             PyTuple_SET_ITEM(tup, 1, PyInt_FromLong(self->y));
             return tup;
         }
     }

+    %pragma(python) addtoclass = "def __str__(self): return str(self.asTuple())"
+    %pragma(python) addtoclass = "def __repr__(self): return str(self.asTuple())"
+

 };
 
 //---------------------------------------------------------------------------
 };
 
 //---------------------------------------------------------------------------


@@ -72,13 +80,15 @@ public:
             self->x = x;
             self->y = y;
         }
             self->x = x;
             self->y = y;
         }

-        PyObject* __str__() {
+        PyObject* asTuple() {

             PyObject* tup = PyTuple_New(2);
             PyTuple_SET_ITEM(tup, 0, PyInt_FromLong(self->x));
             PyTuple_SET_ITEM(tup, 1, PyInt_FromLong(self->y));
             return tup;
         }
     }
             PyObject* tup = PyTuple_New(2);
             PyTuple_SET_ITEM(tup, 0, PyInt_FromLong(self->x));
             PyTuple_SET_ITEM(tup, 1, PyInt_FromLong(self->y));
             return tup;
         }
     }

+    %pragma(python) addtoclass = "def __str__(self): return str(self.asTuple())"
+    %pragma(python) addtoclass = "def __repr__(self): return str(self.asTuple())"

 };
 
 //---------------------------------------------------------------------------
 };
 
 //---------------------------------------------------------------------------


@@ -108,6 +118,19 @@ public:
    long  GetRight();
 
    long x, y, width, height;
    long  GetRight();
 
    long x, y, width, height;

+
+    %addmethods {
+        PyObject* asTuple() {
+            PyObject* tup = PyTuple_New(4);
+            PyTuple_SET_ITEM(tup, 0, PyInt_FromLong(self->x));
+            PyTuple_SET_ITEM(tup, 1, PyInt_FromLong(self->y));
+            PyTuple_SET_ITEM(tup, 0, PyInt_FromLong(self->width));
+            PyTuple_SET_ITEM(tup, 1, PyInt_FromLong(self->height));
+            return tup;
+        }
+    }
+    %pragma(python) addtoclass = "def __str__(self): return str(self.asTuple())"
+    %pragma(python) addtoclass = "def __repr__(self): return str(self.asTuple())"

 };
 
 
 };
 
 


@@ -356,11 +379,48 @@ public:
 
 };
 
 
 };
 

+//---------------------------------------------------------------------------
+// wxToolTip
+
+class wxToolTip {
+public:
+    wxToolTip(const wxString &tip);
+
+    void SetTip(const wxString& tip);
+    wxString GetTip();
+    void SetWindow(wxWindow *win);
+    wxWindow *GetWindow();
+};
+
+
+%inline %{
+    void wxToolTip_Enable(bool flag) {
+        wxToolTip::Enable(flag);
+    }
+
+    void wxToolTip_SetDelay(long milliseconds) {
+        wxToolTip::SetDelay(milliseconds);
+    }
+%}
+

 //---------------------------------------------------------------------------
 /////////////////////////////////////////////////////////////////////////////
 //
 // $Log$
 //---------------------------------------------------------------------------
 /////////////////////////////////////////////////////////////////////////////
 //
 // $Log$

+// Revision 1.11  1999/02/20 09:03:01  RD
+// Added wxWindow_FromHWND(hWnd) for wxMSW to construct a wxWindow from a
+// window handle.  If you can get the window handle into the python code,
+// it should just work...  More news on this later.
+//
+// Added wxImageList, wxToolTip.
+//
+// Re-enabled wxConfig.DeleteAll() since it is reportedly fixed for the
+// wxRegConfig class.
+//
+// As usual, some bug fixes, tweaks, etc.
+//

 // Revision 1.10  1999/01/30 07:30:14  RD
 // Revision 1.10  1999/01/30 07:30:14  RD

+//

 // Added wxSashWindow, wxSashEvent, wxLayoutAlgorithm, etc.
 //
 // Various cleanup, tweaks, minor additions, etc. to maintain
 // Added wxSashWindow, wxSashEvent, wxLayoutAlgorithm, etc.
 //
 // Various cleanup, tweaks, minor additions, etc. to maintain

diff --git a/utils/wxPython/src/msw/cmndlgs.cpp b/utils/wxPython/src/msw/cmndlgs.cpp
index d6ac7721d33f3e7bb5ba57c44a9c33a0353b5f7f..8cd6e9a23f7e94261eab8a77c431f7a4ae452199 100644 (file)
--- a/utils/wxPython/src/msw/cmndlgs.cpp
+++ b/utils/wxPython/src/msw/cmndlgs.cpp
@@ -3568,6 +3568,7 @@ SWIGEXPORT(void,initcmndlgsc)() {
         SWIG_RegisterMapping("_class_wxEvtHandler","_wxEvtHandler",0);
         SWIG_RegisterMapping("_wxIndividualLayoutConstraint","_class_wxIndividualLayoutConstraint",0);
         SWIG_RegisterMapping("_wxCursor","_class_wxCursor",0);
         SWIG_RegisterMapping("_class_wxEvtHandler","_wxEvtHandler",0);
         SWIG_RegisterMapping("_wxIndividualLayoutConstraint","_class_wxIndividualLayoutConstraint",0);
         SWIG_RegisterMapping("_wxCursor","_class_wxCursor",0);

+        SWIG_RegisterMapping("_wxToolTip","_class_wxToolTip",0);

         SWIG_RegisterMapping("_wxMask","_class_wxMask",0);
         SWIG_RegisterMapping("_wxPageSetupData","_class_wxPageSetupData",0);
         SWIG_RegisterMapping("_wxPyMenu","_class_wxPyMenu",0);
         SWIG_RegisterMapping("_wxMask","_class_wxMask",0);
         SWIG_RegisterMapping("_wxPageSetupData","_class_wxPageSetupData",0);
         SWIG_RegisterMapping("_wxPyMenu","_class_wxPyMenu",0);


@@ -3577,6 +3578,7 @@ SWIGEXPORT(void,initcmndlgsc)() {
         SWIG_RegisterMapping("_long","_wxDash",0);
         SWIG_RegisterMapping("_long","_unsigned_long",0);
         SWIG_RegisterMapping("_long","_signed_long",0);
         SWIG_RegisterMapping("_long","_wxDash",0);
         SWIG_RegisterMapping("_long","_unsigned_long",0);
         SWIG_RegisterMapping("_long","_signed_long",0);

+        SWIG_RegisterMapping("_wxImageList","_class_wxImageList",0);

         SWIG_RegisterMapping("_class_wxAcceleratorTable","_wxAcceleratorTable",0);
         SWIG_RegisterMapping("_wxDC","_class_wxDC",0);
         SWIG_RegisterMapping("_class_wxSingleChoiceDialog","_wxSingleChoiceDialog",0);
         SWIG_RegisterMapping("_class_wxAcceleratorTable","_wxAcceleratorTable",0);
         SWIG_RegisterMapping("_wxDC","_class_wxDC",0);
         SWIG_RegisterMapping("_class_wxSingleChoiceDialog","_wxSingleChoiceDialog",0);


@@ -3602,6 +3604,7 @@ SWIGEXPORT(void,initcmndlgsc)() {
         SWIG_RegisterMapping("_wxPanel","_class_wxColourDialog",SwigwxColourDialogTowxPanel);
         SWIG_RegisterMapping("_wxPanel","_wxColourDialog",SwigwxColourDialogTowxPanel);
         SWIG_RegisterMapping("_wxPanel","_class_wxPanel",0);
         SWIG_RegisterMapping("_wxPanel","_class_wxColourDialog",SwigwxColourDialogTowxPanel);
         SWIG_RegisterMapping("_wxPanel","_wxColourDialog",SwigwxColourDialogTowxPanel);
         SWIG_RegisterMapping("_wxPanel","_class_wxPanel",0);

+        SWIG_RegisterMapping("_class_wxToolTip","_wxToolTip",0);

         SWIG_RegisterMapping("_class_wxMask","_wxMask",0);
         SWIG_RegisterMapping("_class_wxPageSetupData","_wxPageSetupData",0);
         SWIG_RegisterMapping("_wxColour","_class_wxColour",0);
         SWIG_RegisterMapping("_class_wxMask","_wxMask",0);
         SWIG_RegisterMapping("_class_wxPageSetupData","_wxPageSetupData",0);
         SWIG_RegisterMapping("_wxColour","_class_wxColour",0);


@@ -3752,6 +3755,7 @@ SWIGEXPORT(void,initcmndlgsc)() {
         SWIG_RegisterMapping("_short","_WXTYPE",0);
         SWIG_RegisterMapping("_short","_unsigned_short",0);
         SWIG_RegisterMapping("_short","_signed_short",0);
         SWIG_RegisterMapping("_short","_WXTYPE",0);
         SWIG_RegisterMapping("_short","_unsigned_short",0);
         SWIG_RegisterMapping("_short","_signed_short",0);

+        SWIG_RegisterMapping("_class_wxImageList","_wxImageList",0);

         SWIG_RegisterMapping("_wxWindowID","_EBool",0);
         SWIG_RegisterMapping("_wxWindowID","_uint",0);
         SWIG_RegisterMapping("_wxWindowID","_int",0);
         SWIG_RegisterMapping("_wxWindowID","_EBool",0);
         SWIG_RegisterMapping("_wxWindowID","_uint",0);
         SWIG_RegisterMapping("_wxWindowID","_int",0);

diff --git a/utils/wxPython/src/msw/controls.cpp b/utils/wxPython/src/msw/controls.cpp
index f842a1fae6f7fc0f9ea0520b15a8cfe3d2eea232..f69bf210a644b5828b0902a7621057844b7bd9cd 100644 (file)
--- a/utils/wxPython/src/msw/controls.cpp
+++ b/utils/wxPython/src/msw/controls.cpp
@@ -5497,6 +5497,7 @@ SWIGEXPORT(void,initcontrolsc)() {
         SWIG_RegisterMapping("_wxPaintEvent","_class_wxPaintEvent",0);
         SWIG_RegisterMapping("_wxIndividualLayoutConstraint","_class_wxIndividualLayoutConstraint",0);
         SWIG_RegisterMapping("_wxCursor","_class_wxCursor",0);
         SWIG_RegisterMapping("_wxPaintEvent","_class_wxPaintEvent",0);
         SWIG_RegisterMapping("_wxIndividualLayoutConstraint","_class_wxIndividualLayoutConstraint",0);
         SWIG_RegisterMapping("_wxCursor","_class_wxCursor",0);

+        SWIG_RegisterMapping("_wxToolTip","_class_wxToolTip",0);

         SWIG_RegisterMapping("_wxMask","_class_wxMask",0);
         SWIG_RegisterMapping("_wxPyMenu","_class_wxPyMenu",0);
         SWIG_RegisterMapping("_wxPen","_class_wxPen",0);
         SWIG_RegisterMapping("_wxMask","_class_wxMask",0);
         SWIG_RegisterMapping("_wxPyMenu","_class_wxPyMenu",0);
         SWIG_RegisterMapping("_wxPen","_class_wxPen",0);


@@ -5508,6 +5509,7 @@ SWIGEXPORT(void,initcontrolsc)() {
         SWIG_RegisterMapping("_long","_wxDash",0);
         SWIG_RegisterMapping("_long","_unsigned_long",0);
         SWIG_RegisterMapping("_long","_signed_long",0);
         SWIG_RegisterMapping("_long","_wxDash",0);
         SWIG_RegisterMapping("_long","_unsigned_long",0);
         SWIG_RegisterMapping("_long","_signed_long",0);

+        SWIG_RegisterMapping("_wxImageList","_class_wxImageList",0);

         SWIG_RegisterMapping("_wxDropFilesEvent","_class_wxDropFilesEvent",0);
         SWIG_RegisterMapping("_wxBitmapButton","_class_wxBitmapButton",0);
         SWIG_RegisterMapping("_class_wxAcceleratorTable","_wxAcceleratorTable",0);
         SWIG_RegisterMapping("_wxDropFilesEvent","_class_wxDropFilesEvent",0);
         SWIG_RegisterMapping("_wxBitmapButton","_class_wxBitmapButton",0);
         SWIG_RegisterMapping("_class_wxAcceleratorTable","_wxAcceleratorTable",0);


@@ -5523,6 +5525,7 @@ SWIGEXPORT(void,initcontrolsc)() {
         SWIG_RegisterMapping("_wxInitDialogEvent","_class_wxInitDialogEvent",0);
         SWIG_RegisterMapping("_wxCheckBox","_class_wxCheckBox",0);
         SWIG_RegisterMapping("_wxTextCtrl","_class_wxTextCtrl",0);
         SWIG_RegisterMapping("_wxInitDialogEvent","_class_wxInitDialogEvent",0);
         SWIG_RegisterMapping("_wxCheckBox","_class_wxCheckBox",0);
         SWIG_RegisterMapping("_wxTextCtrl","_class_wxTextCtrl",0);

+        SWIG_RegisterMapping("_class_wxToolTip","_wxToolTip",0);

         SWIG_RegisterMapping("_class_wxMask","_wxMask",0);
         SWIG_RegisterMapping("_class_wxKeyEvent","_wxKeyEvent",0);
         SWIG_RegisterMapping("_wxColour","_class_wxColour",0);
         SWIG_RegisterMapping("_class_wxMask","_wxMask",0);
         SWIG_RegisterMapping("_class_wxKeyEvent","_wxKeyEvent",0);
         SWIG_RegisterMapping("_wxColour","_class_wxColour",0);


@@ -5704,6 +5707,7 @@ SWIGEXPORT(void,initcontrolsc)() {
         SWIG_RegisterMapping("_wxJoystickEvent","_class_wxJoystickEvent",0);
         SWIG_RegisterMapping("_class_wxChoice","_wxChoice",0);
         SWIG_RegisterMapping("_class_wxSlider","_wxSlider",0);
         SWIG_RegisterMapping("_wxJoystickEvent","_class_wxJoystickEvent",0);
         SWIG_RegisterMapping("_class_wxChoice","_wxChoice",0);
         SWIG_RegisterMapping("_class_wxSlider","_wxSlider",0);

+        SWIG_RegisterMapping("_class_wxImageList","_wxImageList",0);

         SWIG_RegisterMapping("_class_wxBitmapButton","_wxBitmapButton",0);
         SWIG_RegisterMapping("_wxWindowID","_EBool",0);
         SWIG_RegisterMapping("_wxWindowID","_uint",0);
         SWIG_RegisterMapping("_class_wxBitmapButton","_wxBitmapButton",0);
         SWIG_RegisterMapping("_wxWindowID","_EBool",0);
         SWIG_RegisterMapping("_wxWindowID","_uint",0);

diff --git a/utils/wxPython/src/msw/controls2.cpp b/utils/wxPython/src/msw/controls2.cpp
index 9337a9ab191eab23370da03c0f42ed65e5278706..dcc07f3dea2a9b6e066973d996145b8e96764f2a 100644 (file)
--- a/utils/wxPython/src/msw/controls2.cpp
+++ b/utils/wxPython/src/msw/controls2.cpp
@@ -117,6 +117,28 @@ extern wxAcceleratorEntry* wxAcceleratorEntry_LIST_helper(PyObject* source);
 static char* wxStringErrorMsg = "string type is required for parameter";
 
 extern wxValidator wxPyDefaultValidator;
 static char* wxStringErrorMsg = "string type is required for parameter";
 
 extern wxValidator wxPyDefaultValidator;

+#define wxListItem_m_mask_set(_swigobj,_swigval) (_swigobj->m_mask = _swigval,_swigval)
+static PyObject *_wrap_wxListItem_m_mask_set(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    long  _result;
+    wxListItem * _arg0;
+    long  _arg1;
+    char * _argc0 = 0;
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"sl:wxListItem_m_mask_set",&_argc0,&_arg1)) 
+        return NULL;
+    if (_argc0) {
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxListItem_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListItem_m_mask_set. Expected _wxListItem_p.");
+        return NULL;
+        }
+    }
+    _result = (long )wxListItem_m_mask_set(_arg0,_arg1);
+    _resultobj = Py_BuildValue("l",_result);
+    return _resultobj;
+}
+

 #define wxListItem_m_mask_get(_swigobj) ((long ) _swigobj->m_mask)
 static PyObject *_wrap_wxListItem_m_mask_get(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
 #define wxListItem_m_mask_get(_swigobj) ((long ) _swigobj->m_mask)
 static PyObject *_wrap_wxListItem_m_mask_get(PyObject *self, PyObject *args) {
     PyObject * _resultobj;


@@ -138,6 +160,28 @@ static PyObject *_wrap_wxListItem_m_mask_get(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
     return _resultobj;
 }
 

+#define wxListItem_m_itemId_set(_swigobj,_swigval) (_swigobj->m_itemId = _swigval,_swigval)
+static PyObject *_wrap_wxListItem_m_itemId_set(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    long  _result;
+    wxListItem * _arg0;
+    long  _arg1;
+    char * _argc0 = 0;
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"sl:wxListItem_m_itemId_set",&_argc0,&_arg1)) 
+        return NULL;
+    if (_argc0) {
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxListItem_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListItem_m_itemId_set. Expected _wxListItem_p.");
+        return NULL;
+        }
+    }
+    _result = (long )wxListItem_m_itemId_set(_arg0,_arg1);
+    _resultobj = Py_BuildValue("l",_result);
+    return _resultobj;
+}
+

 #define wxListItem_m_itemId_get(_swigobj) ((long ) _swigobj->m_itemId)
 static PyObject *_wrap_wxListItem_m_itemId_get(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
 #define wxListItem_m_itemId_get(_swigobj) ((long ) _swigobj->m_itemId)
 static PyObject *_wrap_wxListItem_m_itemId_get(PyObject *self, PyObject *args) {
     PyObject * _resultobj;


@@ -159,6 +203,28 @@ static PyObject *_wrap_wxListItem_m_itemId_get(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
     return _resultobj;
 }
 

+#define wxListItem_m_col_set(_swigobj,_swigval) (_swigobj->m_col = _swigval,_swigval)
+static PyObject *_wrap_wxListItem_m_col_set(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    int  _result;
+    wxListItem * _arg0;
+    int  _arg1;
+    char * _argc0 = 0;
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"si:wxListItem_m_col_set",&_argc0,&_arg1)) 
+        return NULL;
+    if (_argc0) {
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxListItem_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListItem_m_col_set. Expected _wxListItem_p.");
+        return NULL;
+        }
+    }
+    _result = (int )wxListItem_m_col_set(_arg0,_arg1);
+    _resultobj = Py_BuildValue("i",_result);
+    return _resultobj;
+}
+

 #define wxListItem_m_col_get(_swigobj) ((int ) _swigobj->m_col)
 static PyObject *_wrap_wxListItem_m_col_get(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
 #define wxListItem_m_col_get(_swigobj) ((int ) _swigobj->m_col)
 static PyObject *_wrap_wxListItem_m_col_get(PyObject *self, PyObject *args) {
     PyObject * _resultobj;


@@ -180,6 +246,28 @@ static PyObject *_wrap_wxListItem_m_col_get(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
     return _resultobj;
 }
 

+#define wxListItem_m_state_set(_swigobj,_swigval) (_swigobj->m_state = _swigval,_swigval)
+static PyObject *_wrap_wxListItem_m_state_set(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    long  _result;
+    wxListItem * _arg0;
+    long  _arg1;
+    char * _argc0 = 0;
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"sl:wxListItem_m_state_set",&_argc0,&_arg1)) 
+        return NULL;
+    if (_argc0) {
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxListItem_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListItem_m_state_set. Expected _wxListItem_p.");
+        return NULL;
+        }
+    }
+    _result = (long )wxListItem_m_state_set(_arg0,_arg1);
+    _resultobj = Py_BuildValue("l",_result);
+    return _resultobj;
+}
+

 #define wxListItem_m_state_get(_swigobj) ((long ) _swigobj->m_state)
 static PyObject *_wrap_wxListItem_m_state_get(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
 #define wxListItem_m_state_get(_swigobj) ((long ) _swigobj->m_state)
 static PyObject *_wrap_wxListItem_m_state_get(PyObject *self, PyObject *args) {
     PyObject * _resultobj;


@@ -201,6 +289,28 @@ static PyObject *_wrap_wxListItem_m_state_get(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
     return _resultobj;
 }
 

+#define wxListItem_m_stateMask_set(_swigobj,_swigval) (_swigobj->m_stateMask = _swigval,_swigval)
+static PyObject *_wrap_wxListItem_m_stateMask_set(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    long  _result;
+    wxListItem * _arg0;
+    long  _arg1;
+    char * _argc0 = 0;
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"sl:wxListItem_m_stateMask_set",&_argc0,&_arg1)) 
+        return NULL;
+    if (_argc0) {
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxListItem_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListItem_m_stateMask_set. Expected _wxListItem_p.");
+        return NULL;
+        }
+    }
+    _result = (long )wxListItem_m_stateMask_set(_arg0,_arg1);
+    _resultobj = Py_BuildValue("l",_result);
+    return _resultobj;
+}
+

 #define wxListItem_m_stateMask_get(_swigobj) ((long ) _swigobj->m_stateMask)
 static PyObject *_wrap_wxListItem_m_stateMask_get(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
 #define wxListItem_m_stateMask_get(_swigobj) ((long ) _swigobj->m_stateMask)
 static PyObject *_wrap_wxListItem_m_stateMask_get(PyObject *self, PyObject *args) {
     PyObject * _resultobj;


@@ -222,6 +332,42 @@ static PyObject *_wrap_wxListItem_m_stateMask_get(PyObject *self, PyObject *args
     return _resultobj;
 }
 
     return _resultobj;
 }
 

+#define wxListItem_m_text_set(_swigobj,_swigval) (_swigobj->m_text = *(_swigval),_swigval)
+static PyObject *_wrap_wxListItem_m_text_set(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    wxString * _result;
+    wxListItem * _arg0;
+    wxString * _arg1;
+    char * _argc0 = 0;
+    PyObject * _obj1 = 0;
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"sO:wxListItem_m_text_set",&_argc0,&_obj1)) 
+        return NULL;
+    if (_argc0) {
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxListItem_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListItem_m_text_set. Expected _wxListItem_p.");
+        return NULL;
+        }
+    }
+{
+    if (!PyString_Check(_obj1)) {
+        PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
+        return NULL;
+    }
+    _arg1 = new wxString(PyString_AsString(_obj1));
+}
+    _result = (wxString *)wxListItem_m_text_set(_arg0,_arg1);
+{
+    _resultobj = PyString_FromString(WXSTRINGCAST (*_result));
+}
+{
+    if (_obj1)
+        delete _arg1;
+}
+    return _resultobj;
+}
+

 #define wxListItem_m_text_get(_swigobj) (&_swigobj->m_text)
 static PyObject *_wrap_wxListItem_m_text_get(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
 #define wxListItem_m_text_get(_swigobj) (&_swigobj->m_text)
 static PyObject *_wrap_wxListItem_m_text_get(PyObject *self, PyObject *args) {
     PyObject * _resultobj;


@@ -245,6 +391,28 @@ static PyObject *_wrap_wxListItem_m_text_get(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
     return _resultobj;
 }
 

+#define wxListItem_m_image_set(_swigobj,_swigval) (_swigobj->m_image = _swigval,_swigval)
+static PyObject *_wrap_wxListItem_m_image_set(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    int  _result;
+    wxListItem * _arg0;
+    int  _arg1;
+    char * _argc0 = 0;
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"si:wxListItem_m_image_set",&_argc0,&_arg1)) 
+        return NULL;
+    if (_argc0) {
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxListItem_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListItem_m_image_set. Expected _wxListItem_p.");
+        return NULL;
+        }
+    }
+    _result = (int )wxListItem_m_image_set(_arg0,_arg1);
+    _resultobj = Py_BuildValue("i",_result);
+    return _resultobj;
+}
+

 #define wxListItem_m_image_get(_swigobj) ((int ) _swigobj->m_image)
 static PyObject *_wrap_wxListItem_m_image_get(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
 #define wxListItem_m_image_get(_swigobj) ((int ) _swigobj->m_image)
 static PyObject *_wrap_wxListItem_m_image_get(PyObject *self, PyObject *args) {
     PyObject * _resultobj;


@@ -266,6 +434,28 @@ static PyObject *_wrap_wxListItem_m_image_get(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
     return _resultobj;
 }
 

+#define wxListItem_m_data_set(_swigobj,_swigval) (_swigobj->m_data = _swigval,_swigval)
+static PyObject *_wrap_wxListItem_m_data_set(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    long  _result;
+    wxListItem * _arg0;
+    long  _arg1;
+    char * _argc0 = 0;
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"sl:wxListItem_m_data_set",&_argc0,&_arg1)) 
+        return NULL;
+    if (_argc0) {
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxListItem_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListItem_m_data_set. Expected _wxListItem_p.");
+        return NULL;
+        }
+    }
+    _result = (long )wxListItem_m_data_set(_arg0,_arg1);
+    _resultobj = Py_BuildValue("l",_result);
+    return _resultobj;
+}
+

 #define wxListItem_m_data_get(_swigobj) ((long ) _swigobj->m_data)
 static PyObject *_wrap_wxListItem_m_data_get(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
 #define wxListItem_m_data_get(_swigobj) ((long ) _swigobj->m_data)
 static PyObject *_wrap_wxListItem_m_data_get(PyObject *self, PyObject *args) {
     PyObject * _resultobj;


@@ -287,6 +477,28 @@ static PyObject *_wrap_wxListItem_m_data_get(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
     return _resultobj;
 }
 

+#define wxListItem_m_format_set(_swigobj,_swigval) (_swigobj->m_format = _swigval,_swigval)
+static PyObject *_wrap_wxListItem_m_format_set(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    int  _result;
+    wxListItem * _arg0;
+    int  _arg1;
+    char * _argc0 = 0;
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"si:wxListItem_m_format_set",&_argc0,&_arg1)) 
+        return NULL;
+    if (_argc0) {
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxListItem_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListItem_m_format_set. Expected _wxListItem_p.");
+        return NULL;
+        }
+    }
+    _result = (int )wxListItem_m_format_set(_arg0,_arg1);
+    _resultobj = Py_BuildValue("i",_result);
+    return _resultobj;
+}
+

 #define wxListItem_m_format_get(_swigobj) ((int ) _swigobj->m_format)
 static PyObject *_wrap_wxListItem_m_format_get(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
 #define wxListItem_m_format_get(_swigobj) ((int ) _swigobj->m_format)
 static PyObject *_wrap_wxListItem_m_format_get(PyObject *self, PyObject *args) {
     PyObject * _resultobj;


@@ -308,6 +520,28 @@ static PyObject *_wrap_wxListItem_m_format_get(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
     return _resultobj;
 }
 

+#define wxListItem_m_width_set(_swigobj,_swigval) (_swigobj->m_width = _swigval,_swigval)
+static PyObject *_wrap_wxListItem_m_width_set(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    int  _result;
+    wxListItem * _arg0;
+    int  _arg1;
+    char * _argc0 = 0;
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"si:wxListItem_m_width_set",&_argc0,&_arg1)) 
+        return NULL;
+    if (_argc0) {
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxListItem_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListItem_m_width_set. Expected _wxListItem_p.");
+        return NULL;
+        }
+    }
+    _result = (int )wxListItem_m_width_set(_arg0,_arg1);
+    _resultobj = Py_BuildValue("i",_result);
+    return _resultobj;
+}
+

 #define wxListItem_m_width_get(_swigobj) ((int ) _swigobj->m_width)
 static PyObject *_wrap_wxListItem_m_width_get(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
 #define wxListItem_m_width_get(_swigobj) ((int ) _swigobj->m_width)
 static PyObject *_wrap_wxListItem_m_width_get(PyObject *self, PyObject *args) {
     PyObject * _resultobj;


@@ -381,6 +615,28 @@ static void *SwigwxListEventTowxEvent(void *ptr) {
     return (void *) dest;
 }
 
     return (void *) dest;
 }
 

+#define wxListEvent_m_code_set(_swigobj,_swigval) (_swigobj->m_code = _swigval,_swigval)
+static PyObject *_wrap_wxListEvent_m_code_set(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    int  _result;
+    wxListEvent * _arg0;
+    int  _arg1;
+    char * _argc0 = 0;
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"si:wxListEvent_m_code_set",&_argc0,&_arg1)) 
+        return NULL;
+    if (_argc0) {
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxListEvent_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListEvent_m_code_set. Expected _wxListEvent_p.");
+        return NULL;
+        }
+    }
+    _result = (int )wxListEvent_m_code_set(_arg0,_arg1);
+    _resultobj = Py_BuildValue("i",_result);
+    return _resultobj;
+}
+

 #define wxListEvent_m_code_get(_swigobj) ((int ) _swigobj->m_code)
 static PyObject *_wrap_wxListEvent_m_code_get(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
 #define wxListEvent_m_code_get(_swigobj) ((int ) _swigobj->m_code)
 static PyObject *_wrap_wxListEvent_m_code_get(PyObject *self, PyObject *args) {
     PyObject * _resultobj;


@@ -402,6 +658,28 @@ static PyObject *_wrap_wxListEvent_m_code_get(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
     return _resultobj;
 }
 

+#define wxListEvent_m_itemIndex_set(_swigobj,_swigval) (_swigobj->m_itemIndex = _swigval,_swigval)
+static PyObject *_wrap_wxListEvent_m_itemIndex_set(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    long  _result;
+    wxListEvent * _arg0;
+    long  _arg1;
+    char * _argc0 = 0;
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"sl:wxListEvent_m_itemIndex_set",&_argc0,&_arg1)) 
+        return NULL;
+    if (_argc0) {
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxListEvent_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListEvent_m_itemIndex_set. Expected _wxListEvent_p.");
+        return NULL;
+        }
+    }
+    _result = (long )wxListEvent_m_itemIndex_set(_arg0,_arg1);
+    _resultobj = Py_BuildValue("l",_result);
+    return _resultobj;
+}
+

 #define wxListEvent_m_itemIndex_get(_swigobj) ((long ) _swigobj->m_itemIndex)
 static PyObject *_wrap_wxListEvent_m_itemIndex_get(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
 #define wxListEvent_m_itemIndex_get(_swigobj) ((long ) _swigobj->m_itemIndex)
 static PyObject *_wrap_wxListEvent_m_itemIndex_get(PyObject *self, PyObject *args) {
     PyObject * _resultobj;


@@ -423,6 +701,28 @@ static PyObject *_wrap_wxListEvent_m_itemIndex_get(PyObject *self, PyObject *arg
     return _resultobj;
 }
 
     return _resultobj;
 }
 

+#define wxListEvent_m_oldItemIndex_set(_swigobj,_swigval) (_swigobj->m_oldItemIndex = _swigval,_swigval)
+static PyObject *_wrap_wxListEvent_m_oldItemIndex_set(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    long  _result;
+    wxListEvent * _arg0;
+    long  _arg1;
+    char * _argc0 = 0;
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"sl:wxListEvent_m_oldItemIndex_set",&_argc0,&_arg1)) 
+        return NULL;
+    if (_argc0) {
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxListEvent_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListEvent_m_oldItemIndex_set. Expected _wxListEvent_p.");
+        return NULL;
+        }
+    }
+    _result = (long )wxListEvent_m_oldItemIndex_set(_arg0,_arg1);
+    _resultobj = Py_BuildValue("l",_result);
+    return _resultobj;
+}
+

 #define wxListEvent_m_oldItemIndex_get(_swigobj) ((long ) _swigobj->m_oldItemIndex)
 static PyObject *_wrap_wxListEvent_m_oldItemIndex_get(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
 #define wxListEvent_m_oldItemIndex_get(_swigobj) ((long ) _swigobj->m_oldItemIndex)
 static PyObject *_wrap_wxListEvent_m_oldItemIndex_get(PyObject *self, PyObject *args) {
     PyObject * _resultobj;


@@ -444,6 +744,28 @@ static PyObject *_wrap_wxListEvent_m_oldItemIndex_get(PyObject *self, PyObject *
     return _resultobj;
 }
 
     return _resultobj;
 }
 

+#define wxListEvent_m_col_set(_swigobj,_swigval) (_swigobj->m_col = _swigval,_swigval)
+static PyObject *_wrap_wxListEvent_m_col_set(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    int  _result;
+    wxListEvent * _arg0;
+    int  _arg1;
+    char * _argc0 = 0;
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"si:wxListEvent_m_col_set",&_argc0,&_arg1)) 
+        return NULL;
+    if (_argc0) {
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxListEvent_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListEvent_m_col_set. Expected _wxListEvent_p.");
+        return NULL;
+        }
+    }
+    _result = (int )wxListEvent_m_col_set(_arg0,_arg1);
+    _resultobj = Py_BuildValue("i",_result);
+    return _resultobj;
+}
+

 #define wxListEvent_m_col_get(_swigobj) ((int ) _swigobj->m_col)
 static PyObject *_wrap_wxListEvent_m_col_get(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
 #define wxListEvent_m_col_get(_swigobj) ((int ) _swigobj->m_col)
 static PyObject *_wrap_wxListEvent_m_col_get(PyObject *self, PyObject *args) {
     PyObject * _resultobj;


@@ -465,6 +787,30 @@ static PyObject *_wrap_wxListEvent_m_col_get(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
     return _resultobj;
 }
 

+#define wxListEvent_m_cancelled_set(_swigobj,_swigval) (_swigobj->m_cancelled = _swigval,_swigval)
+static PyObject *_wrap_wxListEvent_m_cancelled_set(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    bool  _result;
+    wxListEvent * _arg0;
+    bool  _arg1;
+    char * _argc0 = 0;
+    int tempbool1;
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"si:wxListEvent_m_cancelled_set",&_argc0,&tempbool1)) 
+        return NULL;
+    if (_argc0) {
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxListEvent_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListEvent_m_cancelled_set. Expected _wxListEvent_p.");
+        return NULL;
+        }
+    }
+    _arg1 = (bool ) tempbool1;
+    _result = (bool )wxListEvent_m_cancelled_set(_arg0,_arg1);
+    _resultobj = Py_BuildValue("i",_result);
+    return _resultobj;
+}
+

 #define wxListEvent_m_cancelled_get(_swigobj) ((bool ) _swigobj->m_cancelled)
 static PyObject *_wrap_wxListEvent_m_cancelled_get(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
 #define wxListEvent_m_cancelled_get(_swigobj) ((bool ) _swigobj->m_cancelled)
 static PyObject *_wrap_wxListEvent_m_cancelled_get(PyObject *self, PyObject *args) {
     PyObject * _resultobj;


@@ -486,6 +832,37 @@ static PyObject *_wrap_wxListEvent_m_cancelled_get(PyObject *self, PyObject *arg
     return _resultobj;
 }
 
     return _resultobj;
 }
 

+#define wxListEvent_m_pointDrag_set(_swigobj,_swigval) (_swigobj->m_pointDrag = *(_swigval),_swigval)
+static PyObject *_wrap_wxListEvent_m_pointDrag_set(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    wxPoint * _result;
+    wxListEvent * _arg0;
+    wxPoint * _arg1;
+    char * _argc0 = 0;
+    char * _argc1 = 0;
+    char _ptemp[128];
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"ss:wxListEvent_m_pointDrag_set",&_argc0,&_argc1)) 
+        return NULL;
+    if (_argc0) {
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxListEvent_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListEvent_m_pointDrag_set. Expected _wxListEvent_p.");
+        return NULL;
+        }
+    }
+    if (_argc1) {
+        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxPoint_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxListEvent_m_pointDrag_set. Expected _wxPoint_p.");
+        return NULL;
+        }
+    }
+    _result = (wxPoint *)wxListEvent_m_pointDrag_set(_arg0,_arg1);
+    SWIG_MakePtr(_ptemp, (char *) _result,"_wxPoint_p");
+    _resultobj = Py_BuildValue("s",_ptemp);
+    return _resultobj;
+}
+

 #define wxListEvent_m_pointDrag_get(_swigobj) (&_swigobj->m_pointDrag)
 static PyObject *_wrap_wxListEvent_m_pointDrag_get(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
 #define wxListEvent_m_pointDrag_get(_swigobj) (&_swigobj->m_pointDrag)
 static PyObject *_wrap_wxListEvent_m_pointDrag_get(PyObject *self, PyObject *args) {
     PyObject * _resultobj;


@@ -509,6 +886,37 @@ static PyObject *_wrap_wxListEvent_m_pointDrag_get(PyObject *self, PyObject *arg
     return _resultobj;
 }
 
     return _resultobj;
 }
 

+#define wxListEvent_m_item_set(_swigobj,_swigval) (_swigobj->m_item = *(_swigval),_swigval)
+static PyObject *_wrap_wxListEvent_m_item_set(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    wxListItem * _result;
+    wxListEvent * _arg0;
+    wxListItem * _arg1;
+    char * _argc0 = 0;
+    char * _argc1 = 0;
+    char _ptemp[128];
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"ss:wxListEvent_m_item_set",&_argc0,&_argc1)) 
+        return NULL;
+    if (_argc0) {
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxListEvent_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListEvent_m_item_set. Expected _wxListEvent_p.");
+        return NULL;
+        }
+    }
+    if (_argc1) {
+        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxListItem_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxListEvent_m_item_set. Expected _wxListItem_p.");
+        return NULL;
+        }
+    }
+    _result = (wxListItem *)wxListEvent_m_item_set(_arg0,_arg1);
+    SWIG_MakePtr(_ptemp, (char *) _result,"_wxListItem_p");
+    _resultobj = Py_BuildValue("s",_ptemp);
+    return _resultobj;
+}
+

 #define wxListEvent_m_item_get(_swigobj) (&_swigobj->m_item)
 static PyObject *_wrap_wxListEvent_m_item_get(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
 #define wxListEvent_m_item_get(_swigobj) (&_swigobj->m_item)
 static PyObject *_wrap_wxListEvent_m_item_get(PyObject *self, PyObject *args) {
     PyObject * _resultobj;


@@ -611,7 +1019,7 @@ static PyObject *_wrap_wxListCtrl_Arrange(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     bool  _result;
     wxListCtrl * _arg0;
     PyObject * _resultobj;
     bool  _result;
     wxListCtrl * _arg0;

-    int  _arg1 = wxLIST_ALIGN_DEFAULT;
+    int  _arg1 = (wxLIST_ALIGN_DEFAULT);

     char * _argc0 = 0;
 
     self = self;
     char * _argc0 = 0;
 
     self = self;


@@ -1104,7 +1512,7 @@ static PyObject *_wrap_wxListCtrl_GetItemRect(PyObject *self, PyObject *args) {
     wxRect * _result;
     wxListCtrl * _arg0;
     long  _arg1;
     wxRect * _result;
     wxListCtrl * _arg0;
     long  _arg1;

-    int  _arg2 = wxLIST_RECT_BOUNDS;
+    int  _arg2 = (wxLIST_RECT_BOUNDS);

     char * _argc0 = 0;
     char _ptemp[128];
 
     char * _argc0 = 0;
     char _ptemp[128];
 


@@ -1224,8 +1632,8 @@ static PyObject *_wrap_wxListCtrl_GetNextItem(PyObject *self, PyObject *args) {
     long  _result;
     wxListCtrl * _arg0;
     long  _arg1;
     long  _result;
     wxListCtrl * _arg0;
     long  _arg1;

-    int  _arg2 = wxLIST_NEXT_ALL;
-    int  _arg3 = wxLIST_STATE_DONTCARE;
+    int  _arg2 = (wxLIST_NEXT_ALL);
+    int  _arg3 = (wxLIST_STATE_DONTCARE);

     char * _argc0 = 0;
 
     self = self;
     char * _argc0 = 0;
 
     self = self;


@@ -1412,7 +1820,7 @@ static PyObject *_wrap_wxListCtrl_InsertColumn(PyObject *self, PyObject *args) {
     wxListCtrl * _arg0;
     long  _arg1;
     wxString * _arg2;
     wxListCtrl * _arg0;
     long  _arg1;
     wxString * _arg2;

-    int  _arg3 = wxLIST_FORMAT_LEFT;
+    int  _arg3 = (wxLIST_FORMAT_LEFT);

     int  _arg4 = -1;
     char * _argc0 = 0;
     PyObject * _obj2 = 0;
     int  _arg4 = -1;
     char * _argc0 = 0;
     PyObject * _obj2 = 0;


@@ -1729,8 +2137,8 @@ static PyObject *_wrap_wxListCtrl_SetItem(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
     return _resultobj;
 }
 

-#define wxListCtrl_SetItemString(_swigobj,_swigarg0,_swigarg1,_swigarg2,_swigarg3)  (_swigobj->SetItem(_swigarg0,_swigarg1,_swigarg2,_swigarg3))
-static PyObject *_wrap_wxListCtrl_SetItemString(PyObject *self, PyObject *args) {
+#define wxListCtrl_SetStringItem(_swigobj,_swigarg0,_swigarg1,_swigarg2,_swigarg3)  (_swigobj->SetItem(_swigarg0,_swigarg1,_swigarg2,_swigarg3))
+static PyObject *_wrap_wxListCtrl_SetStringItem(PyObject *self, PyObject *args) {

     PyObject * _resultobj;
     long  _result;
     wxListCtrl * _arg0;
     PyObject * _resultobj;
     long  _result;
     wxListCtrl * _arg0;


@@ -1742,11 +2150,11 @@ static PyObject *_wrap_wxListCtrl_SetItemString(PyObject *self, PyObject *args)
     PyObject * _obj3 = 0;
 
     self = self;
     PyObject * _obj3 = 0;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sliO|i:wxListCtrl_SetItemString",&_argc0,&_arg1,&_arg2,&_obj3,&_arg4)) 
+    if(!PyArg_ParseTuple(args,"sliO|i:wxListCtrl_SetStringItem",&_argc0,&_arg1,&_arg2,&_obj3,&_arg4)) 

         return NULL;
     if (_argc0) {
         if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxListCtrl_p")) {
         return NULL;
     if (_argc0) {
         if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxListCtrl_p")) {

-            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListCtrl_SetItemString. Expected _wxListCtrl_p.");
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListCtrl_SetStringItem. Expected _wxListCtrl_p.");

         return NULL;
         }
     }
         return NULL;
         }
     }


@@ -1757,7 +2165,7 @@ static PyObject *_wrap_wxListCtrl_SetItemString(PyObject *self, PyObject *args)
     }
     _arg3 = new wxString(PyString_AsString(_obj3));
 }
     }
     _arg3 = new wxString(PyString_AsString(_obj3));
 }

-    _result = (long )wxListCtrl_SetItemString(_arg0,_arg1,_arg2,*_arg3,_arg4);
+    _result = (long )wxListCtrl_SetStringItem(_arg0,_arg1,_arg2,*_arg3,_arg4);

     _resultobj = Py_BuildValue("l",_result);
 {
     if (_obj3)
     _resultobj = Py_BuildValue("l",_result);
 {
     if (_obj3)


@@ -3955,7 +4363,7 @@ static PyMethodDef controls2cMethods[] = {
         { "wxListCtrl_SetItemPosition", _wrap_wxListCtrl_SetItemPosition, 1 },
         { "wxListCtrl_SetItemImage", _wrap_wxListCtrl_SetItemImage, 1 },
         { "wxListCtrl_SetItemData", _wrap_wxListCtrl_SetItemData, 1 },
         { "wxListCtrl_SetItemPosition", _wrap_wxListCtrl_SetItemPosition, 1 },
         { "wxListCtrl_SetItemImage", _wrap_wxListCtrl_SetItemImage, 1 },
         { "wxListCtrl_SetItemData", _wrap_wxListCtrl_SetItemData, 1 },

-        { "wxListCtrl_SetItemString", _wrap_wxListCtrl_SetItemString, 1 },
+        { "wxListCtrl_SetStringItem", _wrap_wxListCtrl_SetStringItem, 1 },

         { "wxListCtrl_SetItem", _wrap_wxListCtrl_SetItem, 1 },
         { "wxListCtrl_SetImageList", _wrap_wxListCtrl_SetImageList, 1 },
         { "wxListCtrl_SetColumnWidth", _wrap_wxListCtrl_SetColumnWidth, 1 },
         { "wxListCtrl_SetItem", _wrap_wxListCtrl_SetItem, 1 },
         { "wxListCtrl_SetImageList", _wrap_wxListCtrl_SetImageList, 1 },
         { "wxListCtrl_SetColumnWidth", _wrap_wxListCtrl_SetColumnWidth, 1 },


@@ -4001,24 +4409,41 @@ static PyMethodDef controls2cMethods[] = {
         { "wxListCtrl_Arrange", _wrap_wxListCtrl_Arrange, 1 },
         { "new_wxListCtrl", _wrap_new_wxListCtrl, 1 },
         { "wxListEvent_m_item_get", _wrap_wxListEvent_m_item_get, 1 },
         { "wxListCtrl_Arrange", _wrap_wxListCtrl_Arrange, 1 },
         { "new_wxListCtrl", _wrap_new_wxListCtrl, 1 },
         { "wxListEvent_m_item_get", _wrap_wxListEvent_m_item_get, 1 },

+        { "wxListEvent_m_item_set", _wrap_wxListEvent_m_item_set, 1 },

         { "wxListEvent_m_pointDrag_get", _wrap_wxListEvent_m_pointDrag_get, 1 },
         { "wxListEvent_m_pointDrag_get", _wrap_wxListEvent_m_pointDrag_get, 1 },

+        { "wxListEvent_m_pointDrag_set", _wrap_wxListEvent_m_pointDrag_set, 1 },

         { "wxListEvent_m_cancelled_get", _wrap_wxListEvent_m_cancelled_get, 1 },
         { "wxListEvent_m_cancelled_get", _wrap_wxListEvent_m_cancelled_get, 1 },

+        { "wxListEvent_m_cancelled_set", _wrap_wxListEvent_m_cancelled_set, 1 },

         { "wxListEvent_m_col_get", _wrap_wxListEvent_m_col_get, 1 },
         { "wxListEvent_m_col_get", _wrap_wxListEvent_m_col_get, 1 },

+        { "wxListEvent_m_col_set", _wrap_wxListEvent_m_col_set, 1 },

         { "wxListEvent_m_oldItemIndex_get", _wrap_wxListEvent_m_oldItemIndex_get, 1 },
         { "wxListEvent_m_oldItemIndex_get", _wrap_wxListEvent_m_oldItemIndex_get, 1 },

+        { "wxListEvent_m_oldItemIndex_set", _wrap_wxListEvent_m_oldItemIndex_set, 1 },

         { "wxListEvent_m_itemIndex_get", _wrap_wxListEvent_m_itemIndex_get, 1 },
         { "wxListEvent_m_itemIndex_get", _wrap_wxListEvent_m_itemIndex_get, 1 },

+        { "wxListEvent_m_itemIndex_set", _wrap_wxListEvent_m_itemIndex_set, 1 },

         { "wxListEvent_m_code_get", _wrap_wxListEvent_m_code_get, 1 },
         { "wxListEvent_m_code_get", _wrap_wxListEvent_m_code_get, 1 },

+        { "wxListEvent_m_code_set", _wrap_wxListEvent_m_code_set, 1 },

         { "delete_wxListItem", _wrap_delete_wxListItem, 1 },
         { "new_wxListItem", _wrap_new_wxListItem, 1 },
         { "wxListItem_m_width_get", _wrap_wxListItem_m_width_get, 1 },
         { "delete_wxListItem", _wrap_delete_wxListItem, 1 },
         { "new_wxListItem", _wrap_new_wxListItem, 1 },
         { "wxListItem_m_width_get", _wrap_wxListItem_m_width_get, 1 },

+        { "wxListItem_m_width_set", _wrap_wxListItem_m_width_set, 1 },

         { "wxListItem_m_format_get", _wrap_wxListItem_m_format_get, 1 },
         { "wxListItem_m_format_get", _wrap_wxListItem_m_format_get, 1 },

+        { "wxListItem_m_format_set", _wrap_wxListItem_m_format_set, 1 },

         { "wxListItem_m_data_get", _wrap_wxListItem_m_data_get, 1 },
         { "wxListItem_m_data_get", _wrap_wxListItem_m_data_get, 1 },

+        { "wxListItem_m_data_set", _wrap_wxListItem_m_data_set, 1 },

         { "wxListItem_m_image_get", _wrap_wxListItem_m_image_get, 1 },
         { "wxListItem_m_image_get", _wrap_wxListItem_m_image_get, 1 },

+        { "wxListItem_m_image_set", _wrap_wxListItem_m_image_set, 1 },

         { "wxListItem_m_text_get", _wrap_wxListItem_m_text_get, 1 },
         { "wxListItem_m_text_get", _wrap_wxListItem_m_text_get, 1 },

+        { "wxListItem_m_text_set", _wrap_wxListItem_m_text_set, 1 },

         { "wxListItem_m_stateMask_get", _wrap_wxListItem_m_stateMask_get, 1 },
         { "wxListItem_m_stateMask_get", _wrap_wxListItem_m_stateMask_get, 1 },

+        { "wxListItem_m_stateMask_set", _wrap_wxListItem_m_stateMask_set, 1 },

         { "wxListItem_m_state_get", _wrap_wxListItem_m_state_get, 1 },
         { "wxListItem_m_state_get", _wrap_wxListItem_m_state_get, 1 },

+        { "wxListItem_m_state_set", _wrap_wxListItem_m_state_set, 1 },

         { "wxListItem_m_col_get", _wrap_wxListItem_m_col_get, 1 },
         { "wxListItem_m_col_get", _wrap_wxListItem_m_col_get, 1 },

+        { "wxListItem_m_col_set", _wrap_wxListItem_m_col_set, 1 },

         { "wxListItem_m_itemId_get", _wrap_wxListItem_m_itemId_get, 1 },
         { "wxListItem_m_itemId_get", _wrap_wxListItem_m_itemId_get, 1 },

+        { "wxListItem_m_itemId_set", _wrap_wxListItem_m_itemId_set, 1 },

         { "wxListItem_m_mask_get", _wrap_wxListItem_m_mask_get, 1 },
         { "wxListItem_m_mask_get", _wrap_wxListItem_m_mask_get, 1 },

+        { "wxListItem_m_mask_set", _wrap_wxListItem_m_mask_set, 1 },

         { NULL, NULL }
 };
 static PyObject *SWIG_globals;
         { NULL, NULL }
 };
 static PyObject *SWIG_globals;


@@ -4030,6 +4455,48 @@ SWIGEXPORT(void,initcontrols2c)() {
         SWIG_globals = SWIG_newvarlink();
         m = Py_InitModule("controls2c", controls2cMethods);
         d = PyModule_GetDict(m);
         SWIG_globals = SWIG_newvarlink();
         m = Py_InitModule("controls2c", controls2cMethods);
         d = PyModule_GetDict(m);

+        PyDict_SetItemString(d,"wxLIST_MASK_TEXT", PyInt_FromLong((long) wxLIST_MASK_TEXT));
+        PyDict_SetItemString(d,"wxLIST_MASK_IMAGE", PyInt_FromLong((long) wxLIST_MASK_IMAGE));
+        PyDict_SetItemString(d,"wxLIST_MASK_DATA", PyInt_FromLong((long) wxLIST_MASK_DATA));
+        PyDict_SetItemString(d,"wxLIST_MASK_WIDTH", PyInt_FromLong((long) wxLIST_MASK_WIDTH));
+        PyDict_SetItemString(d,"wxLIST_MASK_FORMAT", PyInt_FromLong((long) wxLIST_MASK_FORMAT));
+        PyDict_SetItemString(d,"wxLIST_STATE_DONTCARE", PyInt_FromLong((long) wxLIST_STATE_DONTCARE));
+        PyDict_SetItemString(d,"wxLIST_STATE_DROPHILITED", PyInt_FromLong((long) wxLIST_STATE_DROPHILITED));
+        PyDict_SetItemString(d,"wxLIST_STATE_FOCUSED", PyInt_FromLong((long) wxLIST_STATE_FOCUSED));
+        PyDict_SetItemString(d,"wxLIST_STATE_SELECTED", PyInt_FromLong((long) wxLIST_STATE_SELECTED));
+        PyDict_SetItemString(d,"wxLIST_STATE_CUT", PyInt_FromLong((long) wxLIST_STATE_CUT));
+        PyDict_SetItemString(d,"wxLIST_HITTEST_ABOVE", PyInt_FromLong((long) wxLIST_HITTEST_ABOVE));
+        PyDict_SetItemString(d,"wxLIST_HITTEST_BELOW", PyInt_FromLong((long) wxLIST_HITTEST_BELOW));
+        PyDict_SetItemString(d,"wxLIST_HITTEST_NOWHERE", PyInt_FromLong((long) wxLIST_HITTEST_NOWHERE));
+        PyDict_SetItemString(d,"wxLIST_HITTEST_ONITEMICON", PyInt_FromLong((long) wxLIST_HITTEST_ONITEMICON));
+        PyDict_SetItemString(d,"wxLIST_HITTEST_ONITEMLABEL", PyInt_FromLong((long) wxLIST_HITTEST_ONITEMLABEL));
+        PyDict_SetItemString(d,"wxLIST_HITTEST_ONITEMRIGHT", PyInt_FromLong((long) wxLIST_HITTEST_ONITEMRIGHT));
+        PyDict_SetItemString(d,"wxLIST_HITTEST_ONITEMSTATEICON", PyInt_FromLong((long) wxLIST_HITTEST_ONITEMSTATEICON));
+        PyDict_SetItemString(d,"wxLIST_HITTEST_TOLEFT", PyInt_FromLong((long) wxLIST_HITTEST_TOLEFT));
+        PyDict_SetItemString(d,"wxLIST_HITTEST_TORIGHT", PyInt_FromLong((long) wxLIST_HITTEST_TORIGHT));
+        PyDict_SetItemString(d,"wxLIST_HITTEST_ONITEM", PyInt_FromLong((long) wxLIST_HITTEST_ONITEM));
+        PyDict_SetItemString(d,"wxLIST_NEXT_ABOVE", PyInt_FromLong((long) wxLIST_NEXT_ABOVE));
+        PyDict_SetItemString(d,"wxLIST_NEXT_ALL", PyInt_FromLong((long) wxLIST_NEXT_ALL));
+        PyDict_SetItemString(d,"wxLIST_NEXT_BELOW", PyInt_FromLong((long) wxLIST_NEXT_BELOW));
+        PyDict_SetItemString(d,"wxLIST_NEXT_LEFT", PyInt_FromLong((long) wxLIST_NEXT_LEFT));
+        PyDict_SetItemString(d,"wxLIST_NEXT_RIGHT", PyInt_FromLong((long) wxLIST_NEXT_RIGHT));
+        PyDict_SetItemString(d,"wxLIST_ALIGN_DEFAULT", PyInt_FromLong((long) wxLIST_ALIGN_DEFAULT));
+        PyDict_SetItemString(d,"wxLIST_ALIGN_LEFT", PyInt_FromLong((long) wxLIST_ALIGN_LEFT));
+        PyDict_SetItemString(d,"wxLIST_ALIGN_TOP", PyInt_FromLong((long) wxLIST_ALIGN_TOP));
+        PyDict_SetItemString(d,"wxLIST_ALIGN_SNAP_TO_GRID", PyInt_FromLong((long) wxLIST_ALIGN_SNAP_TO_GRID));
+        PyDict_SetItemString(d,"wxLIST_FORMAT_LEFT", PyInt_FromLong((long) wxLIST_FORMAT_LEFT));
+        PyDict_SetItemString(d,"wxLIST_FORMAT_RIGHT", PyInt_FromLong((long) wxLIST_FORMAT_RIGHT));
+        PyDict_SetItemString(d,"wxLIST_FORMAT_CENTRE", PyInt_FromLong((long) wxLIST_FORMAT_CENTRE));
+        PyDict_SetItemString(d,"wxLIST_FORMAT_CENTER", PyInt_FromLong((long) wxLIST_FORMAT_CENTER));
+        PyDict_SetItemString(d,"wxLIST_AUTOSIZE", PyInt_FromLong((long) wxLIST_AUTOSIZE));
+        PyDict_SetItemString(d,"wxLIST_AUTOSIZE_USEHEADER", PyInt_FromLong((long) wxLIST_AUTOSIZE_USEHEADER));
+        PyDict_SetItemString(d,"wxLIST_RECT_BOUNDS", PyInt_FromLong((long) wxLIST_RECT_BOUNDS));
+        PyDict_SetItemString(d,"wxLIST_RECT_ICON", PyInt_FromLong((long) wxLIST_RECT_ICON));
+        PyDict_SetItemString(d,"wxLIST_RECT_LABEL", PyInt_FromLong((long) wxLIST_RECT_LABEL));
+        PyDict_SetItemString(d,"wxLIST_FIND_UP", PyInt_FromLong((long) wxLIST_FIND_UP));
+        PyDict_SetItemString(d,"wxLIST_FIND_DOWN", PyInt_FromLong((long) wxLIST_FIND_DOWN));
+        PyDict_SetItemString(d,"wxLIST_FIND_LEFT", PyInt_FromLong((long) wxLIST_FIND_LEFT));
+        PyDict_SetItemString(d,"wxLIST_FIND_RIGHT", PyInt_FromLong((long) wxLIST_FIND_RIGHT));

 /*
  * These are the pointer type-equivalency mappings. 
  * (Used by the SWIG pointer type-checker).
 /*
  * These are the pointer type-equivalency mappings. 
  * (Used by the SWIG pointer type-checker).


@@ -4054,6 +4521,7 @@ SWIGEXPORT(void,initcontrols2c)() {
         SWIG_RegisterMapping("_wxIndividualLayoutConstraint","_class_wxIndividualLayoutConstraint",0);
         SWIG_RegisterMapping("_wxCursor","_class_wxCursor",0);
         SWIG_RegisterMapping("_class_wxTreeCtrl","_wxTreeCtrl",0);
         SWIG_RegisterMapping("_wxIndividualLayoutConstraint","_class_wxIndividualLayoutConstraint",0);
         SWIG_RegisterMapping("_wxCursor","_class_wxCursor",0);
         SWIG_RegisterMapping("_class_wxTreeCtrl","_wxTreeCtrl",0);

+        SWIG_RegisterMapping("_wxToolTip","_class_wxToolTip",0);

         SWIG_RegisterMapping("_wxMask","_class_wxMask",0);
         SWIG_RegisterMapping("_wxPyMenu","_class_wxPyMenu",0);
         SWIG_RegisterMapping("_wxPen","_class_wxPen",0);
         SWIG_RegisterMapping("_wxMask","_class_wxMask",0);
         SWIG_RegisterMapping("_wxPyMenu","_class_wxPyMenu",0);
         SWIG_RegisterMapping("_wxPen","_class_wxPen",0);


@@ -4065,6 +4533,7 @@ SWIGEXPORT(void,initcontrols2c)() {
         SWIG_RegisterMapping("_long","_wxDash",0);
         SWIG_RegisterMapping("_long","_unsigned_long",0);
         SWIG_RegisterMapping("_long","_signed_long",0);
         SWIG_RegisterMapping("_long","_wxDash",0);
         SWIG_RegisterMapping("_long","_unsigned_long",0);
         SWIG_RegisterMapping("_long","_signed_long",0);

+        SWIG_RegisterMapping("_wxImageList","_class_wxImageList",0);

         SWIG_RegisterMapping("_wxDropFilesEvent","_class_wxDropFilesEvent",0);
         SWIG_RegisterMapping("_wxBitmapButton","_class_wxBitmapButton",0);
         SWIG_RegisterMapping("_class_wxAcceleratorTable","_wxAcceleratorTable",0);
         SWIG_RegisterMapping("_wxDropFilesEvent","_class_wxDropFilesEvent",0);
         SWIG_RegisterMapping("_wxBitmapButton","_class_wxBitmapButton",0);
         SWIG_RegisterMapping("_class_wxAcceleratorTable","_wxAcceleratorTable",0);


@@ -4081,6 +4550,7 @@ SWIGEXPORT(void,initcontrols2c)() {
         SWIG_RegisterMapping("_wxInitDialogEvent","_class_wxInitDialogEvent",0);
         SWIG_RegisterMapping("_wxCheckBox","_class_wxCheckBox",0);
         SWIG_RegisterMapping("_wxTextCtrl","_class_wxTextCtrl",0);
         SWIG_RegisterMapping("_wxInitDialogEvent","_class_wxInitDialogEvent",0);
         SWIG_RegisterMapping("_wxCheckBox","_class_wxCheckBox",0);
         SWIG_RegisterMapping("_wxTextCtrl","_class_wxTextCtrl",0);

+        SWIG_RegisterMapping("_class_wxToolTip","_wxToolTip",0);

         SWIG_RegisterMapping("_class_wxMask","_wxMask",0);
         SWIG_RegisterMapping("_class_wxKeyEvent","_wxKeyEvent",0);
         SWIG_RegisterMapping("_wxColour","_class_wxColour",0);
         SWIG_RegisterMapping("_class_wxMask","_wxMask",0);
         SWIG_RegisterMapping("_class_wxKeyEvent","_wxKeyEvent",0);
         SWIG_RegisterMapping("_wxColour","_class_wxColour",0);


@@ -4208,6 +4678,7 @@ SWIGEXPORT(void,initcontrols2c)() {
         SWIG_RegisterMapping("_wxJoystickEvent","_class_wxJoystickEvent",0);
         SWIG_RegisterMapping("_class_wxChoice","_wxChoice",0);
         SWIG_RegisterMapping("_class_wxSlider","_wxSlider",0);
         SWIG_RegisterMapping("_wxJoystickEvent","_class_wxJoystickEvent",0);
         SWIG_RegisterMapping("_class_wxChoice","_wxChoice",0);
         SWIG_RegisterMapping("_class_wxSlider","_wxSlider",0);

+        SWIG_RegisterMapping("_class_wxImageList","_wxImageList",0);

         SWIG_RegisterMapping("_class_wxBitmapButton","_wxBitmapButton",0);
         SWIG_RegisterMapping("_wxWindowID","_EBool",0);
         SWIG_RegisterMapping("_wxWindowID","_uint",0);
         SWIG_RegisterMapping("_class_wxBitmapButton","_wxBitmapButton",0);
         SWIG_RegisterMapping("_wxWindowID","_EBool",0);
         SWIG_RegisterMapping("_wxWindowID","_uint",0);

diff --git a/utils/wxPython/src/msw/controls2.py b/utils/wxPython/src/msw/controls2.py
index 1c90b543c50015a15ffb56d199002bd36b55703d..cf1ff4a4fa65d937062ff3cc520b27aeef4f93a0 100644 (file)
--- a/utils/wxPython/src/msw/controls2.py
+++ b/utils/wxPython/src/msw/controls2.py
@@ -190,6 +190,7 @@ class wxListCtrlPtr(wxControlPtr):
         return val
     def GetImageList(self,arg0):
         val = controls2c.wxListCtrl_GetImageList(self.this,arg0)
         return val
     def GetImageList(self,arg0):
         val = controls2c.wxListCtrl_GetImageList(self.this,arg0)

+        val = wxImageListPtr(val)

         return val
     def GetItemData(self,arg0):
         val = controls2c.wxListCtrl_GetItemData(self.this,arg0)
         return val
     def GetItemData(self,arg0):
         val = controls2c.wxListCtrl_GetItemData(self.this,arg0)


@@ -272,13 +273,13 @@ class wxListCtrlPtr(wxControlPtr):
         val = controls2c.wxListCtrl_SetColumnWidth(self.this,arg0,arg1)
         return val
     def SetImageList(self,arg0,arg1):
         val = controls2c.wxListCtrl_SetColumnWidth(self.this,arg0,arg1)
         return val
     def SetImageList(self,arg0,arg1):

-        val = controls2c.wxListCtrl_SetImageList(self.this,arg0,arg1)
+        val = controls2c.wxListCtrl_SetImageList(self.this,arg0.this,arg1)

         return val
     def SetItem(self,arg0):
         val = controls2c.wxListCtrl_SetItem(self.this,arg0.this)
         return val
         return val
     def SetItem(self,arg0):
         val = controls2c.wxListCtrl_SetItem(self.this,arg0.this)
         return val

-    def SetItemString(self,arg0,arg1,arg2,*args):
-        val = apply(controls2c.wxListCtrl_SetItemString,(self.this,arg0,arg1,arg2,)+args)
+    def SetStringItem(self,arg0,arg1,arg2,*args):
+        val = apply(controls2c.wxListCtrl_SetStringItem,(self.this,arg0,arg1,arg2,)+args)

         return val
     def SetItemData(self,arg0,arg1):
         val = controls2c.wxListCtrl_SetItemData(self.this,arg0,arg1)
         return val
     def SetItemData(self,arg0,arg1):
         val = controls2c.wxListCtrl_SetItemData(self.this,arg0,arg1)


@@ -411,15 +412,17 @@ class wxTreeCtrlPtr(wxControlPtr):
         return val
     def GetImageList(self):
         val = controls2c.wxTreeCtrl_GetImageList(self.this)
         return val
     def GetImageList(self):
         val = controls2c.wxTreeCtrl_GetImageList(self.this)

+        val = wxImageListPtr(val)

         return val
     def GetStateImageList(self):
         val = controls2c.wxTreeCtrl_GetStateImageList(self.this)
         return val
     def GetStateImageList(self):
         val = controls2c.wxTreeCtrl_GetStateImageList(self.this)

+        val = wxImageListPtr(val)

         return val
     def SetImageList(self,arg0):
         return val
     def SetImageList(self,arg0):

-        val = controls2c.wxTreeCtrl_SetImageList(self.this,arg0)
+        val = controls2c.wxTreeCtrl_SetImageList(self.this,arg0.this)

         return val
     def SetStateImageList(self,arg0):
         return val
     def SetStateImageList(self,arg0):

-        val = controls2c.wxTreeCtrl_SetStateImageList(self.this,arg0)
+        val = controls2c.wxTreeCtrl_SetStateImageList(self.this,arg0.this)

         return val
     def GetItemText(self,arg0):
         val = controls2c.wxTreeCtrl_GetItemText(self.this,arg0.this)
         return val
     def GetItemText(self,arg0):
         val = controls2c.wxTreeCtrl_GetItemText(self.this,arg0.this)


@@ -623,3 +626,45 @@ class wxTreeCtrl(wxTreeCtrlPtr):
 
 #-------------- VARIABLE WRAPPERS ------------------
 
 
 #-------------- VARIABLE WRAPPERS ------------------
 

+wxLIST_MASK_TEXT = controls2c.wxLIST_MASK_TEXT
+wxLIST_MASK_IMAGE = controls2c.wxLIST_MASK_IMAGE
+wxLIST_MASK_DATA = controls2c.wxLIST_MASK_DATA
+wxLIST_MASK_WIDTH = controls2c.wxLIST_MASK_WIDTH
+wxLIST_MASK_FORMAT = controls2c.wxLIST_MASK_FORMAT
+wxLIST_STATE_DONTCARE = controls2c.wxLIST_STATE_DONTCARE
+wxLIST_STATE_DROPHILITED = controls2c.wxLIST_STATE_DROPHILITED
+wxLIST_STATE_FOCUSED = controls2c.wxLIST_STATE_FOCUSED
+wxLIST_STATE_SELECTED = controls2c.wxLIST_STATE_SELECTED
+wxLIST_STATE_CUT = controls2c.wxLIST_STATE_CUT
+wxLIST_HITTEST_ABOVE = controls2c.wxLIST_HITTEST_ABOVE
+wxLIST_HITTEST_BELOW = controls2c.wxLIST_HITTEST_BELOW
+wxLIST_HITTEST_NOWHERE = controls2c.wxLIST_HITTEST_NOWHERE
+wxLIST_HITTEST_ONITEMICON = controls2c.wxLIST_HITTEST_ONITEMICON
+wxLIST_HITTEST_ONITEMLABEL = controls2c.wxLIST_HITTEST_ONITEMLABEL
+wxLIST_HITTEST_ONITEMRIGHT = controls2c.wxLIST_HITTEST_ONITEMRIGHT
+wxLIST_HITTEST_ONITEMSTATEICON = controls2c.wxLIST_HITTEST_ONITEMSTATEICON
+wxLIST_HITTEST_TOLEFT = controls2c.wxLIST_HITTEST_TOLEFT
+wxLIST_HITTEST_TORIGHT = controls2c.wxLIST_HITTEST_TORIGHT
+wxLIST_HITTEST_ONITEM = controls2c.wxLIST_HITTEST_ONITEM
+wxLIST_NEXT_ABOVE = controls2c.wxLIST_NEXT_ABOVE
+wxLIST_NEXT_ALL = controls2c.wxLIST_NEXT_ALL
+wxLIST_NEXT_BELOW = controls2c.wxLIST_NEXT_BELOW
+wxLIST_NEXT_LEFT = controls2c.wxLIST_NEXT_LEFT
+wxLIST_NEXT_RIGHT = controls2c.wxLIST_NEXT_RIGHT
+wxLIST_ALIGN_DEFAULT = controls2c.wxLIST_ALIGN_DEFAULT
+wxLIST_ALIGN_LEFT = controls2c.wxLIST_ALIGN_LEFT
+wxLIST_ALIGN_TOP = controls2c.wxLIST_ALIGN_TOP
+wxLIST_ALIGN_SNAP_TO_GRID = controls2c.wxLIST_ALIGN_SNAP_TO_GRID
+wxLIST_FORMAT_LEFT = controls2c.wxLIST_FORMAT_LEFT
+wxLIST_FORMAT_RIGHT = controls2c.wxLIST_FORMAT_RIGHT
+wxLIST_FORMAT_CENTRE = controls2c.wxLIST_FORMAT_CENTRE
+wxLIST_FORMAT_CENTER = controls2c.wxLIST_FORMAT_CENTER
+wxLIST_AUTOSIZE = controls2c.wxLIST_AUTOSIZE
+wxLIST_AUTOSIZE_USEHEADER = controls2c.wxLIST_AUTOSIZE_USEHEADER
+wxLIST_RECT_BOUNDS = controls2c.wxLIST_RECT_BOUNDS
+wxLIST_RECT_ICON = controls2c.wxLIST_RECT_ICON
+wxLIST_RECT_LABEL = controls2c.wxLIST_RECT_LABEL
+wxLIST_FIND_UP = controls2c.wxLIST_FIND_UP
+wxLIST_FIND_DOWN = controls2c.wxLIST_FIND_DOWN
+wxLIST_FIND_LEFT = controls2c.wxLIST_FIND_LEFT
+wxLIST_FIND_RIGHT = controls2c.wxLIST_FIND_RIGHT

diff --git a/utils/wxPython/src/msw/events.cpp b/utils/wxPython/src/msw/events.cpp
index 341c196786f241ac1b15b209d939f9c34417721d..cd4504a43f226e50f9c597352306874f2cc02359 100644 (file)
--- a/utils/wxPython/src/msw/events.cpp
+++ b/utils/wxPython/src/msw/events.cpp
@@ -2649,6 +2649,7 @@ SWIGEXPORT(void,initeventsc)() {
         SWIG_RegisterMapping("_class_wxRegionIterator","_wxRegionIterator",0);
         SWIG_RegisterMapping("_wxPaintEvent","_class_wxPaintEvent",0);
         SWIG_RegisterMapping("_wxIndividualLayoutConstraint","_class_wxIndividualLayoutConstraint",0);
         SWIG_RegisterMapping("_class_wxRegionIterator","_wxRegionIterator",0);
         SWIG_RegisterMapping("_wxPaintEvent","_class_wxPaintEvent",0);
         SWIG_RegisterMapping("_wxIndividualLayoutConstraint","_class_wxIndividualLayoutConstraint",0);

+        SWIG_RegisterMapping("_wxToolTip","_class_wxToolTip",0);

         SWIG_RegisterMapping("_wxUpdateUIEvent","_class_wxUpdateUIEvent",0);
         SWIG_RegisterMapping("_byte","_unsigned_char",0);
         SWIG_RegisterMapping("_long","_unsigned_long",0);
         SWIG_RegisterMapping("_wxUpdateUIEvent","_class_wxUpdateUIEvent",0);
         SWIG_RegisterMapping("_byte","_unsigned_char",0);
         SWIG_RegisterMapping("_long","_unsigned_long",0);


@@ -2660,6 +2661,7 @@ SWIGEXPORT(void,initeventsc)() {
         SWIG_RegisterMapping("_class_wxPaintEvent","_wxPaintEvent",0);
         SWIG_RegisterMapping("_wxSysColourChangedEvent","_class_wxSysColourChangedEvent",0);
         SWIG_RegisterMapping("_wxInitDialogEvent","_class_wxInitDialogEvent",0);
         SWIG_RegisterMapping("_class_wxPaintEvent","_wxPaintEvent",0);
         SWIG_RegisterMapping("_wxSysColourChangedEvent","_class_wxSysColourChangedEvent",0);
         SWIG_RegisterMapping("_wxInitDialogEvent","_class_wxInitDialogEvent",0);

+        SWIG_RegisterMapping("_class_wxToolTip","_wxToolTip",0);

         SWIG_RegisterMapping("_class_wxKeyEvent","_wxKeyEvent",0);
         SWIG_RegisterMapping("_wxIdleEvent","_class_wxIdleEvent",0);
         SWIG_RegisterMapping("_class_wxUpdateUIEvent","_wxUpdateUIEvent",0);
         SWIG_RegisterMapping("_class_wxKeyEvent","_wxKeyEvent",0);
         SWIG_RegisterMapping("_wxIdleEvent","_class_wxIdleEvent",0);
         SWIG_RegisterMapping("_class_wxUpdateUIEvent","_wxUpdateUIEvent",0);

diff --git a/utils/wxPython/src/msw/frames.cpp b/utils/wxPython/src/msw/frames.cpp
index 8bfd4884aa2e08df24f424d476667943d06f2207..a893212bea449d1b78d80842207b8673553dfc4a 100644 (file)
--- a/utils/wxPython/src/msw/frames.cpp
+++ b/utils/wxPython/src/msw/frames.cpp
@@ -828,6 +828,7 @@ SWIGEXPORT(void,initframesc)() {
         SWIG_RegisterMapping("_wxPaintEvent","_class_wxPaintEvent",0);
         SWIG_RegisterMapping("_wxIndividualLayoutConstraint","_class_wxIndividualLayoutConstraint",0);
         SWIG_RegisterMapping("_wxCursor","_class_wxCursor",0);
         SWIG_RegisterMapping("_wxPaintEvent","_class_wxPaintEvent",0);
         SWIG_RegisterMapping("_wxIndividualLayoutConstraint","_class_wxIndividualLayoutConstraint",0);
         SWIG_RegisterMapping("_wxCursor","_class_wxCursor",0);

+        SWIG_RegisterMapping("_wxToolTip","_class_wxToolTip",0);

         SWIG_RegisterMapping("_wxMask","_class_wxMask",0);
         SWIG_RegisterMapping("_wxPyMenu","_class_wxPyMenu",0);
         SWIG_RegisterMapping("_wxPen","_class_wxPen",0);
         SWIG_RegisterMapping("_wxMask","_class_wxMask",0);
         SWIG_RegisterMapping("_wxPyMenu","_class_wxPyMenu",0);
         SWIG_RegisterMapping("_wxPen","_class_wxPen",0);


@@ -839,6 +840,7 @@ SWIGEXPORT(void,initframesc)() {
         SWIG_RegisterMapping("_long","_wxDash",0);
         SWIG_RegisterMapping("_long","_unsigned_long",0);
         SWIG_RegisterMapping("_long","_signed_long",0);
         SWIG_RegisterMapping("_long","_wxDash",0);
         SWIG_RegisterMapping("_long","_unsigned_long",0);
         SWIG_RegisterMapping("_long","_signed_long",0);

+        SWIG_RegisterMapping("_wxImageList","_class_wxImageList",0);

         SWIG_RegisterMapping("_wxDropFilesEvent","_class_wxDropFilesEvent",0);
         SWIG_RegisterMapping("_wxBitmapButton","_class_wxBitmapButton",0);
         SWIG_RegisterMapping("_class_wxAcceleratorTable","_wxAcceleratorTable",0);
         SWIG_RegisterMapping("_wxDropFilesEvent","_class_wxDropFilesEvent",0);
         SWIG_RegisterMapping("_wxBitmapButton","_class_wxBitmapButton",0);
         SWIG_RegisterMapping("_class_wxAcceleratorTable","_wxAcceleratorTable",0);


@@ -855,6 +857,7 @@ SWIGEXPORT(void,initframesc)() {
         SWIG_RegisterMapping("_wxInitDialogEvent","_class_wxInitDialogEvent",0);
         SWIG_RegisterMapping("_wxCheckBox","_class_wxCheckBox",0);
         SWIG_RegisterMapping("_wxTextCtrl","_class_wxTextCtrl",0);
         SWIG_RegisterMapping("_wxInitDialogEvent","_class_wxInitDialogEvent",0);
         SWIG_RegisterMapping("_wxCheckBox","_class_wxCheckBox",0);
         SWIG_RegisterMapping("_wxTextCtrl","_class_wxTextCtrl",0);

+        SWIG_RegisterMapping("_class_wxToolTip","_wxToolTip",0);

         SWIG_RegisterMapping("_class_wxMask","_wxMask",0);
         SWIG_RegisterMapping("_class_wxKeyEvent","_wxKeyEvent",0);
         SWIG_RegisterMapping("_wxColour","_class_wxColour",0);
         SWIG_RegisterMapping("_class_wxMask","_wxMask",0);
         SWIG_RegisterMapping("_class_wxKeyEvent","_wxKeyEvent",0);
         SWIG_RegisterMapping("_wxColour","_class_wxColour",0);


@@ -970,6 +973,7 @@ SWIGEXPORT(void,initframesc)() {
         SWIG_RegisterMapping("_wxJoystickEvent","_class_wxJoystickEvent",0);
         SWIG_RegisterMapping("_class_wxChoice","_wxChoice",0);
         SWIG_RegisterMapping("_class_wxSlider","_wxSlider",0);
         SWIG_RegisterMapping("_wxJoystickEvent","_class_wxJoystickEvent",0);
         SWIG_RegisterMapping("_class_wxChoice","_wxChoice",0);
         SWIG_RegisterMapping("_class_wxSlider","_wxSlider",0);

+        SWIG_RegisterMapping("_class_wxImageList","_wxImageList",0);

         SWIG_RegisterMapping("_class_wxBitmapButton","_wxBitmapButton",0);
         SWIG_RegisterMapping("_wxFrame","_class_wxMiniFrame",SwigwxMiniFrameTowxFrame);
         SWIG_RegisterMapping("_wxFrame","_wxMiniFrame",SwigwxMiniFrameTowxFrame);
         SWIG_RegisterMapping("_class_wxBitmapButton","_wxBitmapButton",0);
         SWIG_RegisterMapping("_wxFrame","_class_wxMiniFrame",SwigwxMiniFrameTowxFrame);
         SWIG_RegisterMapping("_wxFrame","_wxMiniFrame",SwigwxMiniFrameTowxFrame);

diff --git a/utils/wxPython/src/msw/gdi.cpp b/utils/wxPython/src/msw/gdi.cpp
index b0308a0834da0ff6b97680983a6b534eb5514d2e..9d4eb20f02007719cf05d99155886200e62d0757 100644 (file)
--- a/utils/wxPython/src/msw/gdi.cpp
+++ b/utils/wxPython/src/msw/gdi.cpp
@@ -55,6 +55,7 @@ extern PyObject *SWIG_newvarlink(void);
 
 #include "helpers.h"
 #include <wx/metafile.h>
 
 #include "helpers.h"
 #include <wx/metafile.h>

+#include <wx/imaglist.h>

 #ifndef __WXMSW__
 #include <wx/dcps.h>
 #endif
 #ifndef __WXMSW__
 #include <wx/dcps.h>
 #endif


@@ -144,6 +145,8 @@ static char* wxStringErrorMsg = "string type is required for parameter";
     wxMemoryDC* wxMemoryDCFromDC(wxDC* oldDC) {
         return new wxMemoryDC(oldDC);
     }
     wxMemoryDC* wxMemoryDCFromDC(wxDC* oldDC) {
         return new wxMemoryDC(oldDC);
     }

+
+#if 0

 extern wxFont * wxNORMAL_FONT; 
 extern wxFont * wxSMALL_FONT; 
 extern wxFont * wxITALIC_FONT; 
 extern wxFont * wxNORMAL_FONT; 
 extern wxFont * wxSMALL_FONT; 
 extern wxFont * wxITALIC_FONT; 


@@ -186,6 +189,8 @@ extern wxBrush  wxNullBrush;
 extern wxPalette  wxNullPalette; 
 extern wxFont  wxNullFont; 
 extern wxColour  wxNullColour; 
 extern wxPalette  wxNullPalette; 
 extern wxFont  wxNullFont; 
 extern wxColour  wxNullColour; 

+
+#endif

 static PyObject *_wrap_wxEmptyBitmap(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxBitmap * _result;
 static PyObject *_wrap_wxEmptyBitmap(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxBitmap * _result;


@@ -3850,8 +3855,62 @@ static PyObject *_wrap_wxDC_GetTextBackground(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
     return _resultobj;
 }
 

-#define wxDC_GetTextExtent(_swigobj,_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4)  (_swigobj->GetTextExtent(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4))
+#define wxDC_GetTextExtent(_swigobj,_swigarg0,_swigarg1,_swigarg2)  (_swigobj->GetTextExtent(_swigarg0,_swigarg1,_swigarg2))

 static PyObject *_wrap_wxDC_GetTextExtent(PyObject *self, PyObject *args) {
 static PyObject *_wrap_wxDC_GetTextExtent(PyObject *self, PyObject *args) {

+    PyObject * _resultobj;
+    wxDC * _arg0;
+    wxString * _arg1;
+    long * _arg2;
+    long  temp;
+    long * _arg3;
+    long  temp0;
+    char * _argc0 = 0;
+    PyObject * _obj1 = 0;
+
+    self = self;
+{
+  _arg2 = &temp;
+}
+{
+  _arg3 = &temp0;
+}
+    if(!PyArg_ParseTuple(args,"sO:wxDC_GetTextExtent",&_argc0,&_obj1)) 
+        return NULL;
+    if (_argc0) {
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxDC_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_GetTextExtent. Expected _wxDC_p.");
+        return NULL;
+        }
+    }
+{
+    if (!PyString_Check(_obj1)) {
+        PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
+        return NULL;
+    }
+    _arg1 = new wxString(PyString_AsString(_obj1));
+}
+    wxDC_GetTextExtent(_arg0,*_arg1,_arg2,_arg3);
+    Py_INCREF(Py_None);
+    _resultobj = Py_None;
+{
+    PyObject *o;
+    o = PyInt_FromLong((long) (*_arg2));
+    _resultobj = t_output_helper(_resultobj, o);
+}
+{
+    PyObject *o;
+    o = PyInt_FromLong((long) (*_arg3));
+    _resultobj = t_output_helper(_resultobj, o);
+}
+{
+    if (_obj1)
+        delete _arg1;
+}
+    return _resultobj;
+}
+
+#define wxDC_GetFullTextExtent(_swigobj,_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5)  (_swigobj->GetTextExtent(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5))
+static PyObject *_wrap_wxDC_GetFullTextExtent(PyObject *self, PyObject *args) {

     PyObject * _resultobj;
     wxDC * _arg0;
     wxString * _arg1;
     PyObject * _resultobj;
     wxDC * _arg0;
     wxString * _arg1;


@@ -3863,8 +3922,10 @@ static PyObject *_wrap_wxDC_GetTextExtent(PyObject *self, PyObject *args) {
     long  temp1;
     long * _arg5;
     long  temp2;
     long  temp1;
     long * _arg5;
     long  temp2;

+    wxFont * _arg6 = NULL;

     char * _argc0 = 0;
     PyObject * _obj1 = 0;
     char * _argc0 = 0;
     PyObject * _obj1 = 0;

+    char * _argc6 = 0;

 
     self = self;
 {
 
     self = self;
 {


@@ -3879,11 +3940,11 @@ static PyObject *_wrap_wxDC_GetTextExtent(PyObject *self, PyObject *args) {
 {
   _arg5 = &temp2;
 }
 {
   _arg5 = &temp2;
 }

-    if(!PyArg_ParseTuple(args,"sO:wxDC_GetTextExtent",&_argc0,&_obj1)) 
+    if(!PyArg_ParseTuple(args,"sO|s:wxDC_GetFullTextExtent",&_argc0,&_obj1,&_argc6)) 

         return NULL;
     if (_argc0) {
         if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxDC_p")) {
         return NULL;
     if (_argc0) {
         if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxDC_p")) {

-            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_GetTextExtent. Expected _wxDC_p.");
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_GetFullTextExtent. Expected _wxDC_p.");

         return NULL;
         }
     }
         return NULL;
         }
     }


@@ -3894,7 +3955,13 @@ static PyObject *_wrap_wxDC_GetTextExtent(PyObject *self, PyObject *args) {
     }
     _arg1 = new wxString(PyString_AsString(_obj1));
 }
     }
     _arg1 = new wxString(PyString_AsString(_obj1));
 }

-    wxDC_GetTextExtent(_arg0,*_arg1,_arg2,_arg3,_arg4,_arg5);
+    if (_argc6) {
+        if (SWIG_GetPtr(_argc6,(void **) &_arg6,"_wxFont_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 7 of wxDC_GetFullTextExtent. Expected _wxFont_p.");
+        return NULL;
+        }
+    }
+    wxDC_GetFullTextExtent(_arg0,*_arg1,_arg2,_arg3,_arg4,_arg5,_arg6);

     Py_INCREF(Py_None);
     _resultobj = Py_None;
 {
     Py_INCREF(Py_None);
     _resultobj = Py_None;
 {


@@ -5141,7 +5208,331 @@ static PyObject *_wrap_wxPalette_Ok(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
     return _resultobj;
 }
 

+#define new_wxImageList(_swigarg0,_swigarg1,_swigarg2,_swigarg3) (new wxImageList(_swigarg0,_swigarg1,_swigarg2,_swigarg3))
+static PyObject *_wrap_new_wxImageList(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    wxImageList * _result;
+    int  _arg0;
+    int  _arg1;
+    bool  _arg2 = (1);
+    int  _arg3 = 1;
+    int tempbool2;
+    char _ptemp[128];
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"ii|ii:new_wxImageList",&_arg0,&_arg1,&tempbool2,&_arg3)) 
+        return NULL;
+    _arg2 = (bool ) tempbool2;
+    _result = (wxImageList *)new_wxImageList(_arg0,_arg1,_arg2,_arg3);
+    SWIG_MakePtr(_ptemp, (char *) _result,"_wxImageList_p");
+    _resultobj = Py_BuildValue("s",_ptemp);
+    return _resultobj;
+}
+
+#define delete_wxImageList(_swigobj) (delete _swigobj)
+static PyObject *_wrap_delete_wxImageList(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    wxImageList * _arg0;
+    char * _argc0 = 0;
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"s:delete_wxImageList",&_argc0)) 
+        return NULL;
+    if (_argc0) {
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxImageList_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of delete_wxImageList. Expected _wxImageList_p.");
+        return NULL;
+        }
+    }
+    delete_wxImageList(_arg0);
+    Py_INCREF(Py_None);
+    _resultobj = Py_None;
+    return _resultobj;
+}
+
+#define wxImageList_Add(_swigobj,_swigarg0,_swigarg1)  (_swigobj->Add(_swigarg0,_swigarg1))
+static PyObject *_wrap_wxImageList_Add(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    int  _result;
+    wxImageList * _arg0;
+    wxBitmap * _arg1;
+    wxBitmap * _arg2 = &wxNullBitmap;
+    char * _argc0 = 0;
+    char * _argc1 = 0;
+    char * _argc2 = 0;
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"ss|s:wxImageList_Add",&_argc0,&_argc1,&_argc2)) 
+        return NULL;
+    if (_argc0) {
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxImageList_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxImageList_Add. Expected _wxImageList_p.");
+        return NULL;
+        }
+    }
+    if (_argc1) {
+        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxBitmap_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxImageList_Add. Expected _wxBitmap_p.");
+        return NULL;
+        }
+    }
+    if (_argc2) {
+        if (SWIG_GetPtr(_argc2,(void **) &_arg2,"_wxBitmap_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of wxImageList_Add. Expected _wxBitmap_p.");
+        return NULL;
+        }
+    }
+    _result = (int )wxImageList_Add(_arg0,*_arg1,*_arg2);
+    _resultobj = Py_BuildValue("i",_result);
+    return _resultobj;
+}
+
+#define wxImageList_AddWithColourMask(_swigobj,_swigarg0,_swigarg1)  (_swigobj->Add(_swigarg0,_swigarg1))
+static PyObject *_wrap_wxImageList_AddWithColourMask(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    int  _result;
+    wxImageList * _arg0;
+    wxBitmap * _arg1;
+    wxColour * _arg2;
+    char * _argc0 = 0;
+    char * _argc1 = 0;
+    char * _argc2 = 0;
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"sss:wxImageList_AddWithColourMask",&_argc0,&_argc1,&_argc2)) 
+        return NULL;
+    if (_argc0) {
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxImageList_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxImageList_AddWithColourMask. Expected _wxImageList_p.");
+        return NULL;
+        }
+    }
+    if (_argc1) {
+        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxBitmap_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxImageList_AddWithColourMask. Expected _wxBitmap_p.");
+        return NULL;
+        }
+    }
+    if (_argc2) {
+        if (SWIG_GetPtr(_argc2,(void **) &_arg2,"_wxColour_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of wxImageList_AddWithColourMask. Expected _wxColour_p.");
+        return NULL;
+        }
+    }
+    _result = (int )wxImageList_AddWithColourMask(_arg0,*_arg1,*_arg2);
+    _resultobj = Py_BuildValue("i",_result);
+    return _resultobj;
+}
+
+#define wxImageList_AddIcon(_swigobj,_swigarg0)  (_swigobj->Add(_swigarg0))
+static PyObject *_wrap_wxImageList_AddIcon(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    int  _result;
+    wxImageList * _arg0;
+    wxIcon * _arg1;
+    char * _argc0 = 0;
+    char * _argc1 = 0;
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"ss:wxImageList_AddIcon",&_argc0,&_argc1)) 
+        return NULL;
+    if (_argc0) {
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxImageList_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxImageList_AddIcon. Expected _wxImageList_p.");
+        return NULL;
+        }
+    }
+    if (_argc1) {
+        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxIcon_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxImageList_AddIcon. Expected _wxIcon_p.");
+        return NULL;
+        }
+    }
+    _result = (int )wxImageList_AddIcon(_arg0,*_arg1);
+    _resultobj = Py_BuildValue("i",_result);
+    return _resultobj;
+}
+
+#define wxImageList_Draw(_swigobj,_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5)  (_swigobj->Draw(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5))
+static PyObject *_wrap_wxImageList_Draw(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    bool  _result;
+    wxImageList * _arg0;
+    int  _arg1;
+    wxDC * _arg2;
+    int  _arg3;
+    int  _arg4;
+    int  _arg5 = (wxIMAGELIST_DRAW_NORMAL);
+    bool  _arg6 = (0);
+    char * _argc0 = 0;
+    char * _argc2 = 0;
+    int tempbool6;
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"sisii|ii:wxImageList_Draw",&_argc0,&_arg1,&_argc2,&_arg3,&_arg4,&_arg5,&tempbool6)) 
+        return NULL;
+    if (_argc0) {
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxImageList_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxImageList_Draw. Expected _wxImageList_p.");
+        return NULL;
+        }
+    }
+    if (_argc2) {
+        if (SWIG_GetPtr(_argc2,(void **) &_arg2,"_wxDC_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of wxImageList_Draw. Expected _wxDC_p.");
+        return NULL;
+        }
+    }
+    _arg6 = (bool ) tempbool6;
+    _result = (bool )wxImageList_Draw(_arg0,_arg1,*_arg2,_arg3,_arg4,_arg5,_arg6);
+    _resultobj = Py_BuildValue("i",_result);
+    return _resultobj;
+}
+
+#define wxImageList_GetImageCount(_swigobj)  (_swigobj->GetImageCount())
+static PyObject *_wrap_wxImageList_GetImageCount(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    int  _result;
+    wxImageList * _arg0;
+    char * _argc0 = 0;
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"s:wxImageList_GetImageCount",&_argc0)) 
+        return NULL;
+    if (_argc0) {
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxImageList_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxImageList_GetImageCount. Expected _wxImageList_p.");
+        return NULL;
+        }
+    }
+    _result = (int )wxImageList_GetImageCount(_arg0);
+    _resultobj = Py_BuildValue("i",_result);
+    return _resultobj;
+}
+
+#define wxImageList_Remove(_swigobj,_swigarg0)  (_swigobj->Remove(_swigarg0))
+static PyObject *_wrap_wxImageList_Remove(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    bool  _result;
+    wxImageList * _arg0;
+    int  _arg1;
+    char * _argc0 = 0;
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"si:wxImageList_Remove",&_argc0,&_arg1)) 
+        return NULL;
+    if (_argc0) {
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxImageList_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxImageList_Remove. Expected _wxImageList_p.");
+        return NULL;
+        }
+    }
+    _result = (bool )wxImageList_Remove(_arg0,_arg1);
+    _resultobj = Py_BuildValue("i",_result);
+    return _resultobj;
+}
+
+#define wxImageList_RemoveAll(_swigobj)  (_swigobj->RemoveAll())
+static PyObject *_wrap_wxImageList_RemoveAll(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    bool  _result;
+    wxImageList * _arg0;
+    char * _argc0 = 0;
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"s:wxImageList_RemoveAll",&_argc0)) 
+        return NULL;
+    if (_argc0) {
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxImageList_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxImageList_RemoveAll. Expected _wxImageList_p.");
+        return NULL;
+        }
+    }
+    _result = (bool )wxImageList_RemoveAll(_arg0);
+    _resultobj = Py_BuildValue("i",_result);
+    return _resultobj;
+}
+
+#define wxImageList_Replace(_swigobj,_swigarg0,_swigarg1,_swigarg2)  (_swigobj->Replace(_swigarg0,_swigarg1,_swigarg2))
+static PyObject *_wrap_wxImageList_Replace(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    bool  _result;
+    wxImageList * _arg0;
+    int  _arg1;
+    wxBitmap * _arg2;
+    wxBitmap * _arg3 = &wxNullBitmap;
+    char * _argc0 = 0;
+    char * _argc2 = 0;
+    char * _argc3 = 0;
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"sis|s:wxImageList_Replace",&_argc0,&_arg1,&_argc2,&_argc3)) 
+        return NULL;
+    if (_argc0) {
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxImageList_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxImageList_Replace. Expected _wxImageList_p.");
+        return NULL;
+        }
+    }
+    if (_argc2) {
+        if (SWIG_GetPtr(_argc2,(void **) &_arg2,"_wxBitmap_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of wxImageList_Replace. Expected _wxBitmap_p.");
+        return NULL;
+        }
+    }
+    if (_argc3) {
+        if (SWIG_GetPtr(_argc3,(void **) &_arg3,"_wxBitmap_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of wxImageList_Replace. Expected _wxBitmap_p.");
+        return NULL;
+        }
+    }
+    _result = (bool )wxImageList_Replace(_arg0,_arg1,*_arg2,*_arg3);
+    _resultobj = Py_BuildValue("i",_result);
+    return _resultobj;
+}
+
+#define wxImageList_ReplaceIcon(_swigobj,_swigarg0,_swigarg1)  (_swigobj->Replace(_swigarg0,_swigarg1))
+static PyObject *_wrap_wxImageList_ReplaceIcon(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    bool  _result;
+    wxImageList * _arg0;
+    int  _arg1;
+    wxIcon * _arg2;
+    char * _argc0 = 0;
+    char * _argc2 = 0;
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"sis:wxImageList_ReplaceIcon",&_argc0,&_arg1,&_argc2)) 
+        return NULL;
+    if (_argc0) {
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxImageList_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxImageList_ReplaceIcon. Expected _wxImageList_p.");
+        return NULL;
+        }
+    }
+    if (_argc2) {
+        if (SWIG_GetPtr(_argc2,(void **) &_arg2,"_wxIcon_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of wxImageList_ReplaceIcon. Expected _wxIcon_p.");
+        return NULL;
+        }
+    }
+    _result = (bool )wxImageList_ReplaceIcon(_arg0,_arg1,*_arg2);
+    _resultobj = Py_BuildValue("i",_result);
+    return _resultobj;
+}
+

 static PyMethodDef gdicMethods[] = {
 static PyMethodDef gdicMethods[] = {

+        { "wxImageList_ReplaceIcon", _wrap_wxImageList_ReplaceIcon, 1 },
+        { "wxImageList_Replace", _wrap_wxImageList_Replace, 1 },
+        { "wxImageList_RemoveAll", _wrap_wxImageList_RemoveAll, 1 },
+        { "wxImageList_Remove", _wrap_wxImageList_Remove, 1 },
+        { "wxImageList_GetImageCount", _wrap_wxImageList_GetImageCount, 1 },
+        { "wxImageList_Draw", _wrap_wxImageList_Draw, 1 },
+        { "wxImageList_AddIcon", _wrap_wxImageList_AddIcon, 1 },
+        { "wxImageList_AddWithColourMask", _wrap_wxImageList_AddWithColourMask, 1 },
+        { "wxImageList_Add", _wrap_wxImageList_Add, 1 },
+        { "delete_wxImageList", _wrap_delete_wxImageList, 1 },
+        { "new_wxImageList", _wrap_new_wxImageList, 1 },

         { "wxPalette_Ok", _wrap_wxPalette_Ok, 1 },
         { "wxPalette_GetRGB", _wrap_wxPalette_GetRGB, 1 },
         { "wxPalette_GetPixel", _wrap_wxPalette_GetPixel, 1 },
         { "wxPalette_Ok", _wrap_wxPalette_Ok, 1 },
         { "wxPalette_GetRGB", _wrap_wxPalette_GetRGB, 1 },
         { "wxPalette_GetPixel", _wrap_wxPalette_GetPixel, 1 },


@@ -5186,6 +5577,7 @@ static PyMethodDef gdicMethods[] = {
         { "wxDC_LogicalToDeviceXRel", _wrap_wxDC_LogicalToDeviceXRel, 1 },
         { "wxDC_LogicalToDeviceX", _wrap_wxDC_LogicalToDeviceX, 1 },
         { "wxDC_GetTextForeground", _wrap_wxDC_GetTextForeground, 1 },
         { "wxDC_LogicalToDeviceXRel", _wrap_wxDC_LogicalToDeviceXRel, 1 },
         { "wxDC_LogicalToDeviceX", _wrap_wxDC_LogicalToDeviceX, 1 },
         { "wxDC_GetTextForeground", _wrap_wxDC_GetTextForeground, 1 },

+        { "wxDC_GetFullTextExtent", _wrap_wxDC_GetFullTextExtent, 1 },

         { "wxDC_GetTextExtent", _wrap_wxDC_GetTextExtent, 1 },
         { "wxDC_GetTextBackground", _wrap_wxDC_GetTextBackground, 1 },
         { "wxDC_GetSize", _wrap_wxDC_GetSize, 1 },
         { "wxDC_GetTextExtent", _wrap_wxDC_GetTextExtent, 1 },
         { "wxDC_GetTextBackground", _wrap_wxDC_GetTextBackground, 1 },
         { "wxDC_GetSize", _wrap_wxDC_GetSize, 1 },


@@ -5363,6 +5755,13 @@ SWIGEXPORT(void,initgdic)() {
         SWIG_addvarlink(SWIG_globals,"wxNullPalette",_wrap_wxNullPalette_get, _wrap_wxNullPalette_set);
         SWIG_addvarlink(SWIG_globals,"wxNullFont",_wrap_wxNullFont_get, _wrap_wxNullFont_set);
         SWIG_addvarlink(SWIG_globals,"wxNullColour",_wrap_wxNullColour_get, _wrap_wxNullColour_set);
         SWIG_addvarlink(SWIG_globals,"wxNullPalette",_wrap_wxNullPalette_get, _wrap_wxNullPalette_set);
         SWIG_addvarlink(SWIG_globals,"wxNullFont",_wrap_wxNullFont_get, _wrap_wxNullFont_set);
         SWIG_addvarlink(SWIG_globals,"wxNullColour",_wrap_wxNullColour_get, _wrap_wxNullColour_set);

+        PyDict_SetItemString(d,"wxIMAGELIST_DRAW_NORMAL", PyInt_FromLong((long) wxIMAGELIST_DRAW_NORMAL));
+        PyDict_SetItemString(d,"wxIMAGELIST_DRAW_TRANSPARENT", PyInt_FromLong((long) wxIMAGELIST_DRAW_TRANSPARENT));
+        PyDict_SetItemString(d,"wxIMAGELIST_DRAW_SELECTED", PyInt_FromLong((long) wxIMAGELIST_DRAW_SELECTED));
+        PyDict_SetItemString(d,"wxIMAGELIST_DRAW_FOCUSED", PyInt_FromLong((long) wxIMAGELIST_DRAW_FOCUSED));
+        PyDict_SetItemString(d,"wxIMAGE_LIST_NORMAL", PyInt_FromLong((long) wxIMAGE_LIST_NORMAL));
+        PyDict_SetItemString(d,"wxIMAGE_LIST_SMALL", PyInt_FromLong((long) wxIMAGE_LIST_SMALL));
+        PyDict_SetItemString(d,"wxIMAGE_LIST_STATE", PyInt_FromLong((long) wxIMAGE_LIST_STATE));

 /*
  * These are the pointer type-equivalency mappings. 
  * (Used by the SWIG pointer type-checker).
 /*
  * These are the pointer type-equivalency mappings. 
  * (Used by the SWIG pointer type-checker).


@@ -5372,12 +5771,14 @@ SWIGEXPORT(void,initgdic)() {
         SWIG_RegisterMapping("_class_wxRegionIterator","_wxRegionIterator",0);
         SWIG_RegisterMapping("_wxIndividualLayoutConstraint","_class_wxIndividualLayoutConstraint",0);
         SWIG_RegisterMapping("_wxCursor","_class_wxCursor",0);
         SWIG_RegisterMapping("_class_wxRegionIterator","_wxRegionIterator",0);
         SWIG_RegisterMapping("_wxIndividualLayoutConstraint","_class_wxIndividualLayoutConstraint",0);
         SWIG_RegisterMapping("_wxCursor","_class_wxCursor",0);

+        SWIG_RegisterMapping("_wxToolTip","_class_wxToolTip",0);

         SWIG_RegisterMapping("_wxMask","_class_wxMask",0);
         SWIG_RegisterMapping("_wxPen","_class_wxPen",0);
         SWIG_RegisterMapping("_byte","_unsigned_char",0);
         SWIG_RegisterMapping("_long","_wxDash",0);
         SWIG_RegisterMapping("_long","_unsigned_long",0);
         SWIG_RegisterMapping("_long","_signed_long",0);
         SWIG_RegisterMapping("_wxMask","_class_wxMask",0);
         SWIG_RegisterMapping("_wxPen","_class_wxPen",0);
         SWIG_RegisterMapping("_byte","_unsigned_char",0);
         SWIG_RegisterMapping("_long","_wxDash",0);
         SWIG_RegisterMapping("_long","_unsigned_long",0);
         SWIG_RegisterMapping("_long","_signed_long",0);

+        SWIG_RegisterMapping("_wxImageList","_class_wxImageList",0);

         SWIG_RegisterMapping("_class_wxAcceleratorTable","_wxAcceleratorTable",0);
         SWIG_RegisterMapping("_wxDC","_class_wxMetaFileDC",SwigwxMetaFileDCTowxDC);
         SWIG_RegisterMapping("_wxDC","_wxMetaFileDC",SwigwxMetaFileDCTowxDC);
         SWIG_RegisterMapping("_class_wxAcceleratorTable","_wxAcceleratorTable",0);
         SWIG_RegisterMapping("_wxDC","_class_wxMetaFileDC",SwigwxMetaFileDCTowxDC);
         SWIG_RegisterMapping("_wxDC","_wxMetaFileDC",SwigwxMetaFileDCTowxDC);


@@ -5396,6 +5797,7 @@ SWIGEXPORT(void,initgdic)() {
         SWIG_RegisterMapping("_wxDC","_class_wxDC",0);
         SWIG_RegisterMapping("_class_wxRealPoint","_wxRealPoint",0);
         SWIG_RegisterMapping("_wxPrinterDC","_class_wxPrinterDC",0);
         SWIG_RegisterMapping("_wxDC","_class_wxDC",0);
         SWIG_RegisterMapping("_class_wxRealPoint","_wxRealPoint",0);
         SWIG_RegisterMapping("_wxPrinterDC","_class_wxPrinterDC",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("_class_wxMask","_wxMask",0);
         SWIG_RegisterMapping("_wxColour","_class_wxColour",0);
         SWIG_RegisterMapping("_wxBrush","_class_wxBrush",0);


@@ -5470,6 +5872,7 @@ SWIGEXPORT(void,initgdic)() {
         SWIG_RegisterMapping("_short","_WXTYPE",0);
         SWIG_RegisterMapping("_short","_unsigned_short",0);
         SWIG_RegisterMapping("_short","_signed_short",0);
         SWIG_RegisterMapping("_short","_WXTYPE",0);
         SWIG_RegisterMapping("_short","_unsigned_short",0);
         SWIG_RegisterMapping("_short","_signed_short",0);

+        SWIG_RegisterMapping("_class_wxImageList","_wxImageList",0);

         SWIG_RegisterMapping("_wxWindowID","_EBool",0);
         SWIG_RegisterMapping("_wxWindowID","_uint",0);
         SWIG_RegisterMapping("_wxWindowID","_int",0);
         SWIG_RegisterMapping("_wxWindowID","_EBool",0);
         SWIG_RegisterMapping("_wxWindowID","_uint",0);
         SWIG_RegisterMapping("_wxWindowID","_int",0);

diff --git a/utils/wxPython/src/msw/gdi.py b/utils/wxPython/src/msw/gdi.py
index 868a28711664a5d089a1a16fcf71160510e24679..841322538c577f5652a8ccf0ce0ef988b5382c91 100644 (file)
--- a/utils/wxPython/src/msw/gdi.py
+++ b/utils/wxPython/src/msw/gdi.py
@@ -474,6 +474,13 @@ class wxDCPtr :
     def GetTextExtent(self,arg0):
         val = gdic.wxDC_GetTextExtent(self.this,arg0)
         return val
     def GetTextExtent(self,arg0):
         val = gdic.wxDC_GetTextExtent(self.this,arg0)
         return val

+    def GetFullTextExtent(self,arg0,*args):
+        argl = map(None,args)
+        try: argl[0] = argl[0].this
+        except: pass
+        args = tuple(argl)
+        val = apply(gdic.wxDC_GetFullTextExtent,(self.this,arg0,)+args)
+        return val

     def GetTextForeground(self):
         val = gdic.wxDC_GetTextForeground(self.this)
         val = wxColourPtr(val)
     def GetTextForeground(self):
         val = gdic.wxDC_GetTextForeground(self.this)
         val = wxColourPtr(val)


@@ -708,6 +715,58 @@ class wxPalette(wxPalettePtr):
 
 
 
 
 
 

+class wxImageListPtr :
+    def __init__(self,this):
+        self.this = this
+        self.thisown = 0
+    def __del__(self):
+        if self.thisown == 1 :
+            gdic.delete_wxImageList(self.this)
+    def Add(self,arg0,*args):
+        argl = map(None,args)
+        try: argl[0] = argl[0].this
+        except: pass
+        args = tuple(argl)
+        val = apply(gdic.wxImageList_Add,(self.this,arg0.this,)+args)
+        return val
+    def AddWithColourMask(self,arg0,arg1):
+        val = gdic.wxImageList_AddWithColourMask(self.this,arg0.this,arg1.this)
+        return val
+    def AddIcon(self,arg0):
+        val = gdic.wxImageList_AddIcon(self.this,arg0.this)
+        return val
+    def Draw(self,arg0,arg1,arg2,arg3,*args):
+        val = apply(gdic.wxImageList_Draw,(self.this,arg0,arg1.this,arg2,arg3,)+args)
+        return val
+    def GetImageCount(self):
+        val = gdic.wxImageList_GetImageCount(self.this)
+        return val
+    def Remove(self,arg0):
+        val = gdic.wxImageList_Remove(self.this,arg0)
+        return val
+    def RemoveAll(self):
+        val = gdic.wxImageList_RemoveAll(self.this)
+        return val
+    def Replace(self,arg0,arg1,*args):
+        argl = map(None,args)
+        try: argl[0] = argl[0].this
+        except: pass
+        args = tuple(argl)
+        val = apply(gdic.wxImageList_Replace,(self.this,arg0,arg1.this,)+args)
+        return val
+    def ReplaceIcon(self,arg0,arg1):
+        val = gdic.wxImageList_ReplaceIcon(self.this,arg0,arg1.this)
+        return val
+    def __repr__(self):
+        return "<C wxImageList instance>"
+class wxImageList(wxImageListPtr):
+    def __init__(self,arg0,arg1,*args) :
+        self.this = apply(gdic.new_wxImageList,(arg0,arg1,)+args)
+        self.thisown = 1
+
+
+
+

 
 
 #-------------- FUNCTION WRAPPERS ------------------
 
 
 #-------------- FUNCTION WRAPPERS ------------------


@@ -791,5 +850,13 @@ wxNullIcon = wxIconPtr(gdic.cvar.wxNullIcon)
 wxNullCursor = wxCursorPtr(gdic.cvar.wxNullCursor)
 wxNullPen = wxPenPtr(gdic.cvar.wxNullPen)
 wxNullBrush = wxBrushPtr(gdic.cvar.wxNullBrush)
 wxNullCursor = wxCursorPtr(gdic.cvar.wxNullCursor)
 wxNullPen = wxPenPtr(gdic.cvar.wxNullPen)
 wxNullBrush = wxBrushPtr(gdic.cvar.wxNullBrush)

+wxNullPalette = wxPalettePtr(gdic.cvar.wxNullPalette)

 wxNullFont = wxFontPtr(gdic.cvar.wxNullFont)
 wxNullColour = wxColourPtr(gdic.cvar.wxNullColour)
 wxNullFont = wxFontPtr(gdic.cvar.wxNullFont)
 wxNullColour = wxColourPtr(gdic.cvar.wxNullColour)

+wxIMAGELIST_DRAW_NORMAL = gdic.wxIMAGELIST_DRAW_NORMAL
+wxIMAGELIST_DRAW_TRANSPARENT = gdic.wxIMAGELIST_DRAW_TRANSPARENT
+wxIMAGELIST_DRAW_SELECTED = gdic.wxIMAGELIST_DRAW_SELECTED
+wxIMAGELIST_DRAW_FOCUSED = gdic.wxIMAGELIST_DRAW_FOCUSED
+wxIMAGE_LIST_NORMAL = gdic.wxIMAGE_LIST_NORMAL
+wxIMAGE_LIST_SMALL = gdic.wxIMAGE_LIST_SMALL
+wxIMAGE_LIST_STATE = gdic.wxIMAGE_LIST_STATE

diff --git a/utils/wxPython/src/msw/mdi.cpp b/utils/wxPython/src/msw/mdi.cpp
index 4c4bb01d65b27860dc4d4ef130a7f6fb42239295..f63fa13fff55d148df735a19e8fd4d3cf47e9ae1 100644 (file)
--- a/utils/wxPython/src/msw/mdi.cpp
+++ b/utils/wxPython/src/msw/mdi.cpp
@@ -763,6 +763,7 @@ SWIGEXPORT(void,initmdic)() {
         SWIG_RegisterMapping("_wxPaintEvent","_class_wxPaintEvent",0);
         SWIG_RegisterMapping("_wxIndividualLayoutConstraint","_class_wxIndividualLayoutConstraint",0);
         SWIG_RegisterMapping("_wxCursor","_class_wxCursor",0);
         SWIG_RegisterMapping("_wxPaintEvent","_class_wxPaintEvent",0);
         SWIG_RegisterMapping("_wxIndividualLayoutConstraint","_class_wxIndividualLayoutConstraint",0);
         SWIG_RegisterMapping("_wxCursor","_class_wxCursor",0);

+        SWIG_RegisterMapping("_wxToolTip","_class_wxToolTip",0);

         SWIG_RegisterMapping("_wxMask","_class_wxMask",0);
         SWIG_RegisterMapping("_wxPyMenu","_class_wxPyMenu",0);
         SWIG_RegisterMapping("_wxPen","_class_wxPen",0);
         SWIG_RegisterMapping("_wxMask","_class_wxMask",0);
         SWIG_RegisterMapping("_wxPyMenu","_class_wxPyMenu",0);
         SWIG_RegisterMapping("_wxPen","_class_wxPen",0);


@@ -774,6 +775,7 @@ SWIGEXPORT(void,initmdic)() {
         SWIG_RegisterMapping("_long","_wxDash",0);
         SWIG_RegisterMapping("_long","_unsigned_long",0);
         SWIG_RegisterMapping("_long","_signed_long",0);
         SWIG_RegisterMapping("_long","_wxDash",0);
         SWIG_RegisterMapping("_long","_unsigned_long",0);
         SWIG_RegisterMapping("_long","_signed_long",0);

+        SWIG_RegisterMapping("_wxImageList","_class_wxImageList",0);

         SWIG_RegisterMapping("_wxDropFilesEvent","_class_wxDropFilesEvent",0);
         SWIG_RegisterMapping("_wxBitmapButton","_class_wxBitmapButton",0);
         SWIG_RegisterMapping("_class_wxAcceleratorTable","_wxAcceleratorTable",0);
         SWIG_RegisterMapping("_wxDropFilesEvent","_class_wxDropFilesEvent",0);
         SWIG_RegisterMapping("_wxBitmapButton","_class_wxBitmapButton",0);
         SWIG_RegisterMapping("_class_wxAcceleratorTable","_wxAcceleratorTable",0);


@@ -790,6 +792,7 @@ SWIGEXPORT(void,initmdic)() {
         SWIG_RegisterMapping("_wxInitDialogEvent","_class_wxInitDialogEvent",0);
         SWIG_RegisterMapping("_wxCheckBox","_class_wxCheckBox",0);
         SWIG_RegisterMapping("_wxTextCtrl","_class_wxTextCtrl",0);
         SWIG_RegisterMapping("_wxInitDialogEvent","_class_wxInitDialogEvent",0);
         SWIG_RegisterMapping("_wxCheckBox","_class_wxCheckBox",0);
         SWIG_RegisterMapping("_wxTextCtrl","_class_wxTextCtrl",0);

+        SWIG_RegisterMapping("_class_wxToolTip","_wxToolTip",0);

         SWIG_RegisterMapping("_class_wxMask","_wxMask",0);
         SWIG_RegisterMapping("_class_wxKeyEvent","_wxKeyEvent",0);
         SWIG_RegisterMapping("_wxColour","_class_wxColour",0);
         SWIG_RegisterMapping("_class_wxMask","_wxMask",0);
         SWIG_RegisterMapping("_class_wxKeyEvent","_wxKeyEvent",0);
         SWIG_RegisterMapping("_wxColour","_class_wxColour",0);


@@ -911,6 +914,7 @@ SWIGEXPORT(void,initmdic)() {
         SWIG_RegisterMapping("_wxJoystickEvent","_class_wxJoystickEvent",0);
         SWIG_RegisterMapping("_class_wxChoice","_wxChoice",0);
         SWIG_RegisterMapping("_class_wxSlider","_wxSlider",0);
         SWIG_RegisterMapping("_wxJoystickEvent","_class_wxJoystickEvent",0);
         SWIG_RegisterMapping("_class_wxChoice","_wxChoice",0);
         SWIG_RegisterMapping("_class_wxSlider","_wxSlider",0);

+        SWIG_RegisterMapping("_class_wxImageList","_wxImageList",0);

         SWIG_RegisterMapping("_class_wxBitmapButton","_wxBitmapButton",0);
         SWIG_RegisterMapping("_wxFrame","_class_wxMDIChildFrame",SwigwxMDIChildFrameTowxFrame);
         SWIG_RegisterMapping("_wxFrame","_wxMDIChildFrame",SwigwxMDIChildFrameTowxFrame);
         SWIG_RegisterMapping("_class_wxBitmapButton","_wxBitmapButton",0);
         SWIG_RegisterMapping("_wxFrame","_class_wxMDIChildFrame",SwigwxMDIChildFrameTowxFrame);
         SWIG_RegisterMapping("_wxFrame","_wxMDIChildFrame",SwigwxMDIChildFrameTowxFrame);

diff --git a/utils/wxPython/src/msw/misc.cpp b/utils/wxPython/src/msw/misc.cpp
index c8acb64549eb39e1d4ab09e6e91f8c4eb8c92f0d..67da894b099d2f9dfcd92f02ae97b6db991dd2ee 100644 (file)
--- a/utils/wxPython/src/msw/misc.cpp
+++ b/utils/wxPython/src/msw/misc.cpp
@@ -55,6 +55,7 @@ extern PyObject *SWIG_newvarlink(void);
 
 #include "helpers.h"
 #include <wx/resource.h>
 
 #include "helpers.h"
 #include <wx/resource.h>

+#include <wx/tooltip.h>

 
 static PyObject* l_output_helper(PyObject* target, PyObject* o) {
     PyObject*   o2;
 
 static PyObject* l_output_helper(PyObject* target, PyObject* o) {
     PyObject*   o2;


@@ -120,6 +121,14 @@ static char* wxStringErrorMsg = "string type is required for parameter";
         wxGetResource(section, entry, &retval, file);
         return retval;
     }
         wxGetResource(section, entry, &retval, file);
         return retval;
     }

+
+    void wxToolTip_Enable(bool flag) {
+        wxToolTip::Enable(flag);
+    }
+
+    void wxToolTip_SetDelay(long milliseconds) {
+        wxToolTip::SetDelay(milliseconds);
+    }

 static PyObject *_wrap_wxFileSelector(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxString * _result;
 static PyObject *_wrap_wxFileSelector(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxString * _result;


@@ -1006,8 +1015,36 @@ static PyObject *_wrap_wxResourceParseString(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
     return _resultobj;
 }
 

+static PyObject *_wrap_wxToolTip_Enable(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    bool  _arg0;
+    int tempbool0;
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"i:wxToolTip_Enable",&tempbool0)) 
+        return NULL;
+    _arg0 = (bool ) tempbool0;
+    wxToolTip_Enable(_arg0);
+    Py_INCREF(Py_None);
+    _resultobj = Py_None;
+    return _resultobj;
+}
+
+static PyObject *_wrap_wxToolTip_SetDelay(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    long  _arg0;
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"l:wxToolTip_SetDelay",&_arg0)) 
+        return NULL;
+    wxToolTip_SetDelay(_arg0);
+    Py_INCREF(Py_None);
+    _resultobj = Py_None;
+    return _resultobj;
+}
+

 #define wxSize_x_set(_swigobj,_swigval) (_swigobj->x = _swigval,_swigval)
 #define wxSize_x_set(_swigobj,_swigval) (_swigobj->x = _swigval,_swigval)

-static PyObject *_wrap_wxSize_width_set(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxSize_x_set(PyObject *self, PyObject *args) {

     PyObject * _resultobj;
     long  _result;
     wxSize * _arg0;
     PyObject * _resultobj;
     long  _result;
     wxSize * _arg0;


@@ -1015,11 +1052,11 @@ static PyObject *_wrap_wxSize_width_set(PyObject *self, PyObject *args) {
     char * _argc0 = 0;
 
     self = self;
     char * _argc0 = 0;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sl:wxSize_width_set",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"sl:wxSize_x_set",&_argc0,&_arg1)) 

         return NULL;
     if (_argc0) {
         if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxSize_p")) {
         return NULL;
     if (_argc0) {
         if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxSize_p")) {

-            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSize_width_set. Expected _wxSize_p.");
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSize_x_set. Expected _wxSize_p.");

         return NULL;
         }
     }
         return NULL;
         }
     }


@@ -1029,18 +1066,18 @@ static PyObject *_wrap_wxSize_width_set(PyObject *self, PyObject *args) {
 }
 
 #define wxSize_x_get(_swigobj) ((long ) _swigobj->x)
 }
 
 #define wxSize_x_get(_swigobj) ((long ) _swigobj->x)

-static PyObject *_wrap_wxSize_width_get(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxSize_x_get(PyObject *self, PyObject *args) {

     PyObject * _resultobj;
     long  _result;
     wxSize * _arg0;
     char * _argc0 = 0;
 
     self = self;
     PyObject * _resultobj;
     long  _result;
     wxSize * _arg0;
     char * _argc0 = 0;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxSize_width_get",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"s:wxSize_x_get",&_argc0)) 

         return NULL;
     if (_argc0) {
         if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxSize_p")) {
         return NULL;
     if (_argc0) {
         if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxSize_p")) {

-            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSize_width_get. Expected _wxSize_p.");
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSize_x_get. Expected _wxSize_p.");

         return NULL;
         }
     }
         return NULL;
         }
     }


@@ -1050,7 +1087,7 @@ static PyObject *_wrap_wxSize_width_get(PyObject *self, PyObject *args) {
 }
 
 #define wxSize_y_set(_swigobj,_swigval) (_swigobj->y = _swigval,_swigval)
 }
 
 #define wxSize_y_set(_swigobj,_swigval) (_swigobj->y = _swigval,_swigval)

-static PyObject *_wrap_wxSize_height_set(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxSize_y_set(PyObject *self, PyObject *args) {

     PyObject * _resultobj;
     long  _result;
     wxSize * _arg0;
     PyObject * _resultobj;
     long  _result;
     wxSize * _arg0;


@@ -1058,11 +1095,11 @@ static PyObject *_wrap_wxSize_height_set(PyObject *self, PyObject *args) {
     char * _argc0 = 0;
 
     self = self;
     char * _argc0 = 0;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sl:wxSize_height_set",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"sl:wxSize_y_set",&_argc0,&_arg1)) 

         return NULL;
     if (_argc0) {
         if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxSize_p")) {
         return NULL;
     if (_argc0) {
         if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxSize_p")) {

-            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSize_height_set. Expected _wxSize_p.");
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSize_y_set. Expected _wxSize_p.");

         return NULL;
         }
     }
         return NULL;
         }
     }


@@ -1072,18 +1109,18 @@ static PyObject *_wrap_wxSize_height_set(PyObject *self, PyObject *args) {
 }
 
 #define wxSize_y_get(_swigobj) ((long ) _swigobj->y)
 }
 
 #define wxSize_y_get(_swigobj) ((long ) _swigobj->y)

-static PyObject *_wrap_wxSize_height_get(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxSize_y_get(PyObject *self, PyObject *args) {

     PyObject * _resultobj;
     long  _result;
     wxSize * _arg0;
     char * _argc0 = 0;
 
     self = self;
     PyObject * _resultobj;
     long  _result;
     wxSize * _arg0;
     char * _argc0 = 0;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxSize_height_get",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"s:wxSize_y_get",&_argc0)) 

         return NULL;
     if (_argc0) {
         if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxSize_p")) {
         return NULL;
     if (_argc0) {
         if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxSize_p")) {

-            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSize_height_get. Expected _wxSize_p.");
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSize_y_get. Expected _wxSize_p.");

         return NULL;
         }
     }
         return NULL;
         }
     }


@@ -1153,70 +1190,70 @@ static PyObject *_wrap_wxSize_Set(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
     return _resultobj;
 }
 

-#define wxSize_GetWidth(_swigobj)  (_swigobj->GetX())
-static PyObject *_wrap_wxSize_GetWidth(PyObject *self, PyObject *args) {
+#define wxSize_GetX(_swigobj)  (_swigobj->GetX())
+static PyObject *_wrap_wxSize_GetX(PyObject *self, PyObject *args) {

     PyObject * _resultobj;
     long  _result;
     wxSize * _arg0;
     char * _argc0 = 0;
 
     self = self;
     PyObject * _resultobj;
     long  _result;
     wxSize * _arg0;
     char * _argc0 = 0;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxSize_GetWidth",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"s:wxSize_GetX",&_argc0)) 

         return NULL;
     if (_argc0) {
         if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxSize_p")) {
         return NULL;
     if (_argc0) {
         if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxSize_p")) {

-            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSize_GetWidth. Expected _wxSize_p.");
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSize_GetX. Expected _wxSize_p.");

         return NULL;
         }
     }
         return NULL;
         }
     }

-    _result = (long )wxSize_GetWidth(_arg0);
+    _result = (long )wxSize_GetX(_arg0);

     _resultobj = Py_BuildValue("l",_result);
     return _resultobj;
 }
 
     _resultobj = Py_BuildValue("l",_result);
     return _resultobj;
 }
 

-#define wxSize_GetHeight(_swigobj)  (_swigobj->GetY())
-static PyObject *_wrap_wxSize_GetHeight(PyObject *self, PyObject *args) {
+#define wxSize_GetY(_swigobj)  (_swigobj->GetY())
+static PyObject *_wrap_wxSize_GetY(PyObject *self, PyObject *args) {

     PyObject * _resultobj;
     long  _result;
     wxSize * _arg0;
     char * _argc0 = 0;
 
     self = self;
     PyObject * _resultobj;
     long  _result;
     wxSize * _arg0;
     char * _argc0 = 0;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxSize_GetHeight",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"s:wxSize_GetY",&_argc0)) 

         return NULL;
     if (_argc0) {
         if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxSize_p")) {
         return NULL;
     if (_argc0) {
         if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxSize_p")) {

-            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSize_GetHeight. Expected _wxSize_p.");
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSize_GetY. Expected _wxSize_p.");

         return NULL;
         }
     }
         return NULL;
         }
     }

-    _result = (long )wxSize_GetHeight(_arg0);
+    _result = (long )wxSize_GetY(_arg0);

     _resultobj = Py_BuildValue("l",_result);
     return _resultobj;
 }
 
     _resultobj = Py_BuildValue("l",_result);
     return _resultobj;
 }
 

-static PyObject * wxSize___str__(wxSize *self) {
+static PyObject * wxSize_asTuple(wxSize *self) {

             PyObject* tup = PyTuple_New(2);
             PyTuple_SET_ITEM(tup, 0, PyInt_FromLong(self->x));
             PyTuple_SET_ITEM(tup, 1, PyInt_FromLong(self->y));
             return tup;
         }
             PyObject* tup = PyTuple_New(2);
             PyTuple_SET_ITEM(tup, 0, PyInt_FromLong(self->x));
             PyTuple_SET_ITEM(tup, 1, PyInt_FromLong(self->y));
             return tup;
         }

-static PyObject *_wrap_wxSize___str__(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxSize_asTuple(PyObject *self, PyObject *args) {

     PyObject * _resultobj;
     PyObject * _result;
     wxSize * _arg0;
     char * _argc0 = 0;
 
     self = self;
     PyObject * _resultobj;
     PyObject * _result;
     wxSize * _arg0;
     char * _argc0 = 0;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxSize___str__",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"s:wxSize_asTuple",&_argc0)) 

         return NULL;
     if (_argc0) {
         if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxSize_p")) {
         return NULL;
     if (_argc0) {
         if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxSize_p")) {

-            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSize___str__. Expected _wxSize_p.");
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSize_asTuple. Expected _wxSize_p.");

         return NULL;
         }
     }
         return NULL;
         }
     }

-    _result = (PyObject *)wxSize___str__(_arg0);
+    _result = (PyObject *)wxSize_asTuple(_arg0);

 {
   _resultobj = _result;
 }
 {
   _resultobj = _result;
 }


@@ -1497,28 +1534,28 @@ static PyObject *_wrap_wxPoint_Set(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
     return _resultobj;
 }
 

-static PyObject * wxPoint___str__(wxPoint *self) {
+static PyObject * wxPoint_asTuple(wxPoint *self) {

             PyObject* tup = PyTuple_New(2);
             PyTuple_SET_ITEM(tup, 0, PyInt_FromLong(self->x));
             PyTuple_SET_ITEM(tup, 1, PyInt_FromLong(self->y));
             return tup;
         }
             PyObject* tup = PyTuple_New(2);
             PyTuple_SET_ITEM(tup, 0, PyInt_FromLong(self->x));
             PyTuple_SET_ITEM(tup, 1, PyInt_FromLong(self->y));
             return tup;
         }

-static PyObject *_wrap_wxPoint___str__(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxPoint_asTuple(PyObject *self, PyObject *args) {

     PyObject * _resultobj;
     PyObject * _result;
     wxPoint * _arg0;
     char * _argc0 = 0;
 
     self = self;
     PyObject * _resultobj;
     PyObject * _result;
     wxPoint * _arg0;
     char * _argc0 = 0;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"s:wxPoint___str__",&_argc0)) 
+    if(!PyArg_ParseTuple(args,"s:wxPoint_asTuple",&_argc0)) 

         return NULL;
     if (_argc0) {
         if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPoint_p")) {
         return NULL;
     if (_argc0) {
         if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPoint_p")) {

-            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPoint___str__. Expected _wxPoint_p.");
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPoint_asTuple. Expected _wxPoint_p.");

         return NULL;
         }
     }
         return NULL;
         }
     }

-    _result = (PyObject *)wxPoint___str__(_arg0);
+    _result = (PyObject *)wxPoint_asTuple(_arg0);

 {
   _resultobj = _result;
 }
 {
   _resultobj = _result;
 }


@@ -2039,6 +2076,36 @@ static PyObject *_wrap_wxRect_height_get(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
     return _resultobj;
 }
 

+static PyObject * wxRect_asTuple(wxRect *self) {
+            PyObject* tup = PyTuple_New(4);
+            PyTuple_SET_ITEM(tup, 0, PyInt_FromLong(self->x));
+            PyTuple_SET_ITEM(tup, 1, PyInt_FromLong(self->y));
+            PyTuple_SET_ITEM(tup, 0, PyInt_FromLong(self->width));
+            PyTuple_SET_ITEM(tup, 1, PyInt_FromLong(self->height));
+            return tup;
+        }
+static PyObject *_wrap_wxRect_asTuple(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    PyObject * _result;
+    wxRect * _arg0;
+    char * _argc0 = 0;
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"s:wxRect_asTuple",&_argc0)) 
+        return NULL;
+    if (_argc0) {
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxRect_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRect_asTuple. Expected _wxRect_p.");
+        return NULL;
+        }
+    }
+    _result = (PyObject *)wxRect_asTuple(_arg0);
+{
+  _resultobj = _result;
+}
+    return _resultobj;
+}
+

 #define new_wxPyTimer(_swigarg0) (new wxPyTimer(_swigarg0))
 static PyObject *_wrap_new_wxPyTimer(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
 #define new_wxPyTimer(_swigarg0) (new wxPyTimer(_swigarg0))
 static PyObject *_wrap_new_wxPyTimer(PyObject *self, PyObject *args) {
     PyObject * _resultobj;


@@ -3315,7 +3382,152 @@ static PyObject *_wrap_new_wxAcceleratorTable(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
     return _resultobj;
 }
 

+#define new_wxToolTip(_swigarg0) (new wxToolTip(_swigarg0))
+static PyObject *_wrap_new_wxToolTip(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    wxToolTip * _result;
+    wxString * _arg0;
+    PyObject * _obj0 = 0;
+    char _ptemp[128];
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"O:new_wxToolTip",&_obj0)) 
+        return NULL;
+{
+    if (!PyString_Check(_obj0)) {
+        PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
+        return NULL;
+    }
+    _arg0 = new wxString(PyString_AsString(_obj0));
+}
+    _result = (wxToolTip *)new_wxToolTip(*_arg0);
+    SWIG_MakePtr(_ptemp, (char *) _result,"_wxToolTip_p");
+    _resultobj = Py_BuildValue("s",_ptemp);
+{
+    if (_obj0)
+        delete _arg0;
+}
+    return _resultobj;
+}
+
+#define wxToolTip_SetTip(_swigobj,_swigarg0)  (_swigobj->SetTip(_swigarg0))
+static PyObject *_wrap_wxToolTip_SetTip(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    wxToolTip * _arg0;
+    wxString * _arg1;
+    char * _argc0 = 0;
+    PyObject * _obj1 = 0;
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"sO:wxToolTip_SetTip",&_argc0,&_obj1)) 
+        return NULL;
+    if (_argc0) {
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolTip_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolTip_SetTip. Expected _wxToolTip_p.");
+        return NULL;
+        }
+    }
+{
+    if (!PyString_Check(_obj1)) {
+        PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
+        return NULL;
+    }
+    _arg1 = new wxString(PyString_AsString(_obj1));
+}
+    wxToolTip_SetTip(_arg0,*_arg1);
+    Py_INCREF(Py_None);
+    _resultobj = Py_None;
+{
+    if (_obj1)
+        delete _arg1;
+}
+    return _resultobj;
+}
+
+#define wxToolTip_GetTip(_swigobj)  (_swigobj->GetTip())
+static PyObject *_wrap_wxToolTip_GetTip(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    wxString * _result;
+    wxToolTip * _arg0;
+    char * _argc0 = 0;
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"s:wxToolTip_GetTip",&_argc0)) 
+        return NULL;
+    if (_argc0) {
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolTip_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolTip_GetTip. Expected _wxToolTip_p.");
+        return NULL;
+        }
+    }
+    _result = new wxString (wxToolTip_GetTip(_arg0));
+{
+    _resultobj = PyString_FromString(WXSTRINGCAST *(_result));
+}
+{
+    delete _result;
+}
+    return _resultobj;
+}
+
+#define wxToolTip_SetWindow(_swigobj,_swigarg0)  (_swigobj->SetWindow(_swigarg0))
+static PyObject *_wrap_wxToolTip_SetWindow(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    wxToolTip * _arg0;
+    wxWindow * _arg1;
+    char * _argc0 = 0;
+    char * _argc1 = 0;
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"ss:wxToolTip_SetWindow",&_argc0,&_argc1)) 
+        return NULL;
+    if (_argc0) {
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolTip_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolTip_SetWindow. Expected _wxToolTip_p.");
+        return NULL;
+        }
+    }
+    if (_argc1) {
+        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxWindow_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxToolTip_SetWindow. Expected _wxWindow_p.");
+        return NULL;
+        }
+    }
+    wxToolTip_SetWindow(_arg0,_arg1);
+    Py_INCREF(Py_None);
+    _resultobj = Py_None;
+    return _resultobj;
+}
+
+#define wxToolTip_GetWindow(_swigobj)  (_swigobj->GetWindow())
+static PyObject *_wrap_wxToolTip_GetWindow(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    wxWindow * _result;
+    wxToolTip * _arg0;
+    char * _argc0 = 0;
+    char _ptemp[128];
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"s:wxToolTip_GetWindow",&_argc0)) 
+        return NULL;
+    if (_argc0) {
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolTip_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolTip_GetWindow. Expected _wxToolTip_p.");
+        return NULL;
+        }
+    }
+    _result = (wxWindow *)wxToolTip_GetWindow(_arg0);
+    SWIG_MakePtr(_ptemp, (char *) _result,"_wxWindow_p");
+    _resultobj = Py_BuildValue("s",_ptemp);
+    return _resultobj;
+}
+

 static PyMethodDef misccMethods[] = {
 static PyMethodDef misccMethods[] = {

+        { "wxToolTip_GetWindow", _wrap_wxToolTip_GetWindow, 1 },
+        { "wxToolTip_SetWindow", _wrap_wxToolTip_SetWindow, 1 },
+        { "wxToolTip_GetTip", _wrap_wxToolTip_GetTip, 1 },
+        { "wxToolTip_SetTip", _wrap_wxToolTip_SetTip, 1 },
+        { "new_wxToolTip", _wrap_new_wxToolTip, 1 },

         { "new_wxAcceleratorTable", _wrap_new_wxAcceleratorTable, 1 },
         { "wxAcceleratorEntry_GetCommand", _wrap_wxAcceleratorEntry_GetCommand, 1 },
         { "wxAcceleratorEntry_GetKeyCode", _wrap_wxAcceleratorEntry_GetKeyCode, 1 },
         { "new_wxAcceleratorTable", _wrap_new_wxAcceleratorTable, 1 },
         { "wxAcceleratorEntry_GetCommand", _wrap_wxAcceleratorEntry_GetCommand, 1 },
         { "wxAcceleratorEntry_GetKeyCode", _wrap_wxAcceleratorEntry_GetKeyCode, 1 },


@@ -3370,6 +3582,7 @@ static PyMethodDef misccMethods[] = {
         { "wxPyTimer_Interval", _wrap_wxPyTimer_Interval, 1 },
         { "delete_wxPyTimer", _wrap_delete_wxPyTimer, 1 },
         { "new_wxPyTimer", _wrap_new_wxPyTimer, 1 },
         { "wxPyTimer_Interval", _wrap_wxPyTimer_Interval, 1 },
         { "delete_wxPyTimer", _wrap_delete_wxPyTimer, 1 },
         { "new_wxPyTimer", _wrap_new_wxPyTimer, 1 },

+        { "wxRect_asTuple", _wrap_wxRect_asTuple, 1 },

         { "wxRect_height_get", _wrap_wxRect_height_get, 1 },
         { "wxRect_height_set", _wrap_wxRect_height_set, 1 },
         { "wxRect_width_get", _wrap_wxRect_width_get, 1 },
         { "wxRect_height_get", _wrap_wxRect_height_get, 1 },
         { "wxRect_height_set", _wrap_wxRect_height_set, 1 },
         { "wxRect_width_get", _wrap_wxRect_width_get, 1 },


@@ -3394,7 +3607,7 @@ static PyMethodDef misccMethods[] = {
         { "wxRect_GetX", _wrap_wxRect_GetX, 1 },
         { "delete_wxRect", _wrap_delete_wxRect, 1 },
         { "new_wxRect", _wrap_new_wxRect, 1 },
         { "wxRect_GetX", _wrap_wxRect_GetX, 1 },
         { "delete_wxRect", _wrap_delete_wxRect, 1 },
         { "new_wxRect", _wrap_new_wxRect, 1 },

-        { "wxPoint___str__", _wrap_wxPoint___str__, 1 },
+        { "wxPoint_asTuple", _wrap_wxPoint_asTuple, 1 },

         { "wxPoint_Set", _wrap_wxPoint_Set, 1 },
         { "delete_wxPoint", _wrap_delete_wxPoint, 1 },
         { "new_wxPoint", _wrap_new_wxPoint, 1 },
         { "wxPoint_Set", _wrap_wxPoint_Set, 1 },
         { "delete_wxPoint", _wrap_delete_wxPoint, 1 },
         { "new_wxPoint", _wrap_new_wxPoint, 1 },


@@ -3408,16 +3621,24 @@ static PyMethodDef misccMethods[] = {
         { "wxRealPoint_y_set", _wrap_wxRealPoint_y_set, 1 },
         { "wxRealPoint_x_get", _wrap_wxRealPoint_x_get, 1 },
         { "wxRealPoint_x_set", _wrap_wxRealPoint_x_set, 1 },
         { "wxRealPoint_y_set", _wrap_wxRealPoint_y_set, 1 },
         { "wxRealPoint_x_get", _wrap_wxRealPoint_x_get, 1 },
         { "wxRealPoint_x_set", _wrap_wxRealPoint_x_set, 1 },

-        { "wxSize___str__", _wrap_wxSize___str__, 1 },
-        { "wxSize_GetHeight", _wrap_wxSize_GetHeight, 1 },
-        { "wxSize_GetWidth", _wrap_wxSize_GetWidth, 1 },
+        { "wxSize_asTuple", _wrap_wxSize_asTuple, 1 },
+        { "wxSize_GetHeight", _wrap_wxSize_GetY, 1 },
+        { "wxSize_GetWidth", _wrap_wxSize_GetX, 1 },
+        { "wxSize_GetY", _wrap_wxSize_GetY, 1 },
+        { "wxSize_GetX", _wrap_wxSize_GetX, 1 },

         { "wxSize_Set", _wrap_wxSize_Set, 1 },
         { "delete_wxSize", _wrap_delete_wxSize, 1 },
         { "new_wxSize", _wrap_new_wxSize, 1 },
         { "wxSize_Set", _wrap_wxSize_Set, 1 },
         { "delete_wxSize", _wrap_delete_wxSize, 1 },
         { "new_wxSize", _wrap_new_wxSize, 1 },

-        { "wxSize_height_get", _wrap_wxSize_height_get, 1 },
-        { "wxSize_height_set", _wrap_wxSize_height_set, 1 },
-        { "wxSize_width_get", _wrap_wxSize_width_get, 1 },
-        { "wxSize_width_set", _wrap_wxSize_width_set, 1 },
+        { "wxSize_height_get", _wrap_wxSize_y_get, 1 },
+        { "wxSize_height_set", _wrap_wxSize_y_set, 1 },
+        { "wxSize_width_get", _wrap_wxSize_x_get, 1 },
+        { "wxSize_width_set", _wrap_wxSize_x_set, 1 },
+        { "wxSize_y_get", _wrap_wxSize_y_get, 1 },
+        { "wxSize_y_set", _wrap_wxSize_y_set, 1 },
+        { "wxSize_x_get", _wrap_wxSize_x_get, 1 },
+        { "wxSize_x_set", _wrap_wxSize_x_set, 1 },
+        { "wxToolTip_SetDelay", _wrap_wxToolTip_SetDelay, 1 },
+        { "wxToolTip_Enable", _wrap_wxToolTip_Enable, 1 },

         { "wxResourceParseString", _wrap_wxResourceParseString, 1 },
         { "wxResourceParseFile", _wrap_wxResourceParseFile, 1 },
         { "wxResourceParseData", _wrap_wxResourceParseData, 1 },
         { "wxResourceParseString", _wrap_wxResourceParseString, 1 },
         { "wxResourceParseFile", _wrap_wxResourceParseFile, 1 },
         { "wxResourceParseData", _wrap_wxResourceParseData, 1 },


@@ -3496,11 +3717,13 @@ SWIGEXPORT(void,initmiscc)() {
         SWIG_RegisterMapping("_signed_long","_long",0);
         SWIG_RegisterMapping("_class_wxRegionIterator","_wxRegionIterator",0);
         SWIG_RegisterMapping("_wxIndividualLayoutConstraint","_class_wxIndividualLayoutConstraint",0);
         SWIG_RegisterMapping("_signed_long","_long",0);
         SWIG_RegisterMapping("_class_wxRegionIterator","_wxRegionIterator",0);
         SWIG_RegisterMapping("_wxIndividualLayoutConstraint","_class_wxIndividualLayoutConstraint",0);

+        SWIG_RegisterMapping("_wxToolTip","_class_wxToolTip",0);

         SWIG_RegisterMapping("_byte","_unsigned_char",0);
         SWIG_RegisterMapping("_long","_unsigned_long",0);
         SWIG_RegisterMapping("_long","_signed_long",0);
         SWIG_RegisterMapping("_class_wxAcceleratorTable","_wxAcceleratorTable",0);
         SWIG_RegisterMapping("_class_wxRealPoint","_wxRealPoint",0);
         SWIG_RegisterMapping("_byte","_unsigned_char",0);
         SWIG_RegisterMapping("_long","_unsigned_long",0);
         SWIG_RegisterMapping("_long","_signed_long",0);
         SWIG_RegisterMapping("_class_wxAcceleratorTable","_wxAcceleratorTable",0);
         SWIG_RegisterMapping("_class_wxRealPoint","_wxRealPoint",0);

+        SWIG_RegisterMapping("_class_wxToolTip","_wxToolTip",0);

         SWIG_RegisterMapping("_uint","_unsigned_int",0);
         SWIG_RegisterMapping("_uint","_int",0);
         SWIG_RegisterMapping("_uint","_wxWindowID",0);
         SWIG_RegisterMapping("_uint","_unsigned_int",0);
         SWIG_RegisterMapping("_uint","_int",0);
         SWIG_RegisterMapping("_uint","_wxWindowID",0);

diff --git a/utils/wxPython/src/msw/misc.py b/utils/wxPython/src/msw/misc.py
index a83367ea2bee513d5eb1f9319ead614fdeb9729f..9ad2a160caf8c995be53904efa09fb34822002e0 100644 (file)
--- a/utils/wxPython/src/msw/misc.py
+++ b/utils/wxPython/src/msw/misc.py
@@ -10,16 +10,28 @@ class wxSizePtr :
     def Set(self,arg0,arg1):
         val = miscc.wxSize_Set(self.this,arg0,arg1)
         return val
     def Set(self,arg0,arg1):
         val = miscc.wxSize_Set(self.this,arg0,arg1)
         return val

+    def GetX(self):
+        val = miscc.wxSize_GetX(self.this)
+        return val
+    def GetY(self):
+        val = miscc.wxSize_GetY(self.this)
+        return val

     def GetWidth(self):
         val = miscc.wxSize_GetWidth(self.this)
         return val
     def GetHeight(self):
         val = miscc.wxSize_GetHeight(self.this)
         return val
     def GetWidth(self):
         val = miscc.wxSize_GetWidth(self.this)
         return val
     def GetHeight(self):
         val = miscc.wxSize_GetHeight(self.this)
         return val

-    def __str__(self):
-        val = miscc.wxSize___str__(self.this)
+    def asTuple(self):
+        val = miscc.wxSize_asTuple(self.this)

         return val
     def __setattr__(self,name,value):
         return val
     def __setattr__(self,name,value):

+        if name == "x" :
+            miscc.wxSize_x_set(self.this,value)
+            return
+        if name == "y" :
+            miscc.wxSize_y_set(self.this,value)
+            return

         if name == "width" :
             miscc.wxSize_width_set(self.this,value)
             return
         if name == "width" :
             miscc.wxSize_width_set(self.this,value)
             return


@@ -28,6 +40,10 @@ class wxSizePtr :
             return
         self.__dict__[name] = value
     def __getattr__(self,name):
             return
         self.__dict__[name] = value
     def __getattr__(self,name):

+        if name == "x" : 
+            return miscc.wxSize_x_get(self.this)
+        if name == "y" : 
+            return miscc.wxSize_y_get(self.this)

         if name == "width" : 
             return miscc.wxSize_width_get(self.this)
         if name == "height" : 
         if name == "width" : 
             return miscc.wxSize_width_get(self.this)
         if name == "height" : 


@@ -35,6 +51,8 @@ class wxSizePtr :
         raise AttributeError,name
     def __repr__(self):
         return "<C wxSize instance>"
         raise AttributeError,name
     def __repr__(self):
         return "<C wxSize instance>"

+    def __str__(self): return str(self.asTuple())
+    def __repr__(self): return str(self.asTuple())

 class wxSize(wxSizePtr):
     def __init__(self,*args) :
         self.this = apply(miscc.new_wxSize,()+args)
 class wxSize(wxSizePtr):
     def __init__(self,*args) :
         self.this = apply(miscc.new_wxSize,()+args)


@@ -84,8 +102,8 @@ class wxPointPtr :
     def Set(self,arg0,arg1):
         val = miscc.wxPoint_Set(self.this,arg0,arg1)
         return val
     def Set(self,arg0,arg1):
         val = miscc.wxPoint_Set(self.this,arg0,arg1)
         return val

-    def __str__(self):
-        val = miscc.wxPoint___str__(self.this)
+    def asTuple(self):
+        val = miscc.wxPoint_asTuple(self.this)

         return val
     def __setattr__(self,name,value):
         if name == "x" :
         return val
     def __setattr__(self,name,value):
         if name == "x" :


@@ -103,6 +121,8 @@ class wxPointPtr :
         raise AttributeError,name
     def __repr__(self):
         return "<C wxPoint instance>"
         raise AttributeError,name
     def __repr__(self):
         return "<C wxPoint instance>"

+    def __str__(self): return str(self.asTuple())
+    def __repr__(self): return str(self.asTuple())

 class wxPoint(wxPointPtr):
     def __init__(self,*args) :
         self.this = apply(miscc.new_wxPoint,()+args)
 class wxPoint(wxPointPtr):
     def __init__(self,*args) :
         self.this = apply(miscc.new_wxPoint,()+args)


@@ -164,6 +184,9 @@ class wxRectPtr :
     def GetRight(self):
         val = miscc.wxRect_GetRight(self.this)
         return val
     def GetRight(self):
         val = miscc.wxRect_GetRight(self.this)
         return val

+    def asTuple(self):
+        val = miscc.wxRect_asTuple(self.this)
+        return val

     def __setattr__(self,name,value):
         if name == "x" :
             miscc.wxRect_x_set(self.this,value)
     def __setattr__(self,name,value):
         if name == "x" :
             miscc.wxRect_x_set(self.this,value)


@@ -190,6 +213,8 @@ class wxRectPtr :
         raise AttributeError,name
     def __repr__(self):
         return "<C wxRect instance>"
         raise AttributeError,name
     def __repr__(self):
         return "<C wxRect instance>"

+    def __str__(self): return str(self.asTuple())
+    def __repr__(self): return str(self.asTuple())

 class wxRect(wxRectPtr):
     def __init__(self,*args) :
         self.this = apply(miscc.new_wxRect,()+args)
 class wxRect(wxRectPtr):
     def __init__(self,*args) :
         self.this = apply(miscc.new_wxRect,()+args)


@@ -463,6 +488,33 @@ class wxAcceleratorTable(wxAcceleratorTablePtr):
 
 
 
 
 
 

+class wxToolTipPtr :
+    def __init__(self,this):
+        self.this = this
+        self.thisown = 0
+    def SetTip(self,arg0):
+        val = miscc.wxToolTip_SetTip(self.this,arg0)
+        return val
+    def GetTip(self):
+        val = miscc.wxToolTip_GetTip(self.this)
+        return val
+    def SetWindow(self,arg0):
+        val = miscc.wxToolTip_SetWindow(self.this,arg0.this)
+        return val
+    def GetWindow(self):
+        val = miscc.wxToolTip_GetWindow(self.this)
+        val = wxWindowPtr(val)
+        return val
+    def __repr__(self):
+        return "<C wxToolTip instance>"
+class wxToolTip(wxToolTipPtr):
+    def __init__(self,arg0) :
+        self.this = miscc.new_wxToolTip(arg0)
+        self.thisown = 1
+
+
+
+

 
 
 #-------------- FUNCTION WRAPPERS ------------------
 
 
 #-------------- FUNCTION WRAPPERS ------------------


@@ -607,6 +659,10 @@ wxResourceParseFile = miscc.wxResourceParseFile
 
 wxResourceParseString = miscc.wxResourceParseString
 
 
 wxResourceParseString = miscc.wxResourceParseString
 

+wxToolTip_Enable = miscc.wxToolTip_Enable
+
+wxToolTip_SetDelay = miscc.wxToolTip_SetDelay
+

 
 
 #-------------- VARIABLE WRAPPERS ------------------
 
 
 #-------------- VARIABLE WRAPPERS ------------------

diff --git a/utils/wxPython/src/msw/stattool.cpp b/utils/wxPython/src/msw/stattool.cpp
index c2ad2e2fc07aa6ee6904b21e9c314fe84c3367c2..f9703b466159b4685cad9ce022a373a892ad2b37 100644 (file)
--- a/utils/wxPython/src/msw/stattool.cpp
+++ b/utils/wxPython/src/msw/stattool.cpp
@@ -525,6 +525,28 @@ static PyObject *_wrap_wxToolBarTool_GetHeight(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
     return _resultobj;
 }
 

+#define wxToolBarTool_m_toolStyle_set(_swigobj,_swigval) (_swigobj->m_toolStyle = _swigval,_swigval)
+static PyObject *_wrap_wxToolBarTool_m_toolStyle_set(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    int  _result;
+    wxToolBarTool * _arg0;
+    int  _arg1;
+    char * _argc0 = 0;
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"si:wxToolBarTool_m_toolStyle_set",&_argc0,&_arg1)) 
+        return NULL;
+    if (_argc0) {
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolBarTool_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarTool_m_toolStyle_set. Expected _wxToolBarTool_p.");
+        return NULL;
+        }
+    }
+    _result = (int )wxToolBarTool_m_toolStyle_set(_arg0,_arg1);
+    _resultobj = Py_BuildValue("i",_result);
+    return _resultobj;
+}
+

 #define wxToolBarTool_m_toolStyle_get(_swigobj) ((int ) _swigobj->m_toolStyle)
 static PyObject *_wrap_wxToolBarTool_m_toolStyle_get(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
 #define wxToolBarTool_m_toolStyle_get(_swigobj) ((int ) _swigobj->m_toolStyle)
 static PyObject *_wrap_wxToolBarTool_m_toolStyle_get(PyObject *self, PyObject *args) {
     PyObject * _resultobj;


@@ -546,6 +568,37 @@ static PyObject *_wrap_wxToolBarTool_m_toolStyle_get(PyObject *self, PyObject *a
     return _resultobj;
 }
 
     return _resultobj;
 }
 

+#define wxToolBarTool_m_clientData_set(_swigobj,_swigval) (_swigobj->m_clientData = _swigval,_swigval)
+static PyObject *_wrap_wxToolBarTool_m_clientData_set(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    wxObject * _result;
+    wxToolBarTool * _arg0;
+    wxObject * _arg1;
+    char * _argc0 = 0;
+    char * _argc1 = 0;
+    char _ptemp[128];
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"ss:wxToolBarTool_m_clientData_set",&_argc0,&_argc1)) 
+        return NULL;
+    if (_argc0) {
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolBarTool_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarTool_m_clientData_set. Expected _wxToolBarTool_p.");
+        return NULL;
+        }
+    }
+    if (_argc1) {
+        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxObject_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxToolBarTool_m_clientData_set. Expected _wxObject_p.");
+        return NULL;
+        }
+    }
+    _result = (wxObject *)wxToolBarTool_m_clientData_set(_arg0,_arg1);
+    SWIG_MakePtr(_ptemp, (char *) _result,"_wxObject_p");
+    _resultobj = Py_BuildValue("s",_ptemp);
+    return _resultobj;
+}
+

 #define wxToolBarTool_m_clientData_get(_swigobj) ((wxObject *) _swigobj->m_clientData)
 static PyObject *_wrap_wxToolBarTool_m_clientData_get(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
 #define wxToolBarTool_m_clientData_get(_swigobj) ((wxObject *) _swigobj->m_clientData)
 static PyObject *_wrap_wxToolBarTool_m_clientData_get(PyObject *self, PyObject *args) {
     PyObject * _resultobj;


@@ -569,6 +622,28 @@ static PyObject *_wrap_wxToolBarTool_m_clientData_get(PyObject *self, PyObject *
     return _resultobj;
 }
 
     return _resultobj;
 }
 

+#define wxToolBarTool_m_index_set(_swigobj,_swigval) (_swigobj->m_index = _swigval,_swigval)
+static PyObject *_wrap_wxToolBarTool_m_index_set(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    int  _result;
+    wxToolBarTool * _arg0;
+    int  _arg1;
+    char * _argc0 = 0;
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"si:wxToolBarTool_m_index_set",&_argc0,&_arg1)) 
+        return NULL;
+    if (_argc0) {
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolBarTool_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarTool_m_index_set. Expected _wxToolBarTool_p.");
+        return NULL;
+        }
+    }
+    _result = (int )wxToolBarTool_m_index_set(_arg0,_arg1);
+    _resultobj = Py_BuildValue("i",_result);
+    return _resultobj;
+}
+

 #define wxToolBarTool_m_index_get(_swigobj) ((int ) _swigobj->m_index)
 static PyObject *_wrap_wxToolBarTool_m_index_get(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
 #define wxToolBarTool_m_index_get(_swigobj) ((int ) _swigobj->m_index)
 static PyObject *_wrap_wxToolBarTool_m_index_get(PyObject *self, PyObject *args) {
     PyObject * _resultobj;


@@ -590,6 +665,28 @@ static PyObject *_wrap_wxToolBarTool_m_index_get(PyObject *self, PyObject *args)
     return _resultobj;
 }
 
     return _resultobj;
 }
 

+#define wxToolBarTool_m_x_set(_swigobj,_swigval) (_swigobj->m_x = _swigval,_swigval)
+static PyObject *_wrap_wxToolBarTool_m_x_set(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    long  _result;
+    wxToolBarTool * _arg0;
+    long  _arg1;
+    char * _argc0 = 0;
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"sl:wxToolBarTool_m_x_set",&_argc0,&_arg1)) 
+        return NULL;
+    if (_argc0) {
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolBarTool_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarTool_m_x_set. Expected _wxToolBarTool_p.");
+        return NULL;
+        }
+    }
+    _result = (long )wxToolBarTool_m_x_set(_arg0,_arg1);
+    _resultobj = Py_BuildValue("l",_result);
+    return _resultobj;
+}
+

 #define wxToolBarTool_m_x_get(_swigobj) ((long ) _swigobj->m_x)
 static PyObject *_wrap_wxToolBarTool_m_x_get(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
 #define wxToolBarTool_m_x_get(_swigobj) ((long ) _swigobj->m_x)
 static PyObject *_wrap_wxToolBarTool_m_x_get(PyObject *self, PyObject *args) {
     PyObject * _resultobj;


@@ -611,6 +708,28 @@ static PyObject *_wrap_wxToolBarTool_m_x_get(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
     return _resultobj;
 }
 

+#define wxToolBarTool_m_y_set(_swigobj,_swigval) (_swigobj->m_y = _swigval,_swigval)
+static PyObject *_wrap_wxToolBarTool_m_y_set(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    long  _result;
+    wxToolBarTool * _arg0;
+    long  _arg1;
+    char * _argc0 = 0;
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"sl:wxToolBarTool_m_y_set",&_argc0,&_arg1)) 
+        return NULL;
+    if (_argc0) {
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolBarTool_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarTool_m_y_set. Expected _wxToolBarTool_p.");
+        return NULL;
+        }
+    }
+    _result = (long )wxToolBarTool_m_y_set(_arg0,_arg1);
+    _resultobj = Py_BuildValue("l",_result);
+    return _resultobj;
+}
+

 #define wxToolBarTool_m_y_get(_swigobj) ((long ) _swigobj->m_y)
 static PyObject *_wrap_wxToolBarTool_m_y_get(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
 #define wxToolBarTool_m_y_get(_swigobj) ((long ) _swigobj->m_y)
 static PyObject *_wrap_wxToolBarTool_m_y_get(PyObject *self, PyObject *args) {
     PyObject * _resultobj;


@@ -632,6 +751,28 @@ static PyObject *_wrap_wxToolBarTool_m_y_get(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
     return _resultobj;
 }
 

+#define wxToolBarTool_m_width_set(_swigobj,_swigval) (_swigobj->m_width = _swigval,_swigval)
+static PyObject *_wrap_wxToolBarTool_m_width_set(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    long  _result;
+    wxToolBarTool * _arg0;
+    long  _arg1;
+    char * _argc0 = 0;
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"sl:wxToolBarTool_m_width_set",&_argc0,&_arg1)) 
+        return NULL;
+    if (_argc0) {
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolBarTool_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarTool_m_width_set. Expected _wxToolBarTool_p.");
+        return NULL;
+        }
+    }
+    _result = (long )wxToolBarTool_m_width_set(_arg0,_arg1);
+    _resultobj = Py_BuildValue("l",_result);
+    return _resultobj;
+}
+

 #define wxToolBarTool_m_width_get(_swigobj) ((long ) _swigobj->m_width)
 static PyObject *_wrap_wxToolBarTool_m_width_get(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
 #define wxToolBarTool_m_width_get(_swigobj) ((long ) _swigobj->m_width)
 static PyObject *_wrap_wxToolBarTool_m_width_get(PyObject *self, PyObject *args) {
     PyObject * _resultobj;


@@ -653,6 +794,28 @@ static PyObject *_wrap_wxToolBarTool_m_width_get(PyObject *self, PyObject *args)
     return _resultobj;
 }
 
     return _resultobj;
 }
 

+#define wxToolBarTool_m_height_set(_swigobj,_swigval) (_swigobj->m_height = _swigval,_swigval)
+static PyObject *_wrap_wxToolBarTool_m_height_set(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    long  _result;
+    wxToolBarTool * _arg0;
+    long  _arg1;
+    char * _argc0 = 0;
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"sl:wxToolBarTool_m_height_set",&_argc0,&_arg1)) 
+        return NULL;
+    if (_argc0) {
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolBarTool_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarTool_m_height_set. Expected _wxToolBarTool_p.");
+        return NULL;
+        }
+    }
+    _result = (long )wxToolBarTool_m_height_set(_arg0,_arg1);
+    _resultobj = Py_BuildValue("l",_result);
+    return _resultobj;
+}
+

 #define wxToolBarTool_m_height_get(_swigobj) ((long ) _swigobj->m_height)
 static PyObject *_wrap_wxToolBarTool_m_height_get(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
 #define wxToolBarTool_m_height_get(_swigobj) ((long ) _swigobj->m_height)
 static PyObject *_wrap_wxToolBarTool_m_height_get(PyObject *self, PyObject *args) {
     PyObject * _resultobj;


@@ -674,6 +837,30 @@ static PyObject *_wrap_wxToolBarTool_m_height_get(PyObject *self, PyObject *args
     return _resultobj;
 }
 
     return _resultobj;
 }
 

+#define wxToolBarTool_m_toggleState_set(_swigobj,_swigval) (_swigobj->m_toggleState = _swigval,_swigval)
+static PyObject *_wrap_wxToolBarTool_m_toggleState_set(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    bool  _result;
+    wxToolBarTool * _arg0;
+    bool  _arg1;
+    char * _argc0 = 0;
+    int tempbool1;
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"si:wxToolBarTool_m_toggleState_set",&_argc0,&tempbool1)) 
+        return NULL;
+    if (_argc0) {
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolBarTool_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarTool_m_toggleState_set. Expected _wxToolBarTool_p.");
+        return NULL;
+        }
+    }
+    _arg1 = (bool ) tempbool1;
+    _result = (bool )wxToolBarTool_m_toggleState_set(_arg0,_arg1);
+    _resultobj = Py_BuildValue("i",_result);
+    return _resultobj;
+}
+

 #define wxToolBarTool_m_toggleState_get(_swigobj) ((bool ) _swigobj->m_toggleState)
 static PyObject *_wrap_wxToolBarTool_m_toggleState_get(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
 #define wxToolBarTool_m_toggleState_get(_swigobj) ((bool ) _swigobj->m_toggleState)
 static PyObject *_wrap_wxToolBarTool_m_toggleState_get(PyObject *self, PyObject *args) {
     PyObject * _resultobj;


@@ -695,6 +882,30 @@ static PyObject *_wrap_wxToolBarTool_m_toggleState_get(PyObject *self, PyObject
     return _resultobj;
 }
 
     return _resultobj;
 }
 

+#define wxToolBarTool_m_isToggle_set(_swigobj,_swigval) (_swigobj->m_isToggle = _swigval,_swigval)
+static PyObject *_wrap_wxToolBarTool_m_isToggle_set(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    bool  _result;
+    wxToolBarTool * _arg0;
+    bool  _arg1;
+    char * _argc0 = 0;
+    int tempbool1;
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"si:wxToolBarTool_m_isToggle_set",&_argc0,&tempbool1)) 
+        return NULL;
+    if (_argc0) {
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolBarTool_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarTool_m_isToggle_set. Expected _wxToolBarTool_p.");
+        return NULL;
+        }
+    }
+    _arg1 = (bool ) tempbool1;
+    _result = (bool )wxToolBarTool_m_isToggle_set(_arg0,_arg1);
+    _resultobj = Py_BuildValue("i",_result);
+    return _resultobj;
+}
+

 #define wxToolBarTool_m_isToggle_get(_swigobj) ((bool ) _swigobj->m_isToggle)
 static PyObject *_wrap_wxToolBarTool_m_isToggle_get(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
 #define wxToolBarTool_m_isToggle_get(_swigobj) ((bool ) _swigobj->m_isToggle)
 static PyObject *_wrap_wxToolBarTool_m_isToggle_get(PyObject *self, PyObject *args) {
     PyObject * _resultobj;


@@ -716,6 +927,30 @@ static PyObject *_wrap_wxToolBarTool_m_isToggle_get(PyObject *self, PyObject *ar
     return _resultobj;
 }
 
     return _resultobj;
 }
 

+#define wxToolBarTool_m_deleteSecondBitmap_set(_swigobj,_swigval) (_swigobj->m_deleteSecondBitmap = _swigval,_swigval)
+static PyObject *_wrap_wxToolBarTool_m_deleteSecondBitmap_set(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    bool  _result;
+    wxToolBarTool * _arg0;
+    bool  _arg1;
+    char * _argc0 = 0;
+    int tempbool1;
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"si:wxToolBarTool_m_deleteSecondBitmap_set",&_argc0,&tempbool1)) 
+        return NULL;
+    if (_argc0) {
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolBarTool_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarTool_m_deleteSecondBitmap_set. Expected _wxToolBarTool_p.");
+        return NULL;
+        }
+    }
+    _arg1 = (bool ) tempbool1;
+    _result = (bool )wxToolBarTool_m_deleteSecondBitmap_set(_arg0,_arg1);
+    _resultobj = Py_BuildValue("i",_result);
+    return _resultobj;
+}
+

 #define wxToolBarTool_m_deleteSecondBitmap_get(_swigobj) ((bool ) _swigobj->m_deleteSecondBitmap)
 static PyObject *_wrap_wxToolBarTool_m_deleteSecondBitmap_get(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
 #define wxToolBarTool_m_deleteSecondBitmap_get(_swigobj) ((bool ) _swigobj->m_deleteSecondBitmap)
 static PyObject *_wrap_wxToolBarTool_m_deleteSecondBitmap_get(PyObject *self, PyObject *args) {
     PyObject * _resultobj;


@@ -737,6 +972,30 @@ static PyObject *_wrap_wxToolBarTool_m_deleteSecondBitmap_get(PyObject *self, Py
     return _resultobj;
 }
 
     return _resultobj;
 }
 

+#define wxToolBarTool_m_enabled_set(_swigobj,_swigval) (_swigobj->m_enabled = _swigval,_swigval)
+static PyObject *_wrap_wxToolBarTool_m_enabled_set(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    bool  _result;
+    wxToolBarTool * _arg0;
+    bool  _arg1;
+    char * _argc0 = 0;
+    int tempbool1;
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"si:wxToolBarTool_m_enabled_set",&_argc0,&tempbool1)) 
+        return NULL;
+    if (_argc0) {
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolBarTool_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarTool_m_enabled_set. Expected _wxToolBarTool_p.");
+        return NULL;
+        }
+    }
+    _arg1 = (bool ) tempbool1;
+    _result = (bool )wxToolBarTool_m_enabled_set(_arg0,_arg1);
+    _resultobj = Py_BuildValue("i",_result);
+    return _resultobj;
+}
+

 #define wxToolBarTool_m_enabled_get(_swigobj) ((bool ) _swigobj->m_enabled)
 static PyObject *_wrap_wxToolBarTool_m_enabled_get(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
 #define wxToolBarTool_m_enabled_get(_swigobj) ((bool ) _swigobj->m_enabled)
 static PyObject *_wrap_wxToolBarTool_m_enabled_get(PyObject *self, PyObject *args) {
     PyObject * _resultobj;


@@ -758,6 +1017,37 @@ static PyObject *_wrap_wxToolBarTool_m_enabled_get(PyObject *self, PyObject *arg
     return _resultobj;
 }
 
     return _resultobj;
 }
 

+#define wxToolBarTool_m_bitmap1_set(_swigobj,_swigval) (_swigobj->m_bitmap1 = *(_swigval),_swigval)
+static PyObject *_wrap_wxToolBarTool_m_bitmap1_set(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    wxBitmap * _result;
+    wxToolBarTool * _arg0;
+    wxBitmap * _arg1;
+    char * _argc0 = 0;
+    char * _argc1 = 0;
+    char _ptemp[128];
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"ss:wxToolBarTool_m_bitmap1_set",&_argc0,&_argc1)) 
+        return NULL;
+    if (_argc0) {
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolBarTool_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarTool_m_bitmap1_set. Expected _wxToolBarTool_p.");
+        return NULL;
+        }
+    }
+    if (_argc1) {
+        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxBitmap_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxToolBarTool_m_bitmap1_set. Expected _wxBitmap_p.");
+        return NULL;
+        }
+    }
+    _result = (wxBitmap *)wxToolBarTool_m_bitmap1_set(_arg0,_arg1);
+    SWIG_MakePtr(_ptemp, (char *) _result,"_wxBitmap_p");
+    _resultobj = Py_BuildValue("s",_ptemp);
+    return _resultobj;
+}
+

 #define wxToolBarTool_m_bitmap1_get(_swigobj) (&_swigobj->m_bitmap1)
 static PyObject *_wrap_wxToolBarTool_m_bitmap1_get(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
 #define wxToolBarTool_m_bitmap1_get(_swigobj) (&_swigobj->m_bitmap1)
 static PyObject *_wrap_wxToolBarTool_m_bitmap1_get(PyObject *self, PyObject *args) {
     PyObject * _resultobj;


@@ -781,6 +1071,37 @@ static PyObject *_wrap_wxToolBarTool_m_bitmap1_get(PyObject *self, PyObject *arg
     return _resultobj;
 }
 
     return _resultobj;
 }
 

+#define wxToolBarTool_m_bitmap2_set(_swigobj,_swigval) (_swigobj->m_bitmap2 = *(_swigval),_swigval)
+static PyObject *_wrap_wxToolBarTool_m_bitmap2_set(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    wxBitmap * _result;
+    wxToolBarTool * _arg0;
+    wxBitmap * _arg1;
+    char * _argc0 = 0;
+    char * _argc1 = 0;
+    char _ptemp[128];
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"ss:wxToolBarTool_m_bitmap2_set",&_argc0,&_argc1)) 
+        return NULL;
+    if (_argc0) {
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolBarTool_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarTool_m_bitmap2_set. Expected _wxToolBarTool_p.");
+        return NULL;
+        }
+    }
+    if (_argc1) {
+        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxBitmap_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxToolBarTool_m_bitmap2_set. Expected _wxBitmap_p.");
+        return NULL;
+        }
+    }
+    _result = (wxBitmap *)wxToolBarTool_m_bitmap2_set(_arg0,_arg1);
+    SWIG_MakePtr(_ptemp, (char *) _result,"_wxBitmap_p");
+    _resultobj = Py_BuildValue("s",_ptemp);
+    return _resultobj;
+}
+

 #define wxToolBarTool_m_bitmap2_get(_swigobj) (&_swigobj->m_bitmap2)
 static PyObject *_wrap_wxToolBarTool_m_bitmap2_get(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
 #define wxToolBarTool_m_bitmap2_get(_swigobj) (&_swigobj->m_bitmap2)
 static PyObject *_wrap_wxToolBarTool_m_bitmap2_get(PyObject *self, PyObject *args) {
     PyObject * _resultobj;


@@ -804,6 +1125,30 @@ static PyObject *_wrap_wxToolBarTool_m_bitmap2_get(PyObject *self, PyObject *arg
     return _resultobj;
 }
 
     return _resultobj;
 }
 

+#define wxToolBarTool_m_isMenuCommand_set(_swigobj,_swigval) (_swigobj->m_isMenuCommand = _swigval,_swigval)
+static PyObject *_wrap_wxToolBarTool_m_isMenuCommand_set(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    bool  _result;
+    wxToolBarTool * _arg0;
+    bool  _arg1;
+    char * _argc0 = 0;
+    int tempbool1;
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"si:wxToolBarTool_m_isMenuCommand_set",&_argc0,&tempbool1)) 
+        return NULL;
+    if (_argc0) {
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolBarTool_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarTool_m_isMenuCommand_set. Expected _wxToolBarTool_p.");
+        return NULL;
+        }
+    }
+    _arg1 = (bool ) tempbool1;
+    _result = (bool )wxToolBarTool_m_isMenuCommand_set(_arg0,_arg1);
+    _resultobj = Py_BuildValue("i",_result);
+    return _resultobj;
+}
+

 #define wxToolBarTool_m_isMenuCommand_get(_swigobj) ((bool ) _swigobj->m_isMenuCommand)
 static PyObject *_wrap_wxToolBarTool_m_isMenuCommand_get(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
 #define wxToolBarTool_m_isMenuCommand_get(_swigobj) ((bool ) _swigobj->m_isMenuCommand)
 static PyObject *_wrap_wxToolBarTool_m_isMenuCommand_get(PyObject *self, PyObject *args) {
     PyObject * _resultobj;


@@ -825,6 +1170,42 @@ static PyObject *_wrap_wxToolBarTool_m_isMenuCommand_get(PyObject *self, PyObjec
     return _resultobj;
 }
 
     return _resultobj;
 }
 

+#define wxToolBarTool_m_shortHelpString_set(_swigobj,_swigval) (_swigobj->m_shortHelpString = *(_swigval),_swigval)
+static PyObject *_wrap_wxToolBarTool_m_shortHelpString_set(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    wxString * _result;
+    wxToolBarTool * _arg0;
+    wxString * _arg1;
+    char * _argc0 = 0;
+    PyObject * _obj1 = 0;
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"sO:wxToolBarTool_m_shortHelpString_set",&_argc0,&_obj1)) 
+        return NULL;
+    if (_argc0) {
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolBarTool_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarTool_m_shortHelpString_set. Expected _wxToolBarTool_p.");
+        return NULL;
+        }
+    }
+{
+    if (!PyString_Check(_obj1)) {
+        PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
+        return NULL;
+    }
+    _arg1 = new wxString(PyString_AsString(_obj1));
+}
+    _result = (wxString *)wxToolBarTool_m_shortHelpString_set(_arg0,_arg1);
+{
+    _resultobj = PyString_FromString(WXSTRINGCAST (*_result));
+}
+{
+    if (_obj1)
+        delete _arg1;
+}
+    return _resultobj;
+}
+

 #define wxToolBarTool_m_shortHelpString_get(_swigobj) (&_swigobj->m_shortHelpString)
 static PyObject *_wrap_wxToolBarTool_m_shortHelpString_get(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
 #define wxToolBarTool_m_shortHelpString_get(_swigobj) (&_swigobj->m_shortHelpString)
 static PyObject *_wrap_wxToolBarTool_m_shortHelpString_get(PyObject *self, PyObject *args) {
     PyObject * _resultobj;


@@ -848,6 +1229,42 @@ static PyObject *_wrap_wxToolBarTool_m_shortHelpString_get(PyObject *self, PyObj
     return _resultobj;
 }
 
     return _resultobj;
 }
 

+#define wxToolBarTool_m_longHelpString_set(_swigobj,_swigval) (_swigobj->m_longHelpString = *(_swigval),_swigval)
+static PyObject *_wrap_wxToolBarTool_m_longHelpString_set(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    wxString * _result;
+    wxToolBarTool * _arg0;
+    wxString * _arg1;
+    char * _argc0 = 0;
+    PyObject * _obj1 = 0;
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"sO:wxToolBarTool_m_longHelpString_set",&_argc0,&_obj1)) 
+        return NULL;
+    if (_argc0) {
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolBarTool_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarTool_m_longHelpString_set. Expected _wxToolBarTool_p.");
+        return NULL;
+        }
+    }
+{
+    if (!PyString_Check(_obj1)) {
+        PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
+        return NULL;
+    }
+    _arg1 = new wxString(PyString_AsString(_obj1));
+}
+    _result = (wxString *)wxToolBarTool_m_longHelpString_set(_arg0,_arg1);
+{
+    _resultobj = PyString_FromString(WXSTRINGCAST (*_result));
+}
+{
+    if (_obj1)
+        delete _arg1;
+}
+    return _resultobj;
+}
+

 #define wxToolBarTool_m_longHelpString_get(_swigobj) (&_swigobj->m_longHelpString)
 static PyObject *_wrap_wxToolBarTool_m_longHelpString_get(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
 #define wxToolBarTool_m_longHelpString_get(_swigobj) (&_swigobj->m_longHelpString)
 static PyObject *_wrap_wxToolBarTool_m_longHelpString_get(PyObject *self, PyObject *args) {
     PyObject * _resultobj;


@@ -1599,21 +2016,37 @@ static PyMethodDef stattoolcMethods[] = {
         { "wxToolBar_AddSeparator", _wrap_wxToolBar_AddSeparator, 1 },
         { "new_wxToolBar", _wrap_new_wxToolBar, 1 },
         { "wxToolBarTool_m_longHelpString_get", _wrap_wxToolBarTool_m_longHelpString_get, 1 },
         { "wxToolBar_AddSeparator", _wrap_wxToolBar_AddSeparator, 1 },
         { "new_wxToolBar", _wrap_new_wxToolBar, 1 },
         { "wxToolBarTool_m_longHelpString_get", _wrap_wxToolBarTool_m_longHelpString_get, 1 },

+        { "wxToolBarTool_m_longHelpString_set", _wrap_wxToolBarTool_m_longHelpString_set, 1 },

         { "wxToolBarTool_m_shortHelpString_get", _wrap_wxToolBarTool_m_shortHelpString_get, 1 },
         { "wxToolBarTool_m_shortHelpString_get", _wrap_wxToolBarTool_m_shortHelpString_get, 1 },

+        { "wxToolBarTool_m_shortHelpString_set", _wrap_wxToolBarTool_m_shortHelpString_set, 1 },

         { "wxToolBarTool_m_isMenuCommand_get", _wrap_wxToolBarTool_m_isMenuCommand_get, 1 },
         { "wxToolBarTool_m_isMenuCommand_get", _wrap_wxToolBarTool_m_isMenuCommand_get, 1 },

+        { "wxToolBarTool_m_isMenuCommand_set", _wrap_wxToolBarTool_m_isMenuCommand_set, 1 },

         { "wxToolBarTool_m_bitmap2_get", _wrap_wxToolBarTool_m_bitmap2_get, 1 },
         { "wxToolBarTool_m_bitmap2_get", _wrap_wxToolBarTool_m_bitmap2_get, 1 },

+        { "wxToolBarTool_m_bitmap2_set", _wrap_wxToolBarTool_m_bitmap2_set, 1 },

         { "wxToolBarTool_m_bitmap1_get", _wrap_wxToolBarTool_m_bitmap1_get, 1 },
         { "wxToolBarTool_m_bitmap1_get", _wrap_wxToolBarTool_m_bitmap1_get, 1 },

+        { "wxToolBarTool_m_bitmap1_set", _wrap_wxToolBarTool_m_bitmap1_set, 1 },

         { "wxToolBarTool_m_enabled_get", _wrap_wxToolBarTool_m_enabled_get, 1 },
         { "wxToolBarTool_m_enabled_get", _wrap_wxToolBarTool_m_enabled_get, 1 },

+        { "wxToolBarTool_m_enabled_set", _wrap_wxToolBarTool_m_enabled_set, 1 },

         { "wxToolBarTool_m_deleteSecondBitmap_get", _wrap_wxToolBarTool_m_deleteSecondBitmap_get, 1 },
         { "wxToolBarTool_m_deleteSecondBitmap_get", _wrap_wxToolBarTool_m_deleteSecondBitmap_get, 1 },

+        { "wxToolBarTool_m_deleteSecondBitmap_set", _wrap_wxToolBarTool_m_deleteSecondBitmap_set, 1 },

         { "wxToolBarTool_m_isToggle_get", _wrap_wxToolBarTool_m_isToggle_get, 1 },
         { "wxToolBarTool_m_isToggle_get", _wrap_wxToolBarTool_m_isToggle_get, 1 },

+        { "wxToolBarTool_m_isToggle_set", _wrap_wxToolBarTool_m_isToggle_set, 1 },

         { "wxToolBarTool_m_toggleState_get", _wrap_wxToolBarTool_m_toggleState_get, 1 },
         { "wxToolBarTool_m_toggleState_get", _wrap_wxToolBarTool_m_toggleState_get, 1 },

+        { "wxToolBarTool_m_toggleState_set", _wrap_wxToolBarTool_m_toggleState_set, 1 },

         { "wxToolBarTool_m_height_get", _wrap_wxToolBarTool_m_height_get, 1 },
         { "wxToolBarTool_m_height_get", _wrap_wxToolBarTool_m_height_get, 1 },

+        { "wxToolBarTool_m_height_set", _wrap_wxToolBarTool_m_height_set, 1 },

         { "wxToolBarTool_m_width_get", _wrap_wxToolBarTool_m_width_get, 1 },
         { "wxToolBarTool_m_width_get", _wrap_wxToolBarTool_m_width_get, 1 },

+        { "wxToolBarTool_m_width_set", _wrap_wxToolBarTool_m_width_set, 1 },

         { "wxToolBarTool_m_y_get", _wrap_wxToolBarTool_m_y_get, 1 },
         { "wxToolBarTool_m_y_get", _wrap_wxToolBarTool_m_y_get, 1 },

+        { "wxToolBarTool_m_y_set", _wrap_wxToolBarTool_m_y_set, 1 },

         { "wxToolBarTool_m_x_get", _wrap_wxToolBarTool_m_x_get, 1 },
         { "wxToolBarTool_m_x_get", _wrap_wxToolBarTool_m_x_get, 1 },

+        { "wxToolBarTool_m_x_set", _wrap_wxToolBarTool_m_x_set, 1 },

         { "wxToolBarTool_m_index_get", _wrap_wxToolBarTool_m_index_get, 1 },
         { "wxToolBarTool_m_index_get", _wrap_wxToolBarTool_m_index_get, 1 },

+        { "wxToolBarTool_m_index_set", _wrap_wxToolBarTool_m_index_set, 1 },

         { "wxToolBarTool_m_clientData_get", _wrap_wxToolBarTool_m_clientData_get, 1 },
         { "wxToolBarTool_m_clientData_get", _wrap_wxToolBarTool_m_clientData_get, 1 },

+        { "wxToolBarTool_m_clientData_set", _wrap_wxToolBarTool_m_clientData_set, 1 },

         { "wxToolBarTool_m_toolStyle_get", _wrap_wxToolBarTool_m_toolStyle_get, 1 },
         { "wxToolBarTool_m_toolStyle_get", _wrap_wxToolBarTool_m_toolStyle_get, 1 },

+        { "wxToolBarTool_m_toolStyle_set", _wrap_wxToolBarTool_m_toolStyle_set, 1 },

         { "wxToolBarTool_GetHeight", _wrap_wxToolBarTool_GetHeight, 1 },
         { "wxToolBarTool_GetWidth", _wrap_wxToolBarTool_GetWidth, 1 },
         { "wxToolBarTool_SetSize", _wrap_wxToolBarTool_SetSize, 1 },
         { "wxToolBarTool_GetHeight", _wrap_wxToolBarTool_GetHeight, 1 },
         { "wxToolBarTool_GetWidth", _wrap_wxToolBarTool_GetWidth, 1 },
         { "wxToolBarTool_SetSize", _wrap_wxToolBarTool_SetSize, 1 },


@@ -1659,6 +2092,7 @@ SWIGEXPORT(void,initstattoolc)() {
         SWIG_RegisterMapping("_wxPaintEvent","_class_wxPaintEvent",0);
         SWIG_RegisterMapping("_wxIndividualLayoutConstraint","_class_wxIndividualLayoutConstraint",0);
         SWIG_RegisterMapping("_wxCursor","_class_wxCursor",0);
         SWIG_RegisterMapping("_wxPaintEvent","_class_wxPaintEvent",0);
         SWIG_RegisterMapping("_wxIndividualLayoutConstraint","_class_wxIndividualLayoutConstraint",0);
         SWIG_RegisterMapping("_wxCursor","_class_wxCursor",0);

+        SWIG_RegisterMapping("_wxToolTip","_class_wxToolTip",0);

         SWIG_RegisterMapping("_wxMask","_class_wxMask",0);
         SWIG_RegisterMapping("_wxPyMenu","_class_wxPyMenu",0);
         SWIG_RegisterMapping("_wxPen","_class_wxPen",0);
         SWIG_RegisterMapping("_wxMask","_class_wxMask",0);
         SWIG_RegisterMapping("_wxPyMenu","_class_wxPyMenu",0);
         SWIG_RegisterMapping("_wxPen","_class_wxPen",0);


@@ -1670,6 +2104,7 @@ SWIGEXPORT(void,initstattoolc)() {
         SWIG_RegisterMapping("_long","_wxDash",0);
         SWIG_RegisterMapping("_long","_unsigned_long",0);
         SWIG_RegisterMapping("_long","_signed_long",0);
         SWIG_RegisterMapping("_long","_wxDash",0);
         SWIG_RegisterMapping("_long","_unsigned_long",0);
         SWIG_RegisterMapping("_long","_signed_long",0);

+        SWIG_RegisterMapping("_wxImageList","_class_wxImageList",0);

         SWIG_RegisterMapping("_wxDropFilesEvent","_class_wxDropFilesEvent",0);
         SWIG_RegisterMapping("_wxBitmapButton","_class_wxBitmapButton",0);
         SWIG_RegisterMapping("_class_wxAcceleratorTable","_wxAcceleratorTable",0);
         SWIG_RegisterMapping("_wxDropFilesEvent","_class_wxDropFilesEvent",0);
         SWIG_RegisterMapping("_wxBitmapButton","_class_wxBitmapButton",0);
         SWIG_RegisterMapping("_class_wxAcceleratorTable","_wxAcceleratorTable",0);


@@ -1686,6 +2121,7 @@ SWIGEXPORT(void,initstattoolc)() {
         SWIG_RegisterMapping("_wxInitDialogEvent","_class_wxInitDialogEvent",0);
         SWIG_RegisterMapping("_wxCheckBox","_class_wxCheckBox",0);
         SWIG_RegisterMapping("_wxTextCtrl","_class_wxTextCtrl",0);
         SWIG_RegisterMapping("_wxInitDialogEvent","_class_wxInitDialogEvent",0);
         SWIG_RegisterMapping("_wxCheckBox","_class_wxCheckBox",0);
         SWIG_RegisterMapping("_wxTextCtrl","_class_wxTextCtrl",0);

+        SWIG_RegisterMapping("_class_wxToolTip","_wxToolTip",0);

         SWIG_RegisterMapping("_class_wxMask","_wxMask",0);
         SWIG_RegisterMapping("_class_wxKeyEvent","_wxKeyEvent",0);
         SWIG_RegisterMapping("_wxColour","_class_wxColour",0);
         SWIG_RegisterMapping("_class_wxMask","_wxMask",0);
         SWIG_RegisterMapping("_class_wxKeyEvent","_wxKeyEvent",0);
         SWIG_RegisterMapping("_wxColour","_class_wxColour",0);


@@ -1802,6 +2238,7 @@ SWIGEXPORT(void,initstattoolc)() {
         SWIG_RegisterMapping("_wxJoystickEvent","_class_wxJoystickEvent",0);
         SWIG_RegisterMapping("_class_wxChoice","_wxChoice",0);
         SWIG_RegisterMapping("_class_wxSlider","_wxSlider",0);
         SWIG_RegisterMapping("_wxJoystickEvent","_class_wxJoystickEvent",0);
         SWIG_RegisterMapping("_class_wxChoice","_wxChoice",0);
         SWIG_RegisterMapping("_class_wxSlider","_wxSlider",0);

+        SWIG_RegisterMapping("_class_wxImageList","_wxImageList",0);

         SWIG_RegisterMapping("_class_wxBitmapButton","_wxBitmapButton",0);
         SWIG_RegisterMapping("_wxWindowID","_EBool",0);
         SWIG_RegisterMapping("_wxWindowID","_uint",0);
         SWIG_RegisterMapping("_class_wxBitmapButton","_wxBitmapButton",0);
         SWIG_RegisterMapping("_wxWindowID","_EBool",0);
         SWIG_RegisterMapping("_wxWindowID","_uint",0);

diff --git a/utils/wxPython/src/msw/utils.cpp b/utils/wxPython/src/msw/utils.cpp
index 2b43e0fe77137d7f5d5c787455afbaef4ca7eed4..f85b8a7d5f46209556910a8872333807beb1fc1e 100644 (file)
--- a/utils/wxPython/src/msw/utils.cpp
+++ b/utils/wxPython/src/msw/utils.cpp
@@ -238,6 +238,27 @@ static PyObject *_wrap_wxConfig_DontCreateOnDemand(PyObject *self, PyObject *arg
     return _resultobj;
 }
 
     return _resultobj;
 }
 

+#define wxConfig_DeleteAll(_swigobj)  (_swigobj->DeleteAll())
+static PyObject *_wrap_wxConfig_DeleteAll(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    bool  _result;
+    wxConfig * _arg0;
+    char * _argc0 = 0;
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"s:wxConfig_DeleteAll",&_argc0)) 
+        return NULL;
+    if (_argc0) {
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxConfig_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxConfig_DeleteAll. Expected _wxConfig_p.");
+        return NULL;
+        }
+    }
+    _result = (bool )wxConfig_DeleteAll(_arg0);
+    _resultobj = Py_BuildValue("i",_result);
+    return _resultobj;
+}
+

 #define wxConfig_DeleteEntry(_swigobj,_swigarg0,_swigarg1)  (_swigobj->DeleteEntry(_swigarg0,_swigarg1))
 static PyObject *_wrap_wxConfig_DeleteEntry(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
 #define wxConfig_DeleteEntry(_swigobj,_swigarg0,_swigarg1)  (_swigobj->DeleteEntry(_swigarg0,_swigarg1))
 static PyObject *_wrap_wxConfig_DeleteEntry(PyObject *self, PyObject *args) {
     PyObject * _resultobj;


@@ -1142,6 +1163,7 @@ static PyMethodDef utilscMethods[] = {
         { "wxConfig_Exists", _wrap_wxConfig_Exists, 1 },
         { "wxConfig_DeleteGroup", _wrap_wxConfig_DeleteGroup, 1 },
         { "wxConfig_DeleteEntry", _wrap_wxConfig_DeleteEntry, 1 },
         { "wxConfig_Exists", _wrap_wxConfig_Exists, 1 },
         { "wxConfig_DeleteGroup", _wrap_wxConfig_DeleteGroup, 1 },
         { "wxConfig_DeleteEntry", _wrap_wxConfig_DeleteEntry, 1 },

+        { "wxConfig_DeleteAll", _wrap_wxConfig_DeleteAll, 1 },

         { "wxConfig_DontCreateOnDemand", _wrap_wxConfig_DontCreateOnDemand, 1 },
         { "delete_wxConfig", _wrap_delete_wxConfig, 1 },
         { "new_wxConfig", _wrap_new_wxConfig, 1 },
         { "wxConfig_DontCreateOnDemand", _wrap_wxConfig_DontCreateOnDemand, 1 },
         { "delete_wxConfig", _wrap_delete_wxConfig, 1 },
         { "new_wxConfig", _wrap_new_wxConfig, 1 },

diff --git a/utils/wxPython/src/msw/utils.py b/utils/wxPython/src/msw/utils.py
index 3128077d1ada95555d06a046d81e529849b36afa..c37f637d95b786d206d1adfce397363fc1ab388b 100644 (file)
--- a/utils/wxPython/src/msw/utils.py
+++ b/utils/wxPython/src/msw/utils.py
@@ -10,6 +10,9 @@ class wxConfigPtr :
     def DontCreateOnDemand(self):
         val = utilsc.wxConfig_DontCreateOnDemand(self.this)
         return val
     def DontCreateOnDemand(self):
         val = utilsc.wxConfig_DontCreateOnDemand(self.this)
         return val

+    def DeleteAll(self):
+        val = utilsc.wxConfig_DeleteAll(self.this)
+        return val

     def DeleteEntry(self,arg0,*args):
         val = apply(utilsc.wxConfig_DeleteEntry,(self.this,arg0,)+args)
         return val
     def DeleteEntry(self,arg0,*args):
         val = apply(utilsc.wxConfig_DeleteEntry,(self.this,arg0,)+args)
         return val

diff --git a/utils/wxPython/src/msw/windows.cpp b/utils/wxPython/src/msw/windows.cpp
index a1538c3e012951fd964361e1ddb4892cddbdf58c..1a8fb004375326d555788e1f4489e25d6427ae82 100644 (file)
--- a/utils/wxPython/src/msw/windows.cpp
+++ b/utils/wxPython/src/msw/windows.cpp
@@ -118,6 +118,13 @@ static char* wxStringErrorMsg = "string type is required for parameter";
     wxWindow* wxWindow_FindFocus() {
         return wxWindow::FindFocus();
     }
     wxWindow* wxWindow_FindFocus() {
         return wxWindow::FindFocus();
     }

+
+wxWindow* wxWindow_FromHWND(unsigned long hWnd) {
+    wxWindow* win = new wxWindow;
+    win->SetHWND(hWnd);
+    win->SubclassWin(hWnd);
+    return win;
+}

 static PyObject *_wrap_wxWindow_FindFocus(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxWindow * _result;
 static PyObject *_wrap_wxWindow_FindFocus(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxWindow * _result;


@@ -132,6 +139,21 @@ static PyObject *_wrap_wxWindow_FindFocus(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
     return _resultobj;
 }
 

+static PyObject *_wrap_wxWindow_FromHWND(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    wxWindow * _result;
+    unsigned long  _arg0;
+    char _ptemp[128];
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"l:wxWindow_FromHWND",&_arg0)) 
+        return NULL;
+    _result = (wxWindow *)wxWindow_FromHWND(_arg0);
+    SWIG_MakePtr(_ptemp, (char *) _result,"_wxWindow_p");
+    _resultobj = Py_BuildValue("s",_ptemp);
+    return _resultobj;
+}
+

 static void  wxEvtHandler_Connect(wxEvtHandler *self,int  id,int  lastId,int  eventType,PyObject * func) {
             if (PyCallable_Check(func)) {
                 self->Connect(id, lastId, eventType,
 static void  wxEvtHandler_Connect(wxEvtHandler *self,int  id,int  lastId,int  eventType,PyObject * func) {
             if (PyCallable_Check(func)) {
                 self->Connect(id, lastId, eventType,


@@ -282,8 +304,8 @@ static PyObject *_wrap_wxWindow_Centre(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
     return _resultobj;
 }
 

-#define wxWindow_ClientToScreen(_swigobj,_swigarg0,_swigarg1)  (_swigobj->ClientToScreen(_swigarg0,_swigarg1))
-static PyObject *_wrap_wxWindow_ClientToScreen(PyObject *self, PyObject *args) {
+#define wxWindow_ClientToScreenXY(_swigobj,_swigarg0,_swigarg1)  (_swigobj->ClientToScreen(_swigarg0,_swigarg1))
+static PyObject *_wrap_wxWindow_ClientToScreenXY(PyObject *self, PyObject *args) {

     PyObject * _resultobj;
     wxWindow * _arg0;
     int * _arg1;
     PyObject * _resultobj;
     wxWindow * _arg0;
     int * _arg1;


@@ -295,11 +317,11 @@ static PyObject *_wrap_wxWindow_ClientToScreen(PyObject *self, PyObject *args) {
     PyObject * _obj2 = 0;
 
     self = self;
     PyObject * _obj2 = 0;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sOO:wxWindow_ClientToScreen",&_argc0,&_obj1,&_obj2)) 
+    if(!PyArg_ParseTuple(args,"sOO:wxWindow_ClientToScreenXY",&_argc0,&_obj1,&_obj2)) 

         return NULL;
     if (_argc0) {
         if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
         return NULL;
     if (_argc0) {
         if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {

-            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_ClientToScreen. Expected _wxWindow_p.");
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_ClientToScreenXY. Expected _wxWindow_p.");

         return NULL;
         }
     }
         return NULL;
         }
     }


@@ -311,7 +333,7 @@ static PyObject *_wrap_wxWindow_ClientToScreen(PyObject *self, PyObject *args) {
   temp0 = (int) PyInt_AsLong(_obj2);
   _arg2 = &temp0;
 }
   temp0 = (int) PyInt_AsLong(_obj2);
   _arg2 = &temp0;
 }

-    wxWindow_ClientToScreen(_arg0,_arg1,_arg2);
+    wxWindow_ClientToScreenXY(_arg0,_arg1,_arg2);

     Py_INCREF(Py_None);
     _resultobj = Py_None;
 {
     Py_INCREF(Py_None);
     _resultobj = Py_None;
 {


@@ -327,6 +349,37 @@ static PyObject *_wrap_wxWindow_ClientToScreen(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
     return _resultobj;
 }
 

+#define wxWindow_ClientToScreen(_swigobj,_swigarg0)  (_swigobj->ClientToScreen(_swigarg0))
+static PyObject *_wrap_wxWindow_ClientToScreen(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    wxPoint * _result;
+    wxWindow * _arg0;
+    wxPoint * _arg1;
+    char * _argc0 = 0;
+    char * _argc1 = 0;
+    char _ptemp[128];
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"ss:wxWindow_ClientToScreen",&_argc0,&_argc1)) 
+        return NULL;
+    if (_argc0) {
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_ClientToScreen. Expected _wxWindow_p.");
+        return NULL;
+        }
+    }
+    if (_argc1) {
+        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxPoint_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxWindow_ClientToScreen. Expected _wxPoint_p.");
+        return NULL;
+        }
+    }
+    _result = new wxPoint (wxWindow_ClientToScreen(_arg0,*_arg1));
+    SWIG_MakePtr(_ptemp, (void *) _result,"_wxPoint_p");
+    _resultobj = Py_BuildValue("s",_ptemp);
+    return _resultobj;
+}
+

 #define wxWindow_Close(_swigobj,_swigarg0)  (_swigobj->Close(_swigarg0))
 static PyObject *_wrap_wxWindow_Close(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
 #define wxWindow_Close(_swigobj,_swigarg0)  (_swigobj->Close(_swigarg0))
 static PyObject *_wrap_wxWindow_Close(PyObject *self, PyObject *args) {
     PyObject * _resultobj;


@@ -439,8 +492,8 @@ static PyObject *_wrap_wxWindow_Enable(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
     return _resultobj;
 }
 

-#define wxWindow_FindWindowByID(_swigobj,_swigarg0)  (_swigobj->FindWindow(_swigarg0))
-static PyObject *_wrap_wxWindow_FindWindowByID(PyObject *self, PyObject *args) {
+#define wxWindow_FindWindowById(_swigobj,_swigarg0)  (_swigobj->FindWindow(_swigarg0))
+static PyObject *_wrap_wxWindow_FindWindowById(PyObject *self, PyObject *args) {

     PyObject * _resultobj;
     wxWindow * _result;
     wxWindow * _arg0;
     PyObject * _resultobj;
     wxWindow * _result;
     wxWindow * _arg0;


@@ -449,15 +502,15 @@ static PyObject *_wrap_wxWindow_FindWindowByID(PyObject *self, PyObject *args) {
     char _ptemp[128];
 
     self = self;
     char _ptemp[128];
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sl:wxWindow_FindWindowByID",&_argc0,&_arg1)) 
+    if(!PyArg_ParseTuple(args,"sl:wxWindow_FindWindowById",&_argc0,&_arg1)) 

         return NULL;
     if (_argc0) {
         if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
         return NULL;
     if (_argc0) {
         if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {

-            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_FindWindowByID. Expected _wxWindow_p.");
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_FindWindowById. Expected _wxWindow_p.");

         return NULL;
         }
     }
         return NULL;
         }
     }

-    _result = (wxWindow *)wxWindow_FindWindowByID(_arg0,_arg1);
+    _result = (wxWindow *)wxWindow_FindWindowById(_arg0,_arg1);

     SWIG_MakePtr(_ptemp, (char *) _result,"_wxWindow_p");
     _resultobj = Py_BuildValue("s",_ptemp);
     return _resultobj;
     SWIG_MakePtr(_ptemp, (char *) _result,"_wxWindow_p");
     _resultobj = Py_BuildValue("s",_ptemp);
     return _resultobj;


@@ -1153,6 +1206,88 @@ static PyObject *_wrap_wxWindow_GetTextExtent(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
     return _resultobj;
 }
 

+#define wxWindow_GetFullTextExtent(_swigobj,_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5)  (_swigobj->GetTextExtent(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5))
+static PyObject *_wrap_wxWindow_GetFullTextExtent(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    wxWindow * _arg0;
+    wxString * _arg1;
+    int * _arg2;
+    int  temp;
+    int * _arg3;
+    int  temp0;
+    int * _arg4;
+    int  temp1;
+    int * _arg5;
+    int  temp2;
+    wxFont * _arg6 = NULL;
+    char * _argc0 = 0;
+    PyObject * _obj1 = 0;
+    char * _argc6 = 0;
+
+    self = self;
+{
+  _arg2 = &temp;
+}
+{
+  _arg3 = &temp0;
+}
+{
+  _arg4 = &temp1;
+}
+{
+  _arg5 = &temp2;
+}
+    if(!PyArg_ParseTuple(args,"sO|s:wxWindow_GetFullTextExtent",&_argc0,&_obj1,&_argc6)) 
+        return NULL;
+    if (_argc0) {
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_GetFullTextExtent. Expected _wxWindow_p.");
+        return NULL;
+        }
+    }
+{
+    if (!PyString_Check(_obj1)) {
+        PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
+        return NULL;
+    }
+    _arg1 = new wxString(PyString_AsString(_obj1));
+}
+    if (_argc6) {
+        if (SWIG_GetPtr(_argc6,(void **) &_arg6,"_wxFont_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 7 of wxWindow_GetFullTextExtent. Expected _wxFont_p.");
+        return NULL;
+        }
+    }
+    wxWindow_GetFullTextExtent(_arg0,*_arg1,_arg2,_arg3,_arg4,_arg5,_arg6);
+    Py_INCREF(Py_None);
+    _resultobj = Py_None;
+{
+    PyObject *o;
+    o = PyInt_FromLong((long) (*_arg2));
+    _resultobj = t_output_helper(_resultobj, o);
+}
+{
+    PyObject *o;
+    o = PyInt_FromLong((long) (*_arg3));
+    _resultobj = t_output_helper(_resultobj, o);
+}
+{
+    PyObject *o;
+    o = PyInt_FromLong((long) (*_arg4));
+    _resultobj = t_output_helper(_resultobj, o);
+}
+{
+    PyObject *o;
+    o = PyInt_FromLong((long) (*_arg5));
+    _resultobj = t_output_helper(_resultobj, o);
+}
+{
+    if (_obj1)
+        delete _arg1;
+}
+    return _resultobj;
+}
+

 #define wxWindow_GetTitle(_swigobj)  (_swigobj->GetTitle())
 static PyObject *_wrap_wxWindow_GetTitle(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
 #define wxWindow_GetTitle(_swigobj)  (_swigobj->GetTitle())
 static PyObject *_wrap_wxWindow_GetTitle(PyObject *self, PyObject *args) {
     PyObject * _resultobj;


@@ -1400,8 +1535,8 @@ static PyObject *_wrap_wxWindow_MakeModal(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
     return _resultobj;
 }
 

-#define wxWindow_Move(_swigobj,_swigarg0,_swigarg1)  (_swigobj->Move(_swigarg0,_swigarg1))
-static PyObject *_wrap_wxWindow_Move(PyObject *self, PyObject *args) {
+#define wxWindow_MoveXY(_swigobj,_swigarg0,_swigarg1)  (_swigobj->Move(_swigarg0,_swigarg1))
+static PyObject *_wrap_wxWindow_MoveXY(PyObject *self, PyObject *args) {

     PyObject * _resultobj;
     wxWindow * _arg0;
     int  _arg1;
     PyObject * _resultobj;
     wxWindow * _arg0;
     int  _arg1;


@@ -1409,7 +1544,30 @@ static PyObject *_wrap_wxWindow_Move(PyObject *self, PyObject *args) {
     char * _argc0 = 0;
 
     self = self;
     char * _argc0 = 0;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sii:wxWindow_Move",&_argc0,&_arg1,&_arg2)) 
+    if(!PyArg_ParseTuple(args,"sii:wxWindow_MoveXY",&_argc0,&_arg1,&_arg2)) 
+        return NULL;
+    if (_argc0) {
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_MoveXY. Expected _wxWindow_p.");
+        return NULL;
+        }
+    }
+    wxWindow_MoveXY(_arg0,_arg1,_arg2);
+    Py_INCREF(Py_None);
+    _resultobj = Py_None;
+    return _resultobj;
+}
+
+#define wxWindow_Move(_swigobj,_swigarg0)  (_swigobj->Move(_swigarg0))
+static PyObject *_wrap_wxWindow_Move(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    wxWindow * _arg0;
+    wxPoint * _arg1;
+    char * _argc0 = 0;
+    char * _argc1 = 0;
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"ss:wxWindow_Move",&_argc0,&_argc1)) 

         return NULL;
     if (_argc0) {
         if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
         return NULL;
     if (_argc0) {
         if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {


@@ -1417,7 +1575,13 @@ static PyObject *_wrap_wxWindow_Move(PyObject *self, PyObject *args) {
         return NULL;
         }
     }
         return NULL;
         }
     }

-    wxWindow_Move(_arg0,_arg1,_arg2);
+    if (_argc1) {
+        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxPoint_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxWindow_Move. Expected _wxPoint_p.");
+        return NULL;
+        }
+    }
+    wxWindow_Move(_arg0,*_arg1);

     Py_INCREF(Py_None);
     _resultobj = Py_None;
     return _resultobj;
     Py_INCREF(Py_None);
     _resultobj = Py_None;
     return _resultobj;


@@ -1528,8 +1692,8 @@ static PyObject *_wrap_wxWindow_ReleaseMouse(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
     return _resultobj;
 }
 

-#define wxWindow_ScreenToClient(_swigobj,_swigarg0,_swigarg1)  (_swigobj->ScreenToClient(_swigarg0,_swigarg1))
-static PyObject *_wrap_wxWindow_ScreenToClient(PyObject *self, PyObject *args) {
+#define wxWindow_ScreenToClientXY(_swigobj,_swigarg0,_swigarg1)  (_swigobj->ScreenToClient(_swigarg0,_swigarg1))
+static PyObject *_wrap_wxWindow_ScreenToClientXY(PyObject *self, PyObject *args) {

     PyObject * _resultobj;
     wxWindow * _arg0;
     int * _arg1;
     PyObject * _resultobj;
     wxWindow * _arg0;
     int * _arg1;


@@ -1541,11 +1705,11 @@ static PyObject *_wrap_wxWindow_ScreenToClient(PyObject *self, PyObject *args) {
     PyObject * _obj2 = 0;
 
     self = self;
     PyObject * _obj2 = 0;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sOO:wxWindow_ScreenToClient",&_argc0,&_obj1,&_obj2)) 
+    if(!PyArg_ParseTuple(args,"sOO:wxWindow_ScreenToClientXY",&_argc0,&_obj1,&_obj2)) 

         return NULL;
     if (_argc0) {
         if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
         return NULL;
     if (_argc0) {
         if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {

-            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_ScreenToClient. Expected _wxWindow_p.");
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_ScreenToClientXY. Expected _wxWindow_p.");

         return NULL;
         }
     }
         return NULL;
         }
     }


@@ -1557,7 +1721,7 @@ static PyObject *_wrap_wxWindow_ScreenToClient(PyObject *self, PyObject *args) {
   temp0 = (int) PyInt_AsLong(_obj2);
   _arg2 = &temp0;
 }
   temp0 = (int) PyInt_AsLong(_obj2);
   _arg2 = &temp0;
 }

-    wxWindow_ScreenToClient(_arg0,_arg1,_arg2);
+    wxWindow_ScreenToClientXY(_arg0,_arg1,_arg2);

     Py_INCREF(Py_None);
     _resultobj = Py_None;
 {
     Py_INCREF(Py_None);
     _resultobj = Py_None;
 {


@@ -1573,6 +1737,37 @@ static PyObject *_wrap_wxWindow_ScreenToClient(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
     return _resultobj;
 }
 

+#define wxWindow_ScreenToClient(_swigobj,_swigarg0)  (_swigobj->ScreenToClient(_swigarg0))
+static PyObject *_wrap_wxWindow_ScreenToClient(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    wxPoint * _result;
+    wxWindow * _arg0;
+    wxPoint * _arg1;
+    char * _argc0 = 0;
+    char * _argc1 = 0;
+    char _ptemp[128];
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"ss:wxWindow_ScreenToClient",&_argc0,&_argc1)) 
+        return NULL;
+    if (_argc0) {
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_ScreenToClient. Expected _wxWindow_p.");
+        return NULL;
+        }
+    }
+    if (_argc1) {
+        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxPoint_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxWindow_ScreenToClient. Expected _wxPoint_p.");
+        return NULL;
+        }
+    }
+    _result = new wxPoint (wxWindow_ScreenToClient(_arg0,*_arg1));
+    SWIG_MakePtr(_ptemp, (void *) _result,"_wxPoint_p");
+    _resultobj = Py_BuildValue("s",_ptemp);
+    return _resultobj;
+}
+

 #define wxWindow_ScrollWindow(_swigobj,_swigarg0,_swigarg1,_swigarg2)  (_swigobj->ScrollWindow(_swigarg0,_swigarg1,_swigarg2))
 static PyObject *_wrap_wxWindow_ScrollWindow(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
 #define wxWindow_ScrollWindow(_swigobj,_swigarg0,_swigarg1,_swigarg2)  (_swigobj->ScrollWindow(_swigarg0,_swigarg1,_swigarg2))
 static PyObject *_wrap_wxWindow_ScrollWindow(PyObject *self, PyObject *args) {
     PyObject * _resultobj;


@@ -2065,8 +2260,8 @@ static PyObject *_wrap_wxWindow_SetSizeHints(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
     return _resultobj;
 }
 

-#define wxWindow_SetClientSize(_swigobj,_swigarg0,_swigarg1)  (_swigobj->SetClientSize(_swigarg0,_swigarg1))
-static PyObject *_wrap_wxWindow_SetClientSize(PyObject *self, PyObject *args) {
+#define wxWindow_SetClientSizeWH(_swigobj,_swigarg0,_swigarg1)  (_swigobj->SetClientSize(_swigarg0,_swigarg1))
+static PyObject *_wrap_wxWindow_SetClientSizeWH(PyObject *self, PyObject *args) {

     PyObject * _resultobj;
     wxWindow * _arg0;
     int  _arg1;
     PyObject * _resultobj;
     wxWindow * _arg0;
     int  _arg1;


@@ -2074,7 +2269,30 @@ static PyObject *_wrap_wxWindow_SetClientSize(PyObject *self, PyObject *args) {
     char * _argc0 = 0;
 
     self = self;
     char * _argc0 = 0;
 
     self = self;

-    if(!PyArg_ParseTuple(args,"sii:wxWindow_SetClientSize",&_argc0,&_arg1,&_arg2)) 
+    if(!PyArg_ParseTuple(args,"sii:wxWindow_SetClientSizeWH",&_argc0,&_arg1,&_arg2)) 
+        return NULL;
+    if (_argc0) {
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_SetClientSizeWH. Expected _wxWindow_p.");
+        return NULL;
+        }
+    }
+    wxWindow_SetClientSizeWH(_arg0,_arg1,_arg2);
+    Py_INCREF(Py_None);
+    _resultobj = Py_None;
+    return _resultobj;
+}
+
+#define wxWindow_SetClientSize(_swigobj,_swigarg0)  (_swigobj->SetClientSize(_swigarg0))
+static PyObject *_wrap_wxWindow_SetClientSize(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    wxWindow * _arg0;
+    wxSize * _arg1;
+    char * _argc0 = 0;
+    char * _argc1 = 0;
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"ss:wxWindow_SetClientSize",&_argc0,&_argc1)) 

         return NULL;
     if (_argc0) {
         if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
         return NULL;
     if (_argc0) {
         if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {


@@ -2082,7 +2300,13 @@ static PyObject *_wrap_wxWindow_SetClientSize(PyObject *self, PyObject *args) {
         return NULL;
         }
     }
         return NULL;
         }
     }

-    wxWindow_SetClientSize(_arg0,_arg1,_arg2);
+    if (_argc1) {
+        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxSize_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxWindow_SetClientSize. Expected _wxSize_p.");
+        return NULL;
+        }
+    }
+    wxWindow_SetClientSize(_arg0,*_arg1);

     Py_INCREF(Py_None);
     _resultobj = Py_None;
     return _resultobj;
     Py_INCREF(Py_None);
     _resultobj = Py_None;
     return _resultobj;


@@ -2385,6 +2609,92 @@ static PyObject *_wrap_wxWindow_ConvertPixelSizeToDialog(PyObject *self, PyObjec
     return _resultobj;
 }
 
     return _resultobj;
 }
 

+#define wxWindow_SetToolTipString(_swigobj,_swigarg0)  (_swigobj->SetToolTip(_swigarg0))
+static PyObject *_wrap_wxWindow_SetToolTipString(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    wxWindow * _arg0;
+    wxString * _arg1;
+    char * _argc0 = 0;
+    PyObject * _obj1 = 0;
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"sO:wxWindow_SetToolTipString",&_argc0,&_obj1)) 
+        return NULL;
+    if (_argc0) {
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_SetToolTipString. Expected _wxWindow_p.");
+        return NULL;
+        }
+    }
+{
+    if (!PyString_Check(_obj1)) {
+        PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
+        return NULL;
+    }
+    _arg1 = new wxString(PyString_AsString(_obj1));
+}
+    wxWindow_SetToolTipString(_arg0,*_arg1);
+    Py_INCREF(Py_None);
+    _resultobj = Py_None;
+{
+    if (_obj1)
+        delete _arg1;
+}
+    return _resultobj;
+}
+
+#define wxWindow_SetToolTip(_swigobj,_swigarg0)  (_swigobj->SetToolTip(_swigarg0))
+static PyObject *_wrap_wxWindow_SetToolTip(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    wxWindow * _arg0;
+    wxToolTip * _arg1;
+    char * _argc0 = 0;
+    char * _argc1 = 0;
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"ss:wxWindow_SetToolTip",&_argc0,&_argc1)) 
+        return NULL;
+    if (_argc0) {
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_SetToolTip. Expected _wxWindow_p.");
+        return NULL;
+        }
+    }
+    if (_argc1) {
+        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxToolTip_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxWindow_SetToolTip. Expected _wxToolTip_p.");
+        return NULL;
+        }
+    }
+    wxWindow_SetToolTip(_arg0,_arg1);
+    Py_INCREF(Py_None);
+    _resultobj = Py_None;
+    return _resultobj;
+}
+
+#define wxWindow_GetToolTip(_swigobj)  (_swigobj->GetToolTip())
+static PyObject *_wrap_wxWindow_GetToolTip(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    wxToolTip * _result;
+    wxWindow * _arg0;
+    char * _argc0 = 0;
+    char _ptemp[128];
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"s:wxWindow_GetToolTip",&_argc0)) 
+        return NULL;
+    if (_argc0) {
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_GetToolTip. Expected _wxWindow_p.");
+        return NULL;
+        }
+    }
+    _result = (wxToolTip *)wxWindow_GetToolTip(_arg0);
+    SWIG_MakePtr(_ptemp, (char *) _result,"_wxToolTip_p");
+    _resultobj = Py_BuildValue("s",_ptemp);
+    return _resultobj;
+}
+

 static void *SwigwxPanelTowxWindow(void *ptr) {
     wxPanel *src;
     wxWindow *dest;
 static void *SwigwxPanelTowxWindow(void *ptr) {
     wxPanel *src;
     wxWindow *dest;


@@ -3234,6 +3544,35 @@ static PyObject *_wrap_wxMenu_AppendMenu(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
     return _resultobj;
 }
 

+#define wxMenu_AppendItem(_swigobj,_swigarg0)  (_swigobj->Append(_swigarg0))
+static PyObject *_wrap_wxMenu_AppendItem(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    wxMenu * _arg0;
+    wxMenuItem * _arg1;
+    char * _argc0 = 0;
+    char * _argc1 = 0;
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"ss:wxMenu_AppendItem",&_argc0,&_argc1)) 
+        return NULL;
+    if (_argc0) {
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxMenu_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenu_AppendItem. Expected _wxMenu_p.");
+        return NULL;
+        }
+    }
+    if (_argc1) {
+        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxMenuItem_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxMenu_AppendItem. Expected _wxMenuItem_p.");
+        return NULL;
+        }
+    }
+    wxMenu_AppendItem(_arg0,_arg1);
+    Py_INCREF(Py_None);
+    _resultobj = Py_None;
+    return _resultobj;
+}
+

 #define wxMenu_AppendSeparator(_swigobj)  (_swigobj->AppendSeparator())
 static PyObject *_wrap_wxMenu_AppendSeparator(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
 #define wxMenu_AppendSeparator(_swigobj)  (_swigobj->AppendSeparator())
 static PyObject *_wrap_wxMenu_AppendSeparator(PyObject *self, PyObject *args) {
     PyObject * _resultobj;


@@ -4530,6 +4869,7 @@ static PyMethodDef windowscMethods[] = {
         { "wxMenu_Check", _wrap_wxMenu_Check, 1 },
         { "wxMenu_Break", _wrap_wxMenu_Break, 1 },
         { "wxMenu_AppendSeparator", _wrap_wxMenu_AppendSeparator, 1 },
         { "wxMenu_Check", _wrap_wxMenu_Check, 1 },
         { "wxMenu_Break", _wrap_wxMenu_Break, 1 },
         { "wxMenu_AppendSeparator", _wrap_wxMenu_AppendSeparator, 1 },

+        { "wxMenu_AppendItem", _wrap_wxMenu_AppendItem, 1 },

         { "wxMenu_AppendMenu", _wrap_wxMenu_AppendMenu, 1 },
         { "wxMenu_Append", _wrap_wxMenu_Append, 1 },
         { "new_wxMenu", _wrap_new_wxMenu, 1 },
         { "wxMenu_AppendMenu", _wrap_wxMenu_AppendMenu, 1 },
         { "wxMenu_Append", _wrap_wxMenu_Append, 1 },
         { "new_wxMenu", _wrap_new_wxMenu, 1 },


@@ -4555,6 +4895,9 @@ static PyMethodDef windowscMethods[] = {
         { "new_wxDialog", _wrap_new_wxDialog, 1 },
         { "wxPanel_InitDialog", _wrap_wxPanel_InitDialog, 1 },
         { "new_wxPanel", _wrap_new_wxPanel, 1 },
         { "new_wxDialog", _wrap_new_wxDialog, 1 },
         { "wxPanel_InitDialog", _wrap_wxPanel_InitDialog, 1 },
         { "new_wxPanel", _wrap_new_wxPanel, 1 },

+        { "wxWindow_GetToolTip", _wrap_wxWindow_GetToolTip, 1 },
+        { "wxWindow_SetToolTip", _wrap_wxWindow_SetToolTip, 1 },
+        { "wxWindow_SetToolTipString", _wrap_wxWindow_SetToolTipString, 1 },

         { "wxWindow_ConvertPixelSizeToDialog", _wrap_wxWindow_ConvertPixelSizeToDialog, 1 },
         { "wxWindow_ConvertPixelPointToDialog", _wrap_wxWindow_ConvertPixelPointToDialog, 1 },
         { "wxWindow_ConvertDialogSizeToPixels", _wrap_wxWindow_ConvertDialogSizeToPixels, 1 },
         { "wxWindow_ConvertPixelSizeToDialog", _wrap_wxWindow_ConvertPixelSizeToDialog, 1 },
         { "wxWindow_ConvertPixelPointToDialog", _wrap_wxWindow_ConvertPixelPointToDialog, 1 },
         { "wxWindow_ConvertDialogSizeToPixels", _wrap_wxWindow_ConvertDialogSizeToPixels, 1 },


@@ -4567,6 +4910,7 @@ static PyMethodDef windowscMethods[] = {
         { "wxWindow_SetTitle", _wrap_wxWindow_SetTitle, 1 },
         { "wxWindow_SetCursor", _wrap_wxWindow_SetCursor, 1 },
         { "wxWindow_SetClientSize", _wrap_wxWindow_SetClientSize, 1 },
         { "wxWindow_SetTitle", _wrap_wxWindow_SetTitle, 1 },
         { "wxWindow_SetCursor", _wrap_wxWindow_SetCursor, 1 },
         { "wxWindow_SetClientSize", _wrap_wxWindow_SetClientSize, 1 },

+        { "wxWindow_SetClientSizeWH", _wrap_wxWindow_SetClientSizeWH, 1 },

         { "wxWindow_SetSizeHints", _wrap_wxWindow_SetSizeHints, 1 },
         { "wxWindow_SetPosition", _wrap_wxWindow_SetPosition, 1 },
         { "wxWindow_SetSize", _wrap_wxWindow_SetSize, 1 },
         { "wxWindow_SetSizeHints", _wrap_wxWindow_SetSizeHints, 1 },
         { "wxWindow_SetPosition", _wrap_wxWindow_SetPosition, 1 },
         { "wxWindow_SetSize", _wrap_wxWindow_SetSize, 1 },


@@ -4586,11 +4930,13 @@ static PyMethodDef windowscMethods[] = {
         { "wxWindow_SetAcceleratorTable", _wrap_wxWindow_SetAcceleratorTable, 1 },
         { "wxWindow_ScrollWindow", _wrap_wxWindow_ScrollWindow, 1 },
         { "wxWindow_ScreenToClient", _wrap_wxWindow_ScreenToClient, 1 },
         { "wxWindow_SetAcceleratorTable", _wrap_wxWindow_SetAcceleratorTable, 1 },
         { "wxWindow_ScrollWindow", _wrap_wxWindow_ScrollWindow, 1 },
         { "wxWindow_ScreenToClient", _wrap_wxWindow_ScreenToClient, 1 },

+        { "wxWindow_ScreenToClientXY", _wrap_wxWindow_ScreenToClientXY, 1 },

         { "wxWindow_ReleaseMouse", _wrap_wxWindow_ReleaseMouse, 1 },
         { "wxWindow_Refresh", _wrap_wxWindow_Refresh, 1 },
         { "wxWindow_Raise", _wrap_wxWindow_Raise, 1 },
         { "wxWindow_PopupMenu", _wrap_wxWindow_PopupMenu, 1 },
         { "wxWindow_Move", _wrap_wxWindow_Move, 1 },
         { "wxWindow_ReleaseMouse", _wrap_wxWindow_ReleaseMouse, 1 },
         { "wxWindow_Refresh", _wrap_wxWindow_Refresh, 1 },
         { "wxWindow_Raise", _wrap_wxWindow_Raise, 1 },
         { "wxWindow_PopupMenu", _wrap_wxWindow_PopupMenu, 1 },
         { "wxWindow_Move", _wrap_wxWindow_Move, 1 },

+        { "wxWindow_MoveXY", _wrap_wxWindow_MoveXY, 1 },

         { "wxWindow_MakeModal", _wrap_wxWindow_MakeModal, 1 },
         { "wxWindow_Lower", _wrap_wxWindow_Lower, 1 },
         { "wxWindow_LoadFromResource", _wrap_wxWindow_LoadFromResource, 1 },
         { "wxWindow_MakeModal", _wrap_wxWindow_MakeModal, 1 },
         { "wxWindow_Lower", _wrap_wxWindow_Lower, 1 },
         { "wxWindow_LoadFromResource", _wrap_wxWindow_LoadFromResource, 1 },


@@ -4601,6 +4947,7 @@ static PyMethodDef windowscMethods[] = {
         { "wxWindow_InitDialog", _wrap_wxWindow_InitDialog, 1 },
         { "wxWindow_GetWindowStyleFlag", _wrap_wxWindow_GetWindowStyleFlag, 1 },
         { "wxWindow_GetTitle", _wrap_wxWindow_GetTitle, 1 },
         { "wxWindow_InitDialog", _wrap_wxWindow_InitDialog, 1 },
         { "wxWindow_GetWindowStyleFlag", _wrap_wxWindow_GetWindowStyleFlag, 1 },
         { "wxWindow_GetTitle", _wrap_wxWindow_GetTitle, 1 },

+        { "wxWindow_GetFullTextExtent", _wrap_wxWindow_GetFullTextExtent, 1 },

         { "wxWindow_GetTextExtent", _wrap_wxWindow_GetTextExtent, 1 },
         { "wxWindow_GetSize", _wrap_wxWindow_GetSize, 1 },
         { "wxWindow_GetSizeTuple", _wrap_wxWindow_GetSizeTuple, 1 },
         { "wxWindow_GetTextExtent", _wrap_wxWindow_GetTextExtent, 1 },
         { "wxWindow_GetSize", _wrap_wxWindow_GetSize, 1 },
         { "wxWindow_GetSizeTuple", _wrap_wxWindow_GetSizeTuple, 1 },


@@ -4627,18 +4974,20 @@ static PyMethodDef windowscMethods[] = {
         { "wxWindow_GetBackgroundColour", _wrap_wxWindow_GetBackgroundColour, 1 },
         { "wxWindow_Fit", _wrap_wxWindow_Fit, 1 },
         { "wxWindow_FindWindowByName", _wrap_wxWindow_FindWindowByName, 1 },
         { "wxWindow_GetBackgroundColour", _wrap_wxWindow_GetBackgroundColour, 1 },
         { "wxWindow_Fit", _wrap_wxWindow_Fit, 1 },
         { "wxWindow_FindWindowByName", _wrap_wxWindow_FindWindowByName, 1 },

-        { "wxWindow_FindWindowByID", _wrap_wxWindow_FindWindowByID, 1 },
+        { "wxWindow_FindWindowById", _wrap_wxWindow_FindWindowById, 1 },

         { "wxWindow_Enable", _wrap_wxWindow_Enable, 1 },
         { "wxWindow_DragAcceptFiles", _wrap_wxWindow_DragAcceptFiles, 1 },
         { "wxWindow_DestroyChildren", _wrap_wxWindow_DestroyChildren, 1 },
         { "wxWindow_Destroy", _wrap_wxWindow_Destroy, 1 },
         { "wxWindow_Close", _wrap_wxWindow_Close, 1 },
         { "wxWindow_ClientToScreen", _wrap_wxWindow_ClientToScreen, 1 },
         { "wxWindow_Enable", _wrap_wxWindow_Enable, 1 },
         { "wxWindow_DragAcceptFiles", _wrap_wxWindow_DragAcceptFiles, 1 },
         { "wxWindow_DestroyChildren", _wrap_wxWindow_DestroyChildren, 1 },
         { "wxWindow_Destroy", _wrap_wxWindow_Destroy, 1 },
         { "wxWindow_Close", _wrap_wxWindow_Close, 1 },
         { "wxWindow_ClientToScreen", _wrap_wxWindow_ClientToScreen, 1 },

+        { "wxWindow_ClientToScreenXY", _wrap_wxWindow_ClientToScreenXY, 1 },

         { "wxWindow_Centre", _wrap_wxWindow_Centre, 1 },
         { "wxWindow_Center", _wrap_wxWindow_Center, 1 },
         { "wxWindow_CaptureMouse", _wrap_wxWindow_CaptureMouse, 1 },
         { "new_wxWindow", _wrap_new_wxWindow, 1 },
         { "wxEvtHandler_Connect", _wrap_wxEvtHandler_Connect, 1 },
         { "wxWindow_Centre", _wrap_wxWindow_Centre, 1 },
         { "wxWindow_Center", _wrap_wxWindow_Center, 1 },
         { "wxWindow_CaptureMouse", _wrap_wxWindow_CaptureMouse, 1 },
         { "new_wxWindow", _wrap_new_wxWindow, 1 },
         { "wxEvtHandler_Connect", _wrap_wxEvtHandler_Connect, 1 },

+        { "wxWindow_FromHWND", _wrap_wxWindow_FromHWND, 1 },

         { "wxWindow_FindFocus", _wrap_wxWindow_FindFocus, 1 },
         { NULL, NULL }
 };
         { "wxWindow_FindFocus", _wrap_wxWindow_FindFocus, 1 },
         { NULL, NULL }
 };


@@ -4676,6 +5025,7 @@ SWIGEXPORT(void,initwindowsc)() {
         SWIG_RegisterMapping("_class_wxEvtHandler","_wxEvtHandler",0);
         SWIG_RegisterMapping("_wxIndividualLayoutConstraint","_class_wxIndividualLayoutConstraint",0);
         SWIG_RegisterMapping("_wxCursor","_class_wxCursor",0);
         SWIG_RegisterMapping("_class_wxEvtHandler","_wxEvtHandler",0);
         SWIG_RegisterMapping("_wxIndividualLayoutConstraint","_class_wxIndividualLayoutConstraint",0);
         SWIG_RegisterMapping("_wxCursor","_class_wxCursor",0);

+        SWIG_RegisterMapping("_wxToolTip","_class_wxToolTip",0);

         SWIG_RegisterMapping("_wxMask","_class_wxMask",0);
         SWIG_RegisterMapping("_wxPyMenu","_class_wxPyMenu",0);
         SWIG_RegisterMapping("_wxPen","_class_wxPen",0);
         SWIG_RegisterMapping("_wxMask","_class_wxMask",0);
         SWIG_RegisterMapping("_wxPyMenu","_class_wxPyMenu",0);
         SWIG_RegisterMapping("_wxPen","_class_wxPen",0);


@@ -4683,6 +5033,7 @@ SWIGEXPORT(void,initwindowsc)() {
         SWIG_RegisterMapping("_long","_wxDash",0);
         SWIG_RegisterMapping("_long","_unsigned_long",0);
         SWIG_RegisterMapping("_long","_signed_long",0);
         SWIG_RegisterMapping("_long","_wxDash",0);
         SWIG_RegisterMapping("_long","_unsigned_long",0);
         SWIG_RegisterMapping("_long","_signed_long",0);

+        SWIG_RegisterMapping("_wxImageList","_class_wxImageList",0);

         SWIG_RegisterMapping("_class_wxAcceleratorTable","_wxAcceleratorTable",0);
         SWIG_RegisterMapping("_wxDC","_class_wxDC",0);
         SWIG_RegisterMapping("_class_wxRealPoint","_wxRealPoint",0);
         SWIG_RegisterMapping("_class_wxAcceleratorTable","_wxAcceleratorTable",0);
         SWIG_RegisterMapping("_wxDC","_class_wxDC",0);
         SWIG_RegisterMapping("_class_wxRealPoint","_wxRealPoint",0);


@@ -4691,6 +5042,7 @@ SWIGEXPORT(void,initwindowsc)() {
         SWIG_RegisterMapping("_wxPanel","_class_wxDialog",SwigwxDialogTowxPanel);
         SWIG_RegisterMapping("_wxPanel","_wxDialog",SwigwxDialogTowxPanel);
         SWIG_RegisterMapping("_wxPanel","_class_wxPanel",0);
         SWIG_RegisterMapping("_wxPanel","_class_wxDialog",SwigwxDialogTowxPanel);
         SWIG_RegisterMapping("_wxPanel","_wxDialog",SwigwxDialogTowxPanel);
         SWIG_RegisterMapping("_wxPanel","_class_wxPanel",0);

+        SWIG_RegisterMapping("_class_wxToolTip","_wxToolTip",0);

         SWIG_RegisterMapping("_class_wxMask","_wxMask",0);
         SWIG_RegisterMapping("_wxColour","_class_wxColour",0);
         SWIG_RegisterMapping("_class_wxDialog","_wxDialog",0);
         SWIG_RegisterMapping("_class_wxMask","_wxMask",0);
         SWIG_RegisterMapping("_wxColour","_class_wxColour",0);
         SWIG_RegisterMapping("_class_wxDialog","_wxDialog",0);


@@ -4767,6 +5119,7 @@ SWIGEXPORT(void,initwindowsc)() {
         SWIG_RegisterMapping("_short","_WXTYPE",0);
         SWIG_RegisterMapping("_short","_unsigned_short",0);
         SWIG_RegisterMapping("_short","_signed_short",0);
         SWIG_RegisterMapping("_short","_WXTYPE",0);
         SWIG_RegisterMapping("_short","_unsigned_short",0);
         SWIG_RegisterMapping("_short","_signed_short",0);

+        SWIG_RegisterMapping("_class_wxImageList","_wxImageList",0);

         SWIG_RegisterMapping("_wxWindowID","_EBool",0);
         SWIG_RegisterMapping("_wxWindowID","_uint",0);
         SWIG_RegisterMapping("_wxWindowID","_int",0);
         SWIG_RegisterMapping("_wxWindowID","_EBool",0);
         SWIG_RegisterMapping("_wxWindowID","_uint",0);
         SWIG_RegisterMapping("_wxWindowID","_int",0);

diff --git a/utils/wxPython/src/msw/windows.py b/utils/wxPython/src/msw/windows.py
index bc234b094f73a43ab33ecc68f01617ad51d9241e..1d315ba70be47ed043a723cf0c15a30a22ab3503 100644 (file)
--- a/utils/wxPython/src/msw/windows.py
+++ b/utils/wxPython/src/msw/windows.py
@@ -10,7 +10,7 @@ def wxDLG_PNT(win, point):
     return win.ConvertDialogPointToPixels(point)
 
 def wxDLG_SZE(win, size):
     return win.ConvertDialogPointToPixels(point)
 
 def wxDLG_SZE(win, size):

-    return win.ConvertDialogPointToPixels(size)
+    return win.ConvertDialogSizeToPixels(size)

 
 class wxEvtHandlerPtr :
     def __init__(self,this):
 
 class wxEvtHandlerPtr :
     def __init__(self,this):


@@ -41,8 +41,13 @@ class wxWindowPtr(wxEvtHandlerPtr):
     def Centre(self,*args):
         val = apply(windowsc.wxWindow_Centre,(self.this,)+args)
         return val
     def Centre(self,*args):
         val = apply(windowsc.wxWindow_Centre,(self.this,)+args)
         return val

-    def ClientToScreen(self,arg0,arg1):
-        val = windowsc.wxWindow_ClientToScreen(self.this,arg0,arg1)
+    def ClientToScreenXY(self,arg0,arg1):
+        val = windowsc.wxWindow_ClientToScreenXY(self.this,arg0,arg1)
+        return val
+    def ClientToScreen(self,arg0):
+        val = windowsc.wxWindow_ClientToScreen(self.this,arg0.this)
+        val = wxPointPtr(val)
+        val.thisown = 1

         return val
     def Close(self,*args):
         val = apply(windowsc.wxWindow_Close,(self.this,)+args)
         return val
     def Close(self,*args):
         val = apply(windowsc.wxWindow_Close,(self.this,)+args)


@@ -59,8 +64,8 @@ class wxWindowPtr(wxEvtHandlerPtr):
     def Enable(self,arg0):
         val = windowsc.wxWindow_Enable(self.this,arg0)
         return val
     def Enable(self,arg0):
         val = windowsc.wxWindow_Enable(self.this,arg0)
         return val

-    def FindWindowByID(self,arg0):
-        val = windowsc.wxWindow_FindWindowByID(self.this,arg0)
+    def FindWindowById(self,arg0):
+        val = windowsc.wxWindow_FindWindowById(self.this,arg0)

         val = wxWindowPtr(val)
         return val
     def FindWindowByName(self,arg0):
         val = wxWindowPtr(val)
         return val
     def FindWindowByName(self,arg0):


@@ -159,6 +164,13 @@ class wxWindowPtr(wxEvtHandlerPtr):
     def GetTextExtent(self,arg0):
         val = windowsc.wxWindow_GetTextExtent(self.this,arg0)
         return val
     def GetTextExtent(self,arg0):
         val = windowsc.wxWindow_GetTextExtent(self.this,arg0)
         return val

+    def GetFullTextExtent(self,arg0,*args):
+        argl = map(None,args)
+        try: argl[0] = argl[0].this
+        except: pass
+        args = tuple(argl)
+        val = apply(windowsc.wxWindow_GetFullTextExtent,(self.this,arg0,)+args)
+        return val

     def GetTitle(self):
         val = windowsc.wxWindow_GetTitle(self.this)
         return val
     def GetTitle(self):
         val = windowsc.wxWindow_GetTitle(self.this)
         return val


@@ -189,8 +201,11 @@ class wxWindowPtr(wxEvtHandlerPtr):
     def MakeModal(self,arg0):
         val = windowsc.wxWindow_MakeModal(self.this,arg0)
         return val
     def MakeModal(self,arg0):
         val = windowsc.wxWindow_MakeModal(self.this,arg0)
         return val

-    def Move(self,arg0,arg1):
-        val = windowsc.wxWindow_Move(self.this,arg0,arg1)
+    def MoveXY(self,arg0,arg1):
+        val = windowsc.wxWindow_MoveXY(self.this,arg0,arg1)
+        return val
+    def Move(self,arg0):
+        val = windowsc.wxWindow_Move(self.this,arg0.this)

         return val
     def PopupMenu(self,arg0,arg1,arg2):
         val = windowsc.wxWindow_PopupMenu(self.this,arg0.this,arg1,arg2)
         return val
     def PopupMenu(self,arg0,arg1,arg2):
         val = windowsc.wxWindow_PopupMenu(self.this,arg0.this,arg1,arg2)


@@ -208,8 +223,13 @@ class wxWindowPtr(wxEvtHandlerPtr):
     def ReleaseMouse(self):
         val = windowsc.wxWindow_ReleaseMouse(self.this)
         return val
     def ReleaseMouse(self):
         val = windowsc.wxWindow_ReleaseMouse(self.this)
         return val

-    def ScreenToClient(self,arg0,arg1):
-        val = windowsc.wxWindow_ScreenToClient(self.this,arg0,arg1)
+    def ScreenToClientXY(self,arg0,arg1):
+        val = windowsc.wxWindow_ScreenToClientXY(self.this,arg0,arg1)
+        return val
+    def ScreenToClient(self,arg0):
+        val = windowsc.wxWindow_ScreenToClient(self.this,arg0.this)
+        val = wxPointPtr(val)
+        val.thisown = 1

         return val
     def ScrollWindow(self,arg0,arg1,*args):
         argl = map(None,args)
         return val
     def ScrollWindow(self,arg0,arg1,*args):
         argl = map(None,args)


@@ -269,8 +289,11 @@ class wxWindowPtr(wxEvtHandlerPtr):
     def SetSizeHints(self,*args):
         val = apply(windowsc.wxWindow_SetSizeHints,(self.this,)+args)
         return val
     def SetSizeHints(self,*args):
         val = apply(windowsc.wxWindow_SetSizeHints,(self.this,)+args)
         return val

-    def SetClientSize(self,arg0,arg1):
-        val = windowsc.wxWindow_SetClientSize(self.this,arg0,arg1)
+    def SetClientSizeWH(self,arg0,arg1):
+        val = windowsc.wxWindow_SetClientSizeWH(self.this,arg0,arg1)
+        return val
+    def SetClientSize(self,arg0):
+        val = windowsc.wxWindow_SetClientSize(self.this,arg0.this)

         return val
     def SetCursor(self,arg0):
         val = windowsc.wxWindow_SetCursor(self.this,arg0.this)
         return val
     def SetCursor(self,arg0):
         val = windowsc.wxWindow_SetCursor(self.this,arg0.this)


@@ -313,6 +336,16 @@ class wxWindowPtr(wxEvtHandlerPtr):
         val = wxSizePtr(val)
         val.thisown = 1
         return val
         val = wxSizePtr(val)
         val.thisown = 1
         return val

+    def SetToolTipString(self,arg0):
+        val = windowsc.wxWindow_SetToolTipString(self.this,arg0)
+        return val
+    def SetToolTip(self,arg0):
+        val = windowsc.wxWindow_SetToolTip(self.this,arg0.this)
+        return val
+    def GetToolTip(self):
+        val = windowsc.wxWindow_GetToolTip(self.this)
+        val = wxToolTipPtr(val)
+        return val

     def __repr__(self):
         return "<C wxWindow instance>"
 class wxWindow(wxWindowPtr):
     def __repr__(self):
         return "<C wxWindow instance>"
 class wxWindow(wxWindowPtr):


@@ -461,6 +494,9 @@ class wxMenuPtr(wxEvtHandlerPtr):
     def AppendMenu(self,arg0,arg1,arg2,*args):
         val = apply(windowsc.wxMenu_AppendMenu,(self.this,arg0,arg1,arg2.this,)+args)
         return val
     def AppendMenu(self,arg0,arg1,arg2,*args):
         val = apply(windowsc.wxMenu_AppendMenu,(self.this,arg0,arg1,arg2.this,)+args)
         return val

+    def AppendItem(self,arg0):
+        val = windowsc.wxMenu_AppendItem(self.this,arg0.this)
+        return val

     def AppendSeparator(self):
         val = windowsc.wxMenu_AppendSeparator(self.this)
         return val
     def AppendSeparator(self):
         val = windowsc.wxMenu_AppendSeparator(self.this)
         return val


@@ -657,6 +693,11 @@ def wxWindow_FindFocus():
     val = wxWindowPtr(val)
     return val
 
     val = wxWindowPtr(val)
     return val
 

+def wxWindow_FromHWND(arg0):
+    val = windowsc.wxWindow_FromHWND(arg0)
+    val = wxWindowPtr(val)
+    return val
+

 
 
 #-------------- VARIABLE WRAPPERS ------------------
 
 
 #-------------- VARIABLE WRAPPERS ------------------

diff --git a/utils/wxPython/src/msw/windows2.cpp b/utils/wxPython/src/msw/windows2.cpp
index e28bd783c6a358a54653c2b59d4ae2b8b804a8cb..11bf56e2a44847431c665f710f1c6ae1a70599c2 100644 (file)
--- a/utils/wxPython/src/msw/windows2.cpp
+++ b/utils/wxPython/src/msw/windows2.cpp
@@ -2164,6 +2164,28 @@ static void *SwigwxGridEventTowxEvent(void *ptr) {
     return (void *) dest;
 }
 
     return (void *) dest;
 }
 

+#define wxGridEvent_m_row_set(_swigobj,_swigval) (_swigobj->m_row = _swigval,_swigval)
+static PyObject *_wrap_wxGridEvent_m_row_set(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    int  _result;
+    wxGridEvent * _arg0;
+    int  _arg1;
+    char * _argc0 = 0;
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"si:wxGridEvent_m_row_set",&_argc0,&_arg1)) 
+        return NULL;
+    if (_argc0) {
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxGridEvent_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGridEvent_m_row_set. Expected _wxGridEvent_p.");
+        return NULL;
+        }
+    }
+    _result = (int )wxGridEvent_m_row_set(_arg0,_arg1);
+    _resultobj = Py_BuildValue("i",_result);
+    return _resultobj;
+}
+

 #define wxGridEvent_m_row_get(_swigobj) ((int ) _swigobj->m_row)
 static PyObject *_wrap_wxGridEvent_m_row_get(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
 #define wxGridEvent_m_row_get(_swigobj) ((int ) _swigobj->m_row)
 static PyObject *_wrap_wxGridEvent_m_row_get(PyObject *self, PyObject *args) {
     PyObject * _resultobj;


@@ -2185,6 +2207,28 @@ static PyObject *_wrap_wxGridEvent_m_row_get(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
     return _resultobj;
 }
 

+#define wxGridEvent_m_col_set(_swigobj,_swigval) (_swigobj->m_col = _swigval,_swigval)
+static PyObject *_wrap_wxGridEvent_m_col_set(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    int  _result;
+    wxGridEvent * _arg0;
+    int  _arg1;
+    char * _argc0 = 0;
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"si:wxGridEvent_m_col_set",&_argc0,&_arg1)) 
+        return NULL;
+    if (_argc0) {
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxGridEvent_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGridEvent_m_col_set. Expected _wxGridEvent_p.");
+        return NULL;
+        }
+    }
+    _result = (int )wxGridEvent_m_col_set(_arg0,_arg1);
+    _resultobj = Py_BuildValue("i",_result);
+    return _resultobj;
+}
+

 #define wxGridEvent_m_col_get(_swigobj) ((int ) _swigobj->m_col)
 static PyObject *_wrap_wxGridEvent_m_col_get(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
 #define wxGridEvent_m_col_get(_swigobj) ((int ) _swigobj->m_col)
 static PyObject *_wrap_wxGridEvent_m_col_get(PyObject *self, PyObject *args) {
     PyObject * _resultobj;


@@ -2206,6 +2250,28 @@ static PyObject *_wrap_wxGridEvent_m_col_get(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
     return _resultobj;
 }
 

+#define wxGridEvent_m_x_set(_swigobj,_swigval) (_swigobj->m_x = _swigval,_swigval)
+static PyObject *_wrap_wxGridEvent_m_x_set(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    int  _result;
+    wxGridEvent * _arg0;
+    int  _arg1;
+    char * _argc0 = 0;
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"si:wxGridEvent_m_x_set",&_argc0,&_arg1)) 
+        return NULL;
+    if (_argc0) {
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxGridEvent_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGridEvent_m_x_set. Expected _wxGridEvent_p.");
+        return NULL;
+        }
+    }
+    _result = (int )wxGridEvent_m_x_set(_arg0,_arg1);
+    _resultobj = Py_BuildValue("i",_result);
+    return _resultobj;
+}
+

 #define wxGridEvent_m_x_get(_swigobj) ((int ) _swigobj->m_x)
 static PyObject *_wrap_wxGridEvent_m_x_get(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
 #define wxGridEvent_m_x_get(_swigobj) ((int ) _swigobj->m_x)
 static PyObject *_wrap_wxGridEvent_m_x_get(PyObject *self, PyObject *args) {
     PyObject * _resultobj;


@@ -2227,6 +2293,28 @@ static PyObject *_wrap_wxGridEvent_m_x_get(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
     return _resultobj;
 }
 

+#define wxGridEvent_m_y_set(_swigobj,_swigval) (_swigobj->m_y = _swigval,_swigval)
+static PyObject *_wrap_wxGridEvent_m_y_set(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    int  _result;
+    wxGridEvent * _arg0;
+    int  _arg1;
+    char * _argc0 = 0;
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"si:wxGridEvent_m_y_set",&_argc0,&_arg1)) 
+        return NULL;
+    if (_argc0) {
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxGridEvent_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGridEvent_m_y_set. Expected _wxGridEvent_p.");
+        return NULL;
+        }
+    }
+    _result = (int )wxGridEvent_m_y_set(_arg0,_arg1);
+    _resultobj = Py_BuildValue("i",_result);
+    return _resultobj;
+}
+

 #define wxGridEvent_m_y_get(_swigobj) ((int ) _swigobj->m_y)
 static PyObject *_wrap_wxGridEvent_m_y_get(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
 #define wxGridEvent_m_y_get(_swigobj) ((int ) _swigobj->m_y)
 static PyObject *_wrap_wxGridEvent_m_y_get(PyObject *self, PyObject *args) {
     PyObject * _resultobj;


@@ -2248,6 +2336,30 @@ static PyObject *_wrap_wxGridEvent_m_y_get(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
     return _resultobj;
 }
 

+#define wxGridEvent_m_control_set(_swigobj,_swigval) (_swigobj->m_control = _swigval,_swigval)
+static PyObject *_wrap_wxGridEvent_m_control_set(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    bool  _result;
+    wxGridEvent * _arg0;
+    bool  _arg1;
+    char * _argc0 = 0;
+    int tempbool1;
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"si:wxGridEvent_m_control_set",&_argc0,&tempbool1)) 
+        return NULL;
+    if (_argc0) {
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxGridEvent_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGridEvent_m_control_set. Expected _wxGridEvent_p.");
+        return NULL;
+        }
+    }
+    _arg1 = (bool ) tempbool1;
+    _result = (bool )wxGridEvent_m_control_set(_arg0,_arg1);
+    _resultobj = Py_BuildValue("i",_result);
+    return _resultobj;
+}
+

 #define wxGridEvent_m_control_get(_swigobj) ((bool ) _swigobj->m_control)
 static PyObject *_wrap_wxGridEvent_m_control_get(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
 #define wxGridEvent_m_control_get(_swigobj) ((bool ) _swigobj->m_control)
 static PyObject *_wrap_wxGridEvent_m_control_get(PyObject *self, PyObject *args) {
     PyObject * _resultobj;


@@ -2269,6 +2381,30 @@ static PyObject *_wrap_wxGridEvent_m_control_get(PyObject *self, PyObject *args)
     return _resultobj;
 }
 
     return _resultobj;
 }
 

+#define wxGridEvent_m_shift_set(_swigobj,_swigval) (_swigobj->m_shift = _swigval,_swigval)
+static PyObject *_wrap_wxGridEvent_m_shift_set(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    bool  _result;
+    wxGridEvent * _arg0;
+    bool  _arg1;
+    char * _argc0 = 0;
+    int tempbool1;
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"si:wxGridEvent_m_shift_set",&_argc0,&tempbool1)) 
+        return NULL;
+    if (_argc0) {
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxGridEvent_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGridEvent_m_shift_set. Expected _wxGridEvent_p.");
+        return NULL;
+        }
+    }
+    _arg1 = (bool ) tempbool1;
+    _result = (bool )wxGridEvent_m_shift_set(_arg0,_arg1);
+    _resultobj = Py_BuildValue("i",_result);
+    return _resultobj;
+}
+

 #define wxGridEvent_m_shift_get(_swigobj) ((bool ) _swigobj->m_shift)
 static PyObject *_wrap_wxGridEvent_m_shift_get(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
 #define wxGridEvent_m_shift_get(_swigobj) ((bool ) _swigobj->m_shift)
 static PyObject *_wrap_wxGridEvent_m_shift_get(PyObject *self, PyObject *args) {
     PyObject * _resultobj;


@@ -2290,6 +2426,37 @@ static PyObject *_wrap_wxGridEvent_m_shift_get(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
     return _resultobj;
 }
 

+#define wxGridEvent_m_cell_set(_swigobj,_swigval) (_swigobj->m_cell = _swigval,_swigval)
+static PyObject *_wrap_wxGridEvent_m_cell_set(PyObject *self, PyObject *args) {
+    PyObject * _resultobj;
+    wxGridCell * _result;
+    wxGridEvent * _arg0;
+    wxGridCell * _arg1;
+    char * _argc0 = 0;
+    char * _argc1 = 0;
+    char _ptemp[128];
+
+    self = self;
+    if(!PyArg_ParseTuple(args,"ss:wxGridEvent_m_cell_set",&_argc0,&_argc1)) 
+        return NULL;
+    if (_argc0) {
+        if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxGridEvent_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGridEvent_m_cell_set. Expected _wxGridEvent_p.");
+        return NULL;
+        }
+    }
+    if (_argc1) {
+        if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxGridCell_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxGridEvent_m_cell_set. Expected _wxGridCell_p.");
+        return NULL;
+        }
+    }
+    _result = (wxGridCell *)wxGridEvent_m_cell_set(_arg0,_arg1);
+    SWIG_MakePtr(_ptemp, (char *) _result,"_wxGridCell_p");
+    _resultobj = Py_BuildValue("s",_ptemp);
+    return _resultobj;
+}
+

 #define wxGridEvent_m_cell_get(_swigobj) ((wxGridCell *) _swigobj->m_cell)
 static PyObject *_wrap_wxGridEvent_m_cell_get(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
 #define wxGridEvent_m_cell_get(_swigobj) ((wxGridCell *) _swigobj->m_cell)
 static PyObject *_wrap_wxGridEvent_m_cell_get(PyObject *self, PyObject *args) {
     PyObject * _resultobj;


@@ -3508,12 +3675,19 @@ static PyMethodDef windows2cMethods[] = {
         { "wxNotebookEvent_GetOldSelection", _wrap_wxNotebookEvent_GetOldSelection, 1 },
         { "wxNotebookEvent_GetSelection", _wrap_wxNotebookEvent_GetSelection, 1 },
         { "wxGridEvent_m_cell_get", _wrap_wxGridEvent_m_cell_get, 1 },
         { "wxNotebookEvent_GetOldSelection", _wrap_wxNotebookEvent_GetOldSelection, 1 },
         { "wxNotebookEvent_GetSelection", _wrap_wxNotebookEvent_GetSelection, 1 },
         { "wxGridEvent_m_cell_get", _wrap_wxGridEvent_m_cell_get, 1 },

+        { "wxGridEvent_m_cell_set", _wrap_wxGridEvent_m_cell_set, 1 },

         { "wxGridEvent_m_shift_get", _wrap_wxGridEvent_m_shift_get, 1 },
         { "wxGridEvent_m_shift_get", _wrap_wxGridEvent_m_shift_get, 1 },

+        { "wxGridEvent_m_shift_set", _wrap_wxGridEvent_m_shift_set, 1 },

         { "wxGridEvent_m_control_get", _wrap_wxGridEvent_m_control_get, 1 },
         { "wxGridEvent_m_control_get", _wrap_wxGridEvent_m_control_get, 1 },

+        { "wxGridEvent_m_control_set", _wrap_wxGridEvent_m_control_set, 1 },

         { "wxGridEvent_m_y_get", _wrap_wxGridEvent_m_y_get, 1 },
         { "wxGridEvent_m_y_get", _wrap_wxGridEvent_m_y_get, 1 },

+        { "wxGridEvent_m_y_set", _wrap_wxGridEvent_m_y_set, 1 },

         { "wxGridEvent_m_x_get", _wrap_wxGridEvent_m_x_get, 1 },
         { "wxGridEvent_m_x_get", _wrap_wxGridEvent_m_x_get, 1 },

+        { "wxGridEvent_m_x_set", _wrap_wxGridEvent_m_x_set, 1 },

         { "wxGridEvent_m_col_get", _wrap_wxGridEvent_m_col_get, 1 },
         { "wxGridEvent_m_col_get", _wrap_wxGridEvent_m_col_get, 1 },

+        { "wxGridEvent_m_col_set", _wrap_wxGridEvent_m_col_set, 1 },

         { "wxGridEvent_m_row_get", _wrap_wxGridEvent_m_row_get, 1 },
         { "wxGridEvent_m_row_get", _wrap_wxGridEvent_m_row_get, 1 },

+        { "wxGridEvent_m_row_set", _wrap_wxGridEvent_m_row_set, 1 },

         { "wxGrid_UpdateDimensions", _wrap_wxGrid_UpdateDimensions, 1 },
         { "wxGrid_SetRowHeight", _wrap_wxGrid_SetRowHeight, 1 },
         { "wxGrid_SetLabelValue", _wrap_wxGrid_SetLabelValue, 1 },
         { "wxGrid_UpdateDimensions", _wrap_wxGrid_UpdateDimensions, 1 },
         { "wxGrid_SetRowHeight", _wrap_wxGrid_SetRowHeight, 1 },
         { "wxGrid_SetLabelValue", _wrap_wxGrid_SetLabelValue, 1 },


@@ -3651,6 +3825,7 @@ SWIGEXPORT(void,initwindows2c)() {
         SWIG_RegisterMapping("_wxPaintEvent","_class_wxPaintEvent",0);
         SWIG_RegisterMapping("_wxIndividualLayoutConstraint","_class_wxIndividualLayoutConstraint",0);
         SWIG_RegisterMapping("_wxCursor","_class_wxCursor",0);
         SWIG_RegisterMapping("_wxPaintEvent","_class_wxPaintEvent",0);
         SWIG_RegisterMapping("_wxIndividualLayoutConstraint","_class_wxIndividualLayoutConstraint",0);
         SWIG_RegisterMapping("_wxCursor","_class_wxCursor",0);

+        SWIG_RegisterMapping("_wxToolTip","_class_wxToolTip",0);

         SWIG_RegisterMapping("_wxMask","_class_wxMask",0);
         SWIG_RegisterMapping("_wxGrid","_class_wxGrid",0);
         SWIG_RegisterMapping("_wxPyMenu","_class_wxPyMenu",0);
         SWIG_RegisterMapping("_wxMask","_class_wxMask",0);
         SWIG_RegisterMapping("_wxGrid","_class_wxGrid",0);
         SWIG_RegisterMapping("_wxPyMenu","_class_wxPyMenu",0);


@@ -3664,6 +3839,7 @@ SWIGEXPORT(void,initwindows2c)() {
         SWIG_RegisterMapping("_long","_wxDash",0);
         SWIG_RegisterMapping("_long","_unsigned_long",0);
         SWIG_RegisterMapping("_long","_signed_long",0);
         SWIG_RegisterMapping("_long","_wxDash",0);
         SWIG_RegisterMapping("_long","_unsigned_long",0);
         SWIG_RegisterMapping("_long","_signed_long",0);

+        SWIG_RegisterMapping("_wxImageList","_class_wxImageList",0);

         SWIG_RegisterMapping("_wxDropFilesEvent","_class_wxDropFilesEvent",0);
         SWIG_RegisterMapping("_wxBitmapButton","_class_wxBitmapButton",0);
         SWIG_RegisterMapping("_class_wxAcceleratorTable","_wxAcceleratorTable",0);
         SWIG_RegisterMapping("_wxDropFilesEvent","_class_wxDropFilesEvent",0);
         SWIG_RegisterMapping("_wxBitmapButton","_class_wxBitmapButton",0);
         SWIG_RegisterMapping("_class_wxAcceleratorTable","_wxAcceleratorTable",0);


@@ -3681,6 +3857,7 @@ SWIGEXPORT(void,initwindows2c)() {
         SWIG_RegisterMapping("_wxInitDialogEvent","_class_wxInitDialogEvent",0);
         SWIG_RegisterMapping("_wxCheckBox","_class_wxCheckBox",0);
         SWIG_RegisterMapping("_wxTextCtrl","_class_wxTextCtrl",0);
         SWIG_RegisterMapping("_wxInitDialogEvent","_class_wxInitDialogEvent",0);
         SWIG_RegisterMapping("_wxCheckBox","_class_wxCheckBox",0);
         SWIG_RegisterMapping("_wxTextCtrl","_class_wxTextCtrl",0);

+        SWIG_RegisterMapping("_class_wxToolTip","_wxToolTip",0);

         SWIG_RegisterMapping("_class_wxMask","_wxMask",0);
         SWIG_RegisterMapping("_class_wxKeyEvent","_wxKeyEvent",0);
         SWIG_RegisterMapping("_class_wxGrid","_wxGrid",0);
         SWIG_RegisterMapping("_class_wxMask","_wxMask",0);
         SWIG_RegisterMapping("_class_wxKeyEvent","_wxKeyEvent",0);
         SWIG_RegisterMapping("_class_wxGrid","_wxGrid",0);


@@ -3810,6 +3987,7 @@ SWIGEXPORT(void,initwindows2c)() {
         SWIG_RegisterMapping("_wxJoystickEvent","_class_wxJoystickEvent",0);
         SWIG_RegisterMapping("_class_wxChoice","_wxChoice",0);
         SWIG_RegisterMapping("_class_wxSlider","_wxSlider",0);
         SWIG_RegisterMapping("_wxJoystickEvent","_class_wxJoystickEvent",0);
         SWIG_RegisterMapping("_class_wxChoice","_wxChoice",0);
         SWIG_RegisterMapping("_class_wxSlider","_wxSlider",0);

+        SWIG_RegisterMapping("_class_wxImageList","_wxImageList",0);

         SWIG_RegisterMapping("_class_wxBitmapButton","_wxBitmapButton",0);
         SWIG_RegisterMapping("_class_wxNotebook","_wxNotebook",0);
         SWIG_RegisterMapping("_wxWindowID","_EBool",0);
         SWIG_RegisterMapping("_class_wxBitmapButton","_wxBitmapButton",0);
         SWIG_RegisterMapping("_class_wxNotebook","_wxNotebook",0);
         SWIG_RegisterMapping("_wxWindowID","_EBool",0);

diff --git a/utils/wxPython/src/msw/windows2.py b/utils/wxPython/src/msw/windows2.py
index 496f8557f86cfa70f584467e62352a63881f2fe1..05a42fdf628805e44eb2f79c07e8afad3e9ba8e4 100644 (file)
--- a/utils/wxPython/src/msw/windows2.py
+++ b/utils/wxPython/src/msw/windows2.py
@@ -402,10 +402,11 @@ class wxNotebookPtr(wxControlPtr):
         val = windows2c.wxNotebook_GetPageText(self.this,arg0)
         return val
     def SetImageList(self,arg0):
         val = windows2c.wxNotebook_GetPageText(self.this,arg0)
         return val
     def SetImageList(self,arg0):

-        val = windows2c.wxNotebook_SetImageList(self.this,arg0)
+        val = windows2c.wxNotebook_SetImageList(self.this,arg0.this)

         return val
     def GetImageList(self):
         val = windows2c.wxNotebook_GetImageList(self.this)
         return val
     def GetImageList(self):
         val = windows2c.wxNotebook_GetImageList(self.this)

+        val = wxImageListPtr(val)

         return val
     def GetPageImage(self,arg0):
         val = windows2c.wxNotebook_GetPageImage(self.this,arg0)
         return val
     def GetPageImage(self,arg0):
         val = windows2c.wxNotebook_GetPageImage(self.this,arg0)

diff --git a/utils/wxPython/src/msw/windows3.cpp b/utils/wxPython/src/msw/windows3.cpp
index 5aaa7a7c684a6924ff64057ca4f12aa0945359ed..8e53cecd9cec651fd28107458812c6897eb7dd6a 100644 (file)
--- a/utils/wxPython/src/msw/windows3.cpp
+++ b/utils/wxPython/src/msw/windows3.cpp
@@ -1430,6 +1430,7 @@ SWIGEXPORT(void,initwindows3c)() {
         SWIG_RegisterMapping("_wxPaintEvent","_class_wxPaintEvent",0);
         SWIG_RegisterMapping("_wxIndividualLayoutConstraint","_class_wxIndividualLayoutConstraint",0);
         SWIG_RegisterMapping("_wxCursor","_class_wxCursor",0);
         SWIG_RegisterMapping("_wxPaintEvent","_class_wxPaintEvent",0);
         SWIG_RegisterMapping("_wxIndividualLayoutConstraint","_class_wxIndividualLayoutConstraint",0);
         SWIG_RegisterMapping("_wxCursor","_class_wxCursor",0);

+        SWIG_RegisterMapping("_wxToolTip","_class_wxToolTip",0);

         SWIG_RegisterMapping("_wxMask","_class_wxMask",0);
         SWIG_RegisterMapping("_wxGrid","_class_wxGrid",0);
         SWIG_RegisterMapping("_wxPyMenu","_class_wxPyMenu",0);
         SWIG_RegisterMapping("_wxMask","_class_wxMask",0);
         SWIG_RegisterMapping("_wxGrid","_class_wxGrid",0);
         SWIG_RegisterMapping("_wxPyMenu","_class_wxPyMenu",0);


@@ -1443,6 +1444,7 @@ SWIGEXPORT(void,initwindows3c)() {
         SWIG_RegisterMapping("_long","_wxDash",0);
         SWIG_RegisterMapping("_long","_unsigned_long",0);
         SWIG_RegisterMapping("_long","_signed_long",0);
         SWIG_RegisterMapping("_long","_wxDash",0);
         SWIG_RegisterMapping("_long","_unsigned_long",0);
         SWIG_RegisterMapping("_long","_signed_long",0);

+        SWIG_RegisterMapping("_wxImageList","_class_wxImageList",0);

         SWIG_RegisterMapping("_wxDropFilesEvent","_class_wxDropFilesEvent",0);
         SWIG_RegisterMapping("_wxBitmapButton","_class_wxBitmapButton",0);
         SWIG_RegisterMapping("_wxSashWindow","_class_wxSashLayoutWindow",SwigwxSashLayoutWindowTowxSashWindow);
         SWIG_RegisterMapping("_wxDropFilesEvent","_class_wxDropFilesEvent",0);
         SWIG_RegisterMapping("_wxBitmapButton","_class_wxBitmapButton",0);
         SWIG_RegisterMapping("_wxSashWindow","_class_wxSashLayoutWindow",SwigwxSashLayoutWindowTowxSashWindow);


@@ -1464,6 +1466,7 @@ SWIGEXPORT(void,initwindows3c)() {
         SWIG_RegisterMapping("_wxInitDialogEvent","_class_wxInitDialogEvent",0);
         SWIG_RegisterMapping("_wxCheckBox","_class_wxCheckBox",0);
         SWIG_RegisterMapping("_wxTextCtrl","_class_wxTextCtrl",0);
         SWIG_RegisterMapping("_wxInitDialogEvent","_class_wxInitDialogEvent",0);
         SWIG_RegisterMapping("_wxCheckBox","_class_wxCheckBox",0);
         SWIG_RegisterMapping("_wxTextCtrl","_class_wxTextCtrl",0);

+        SWIG_RegisterMapping("_class_wxToolTip","_wxToolTip",0);

         SWIG_RegisterMapping("_class_wxMask","_wxMask",0);
         SWIG_RegisterMapping("_class_wxKeyEvent","_wxKeyEvent",0);
         SWIG_RegisterMapping("_class_wxGrid","_wxGrid",0);
         SWIG_RegisterMapping("_class_wxMask","_wxMask",0);
         SWIG_RegisterMapping("_class_wxKeyEvent","_wxKeyEvent",0);
         SWIG_RegisterMapping("_class_wxGrid","_wxGrid",0);


@@ -1609,6 +1612,7 @@ SWIGEXPORT(void,initwindows3c)() {
         SWIG_RegisterMapping("_class_wxChoice","_wxChoice",0);
         SWIG_RegisterMapping("_class_wxSlider","_wxSlider",0);
         SWIG_RegisterMapping("_class_wxCalculateLayoutEvent","_wxCalculateLayoutEvent",0);
         SWIG_RegisterMapping("_class_wxChoice","_wxChoice",0);
         SWIG_RegisterMapping("_class_wxSlider","_wxSlider",0);
         SWIG_RegisterMapping("_class_wxCalculateLayoutEvent","_wxCalculateLayoutEvent",0);

+        SWIG_RegisterMapping("_class_wxImageList","_wxImageList",0);

         SWIG_RegisterMapping("_class_wxBitmapButton","_wxBitmapButton",0);
         SWIG_RegisterMapping("_wxFrame","_class_wxFrame",0);
         SWIG_RegisterMapping("_class_wxNotebook","_wxNotebook",0);
         SWIG_RegisterMapping("_class_wxBitmapButton","_wxBitmapButton",0);
         SWIG_RegisterMapping("_wxFrame","_class_wxFrame",0);
         SWIG_RegisterMapping("_class_wxNotebook","_wxNotebook",0);

diff --git a/utils/wxPython/src/utils.i b/utils/wxPython/src/utils.i
index c5ce6f4de9e5f6e816b6d3494270be93f0d50327..747df35a9f7a9654873cc8dcfe0b03618385cb8d 100644 (file)
--- a/utils/wxPython/src/utils.i
+++ b/utils/wxPython/src/utils.i
@@ -61,7 +61,7 @@ public:
 
 
     void DontCreateOnDemand();
 
 
     void DontCreateOnDemand();

-    // **** DANGER Will Robinson! DANGER!  bool DeleteAll();
+    bool DeleteAll();  // This is supposed to have been fixed...

     bool DeleteEntry(const wxString& key, bool bDeleteGroupIfEmpty = TRUE);
     bool DeleteGroup(const wxString& key);
     bool Exists(wxString& strName);
     bool DeleteEntry(const wxString& key, bool bDeleteGroupIfEmpty = TRUE);
     bool DeleteGroup(const wxString& key);
     bool Exists(wxString& strName);


@@ -138,6 +138,18 @@ public:
 /////////////////////////////////////////////////////////////////////////////
 //
 // $Log$
 /////////////////////////////////////////////////////////////////////////////
 //
 // $Log$

+// Revision 1.2  1999/02/20 09:03:02  RD
+// Added wxWindow_FromHWND(hWnd) for wxMSW to construct a wxWindow from a
+// window handle.  If you can get the window handle into the python code,
+// it should just work...  More news on this later.
+//
+// Added wxImageList, wxToolTip.
+//
+// Re-enabled wxConfig.DeleteAll() since it is reportedly fixed for the
+// wxRegConfig class.
+//
+// As usual, some bug fixes, tweaks, etc.
+//

 // Revision 1.1  1998/12/15 20:41:23  RD
 // Changed the import semantics from "from wxPython import *" to "from
 // wxPython.wx import *"  This is for people who are worried about
 // Revision 1.1  1998/12/15 20:41:23  RD
 // Changed the import semantics from "from wxPython import *" to "from
 // wxPython.wx import *"  This is for people who are worried about

diff --git a/utils/wxPython/src/windows.i b/utils/wxPython/src/windows.i
index e9d4ba8014cce81a799fef71adcd8c60dc8b49d2..26d4ee63a3d492dfe4820974343d3a950e79e209 100644 (file)
--- a/utils/wxPython/src/windows.i
+++ b/utils/wxPython/src/windows.i
@@ -63,7 +63,8 @@ public:
     void CaptureMouse();
     void Center(int direction = wxHORIZONTAL);
     void Centre(int direction = wxHORIZONTAL);
     void CaptureMouse();
     void Center(int direction = wxHORIZONTAL);
     void Centre(int direction = wxHORIZONTAL);

-    void ClientToScreen(int *BOTH, int *BOTH);
+    %name(ClientToScreenXY)void ClientToScreen(int *BOTH, int *BOTH);
+    wxPoint ClientToScreen(const wxPoint& pt);

     bool Close(int force = FALSE);
     bool Destroy();
     void DestroyChildren();
     bool Close(int force = FALSE);
     bool Destroy();
     void DestroyChildren();


@@ -72,7 +73,7 @@ public:
 #endif
     void Enable(bool enable);
     //bool FakePopupMenu(wxMenu* menu, int x, int y);
 #endif
     void Enable(bool enable);
     //bool FakePopupMenu(wxMenu* menu, int x, int y);

-    %name(FindWindowByID) wxWindow* FindWindow(long id);
+    %name(FindWindowById) wxWindow* FindWindow(long id);

     %name(FindWindowByName) wxWindow* FindWindow(const wxString& name);
     void Fit();
     wxColour GetBackgroundColour();
     %name(FindWindowByName) wxWindow* FindWindow(const wxString& name);
     void Fit();
     wxColour GetBackgroundColour();


@@ -102,7 +103,10 @@ public:
     int GetScrollRange(int orientation);
     %name(GetSizeTuple) void GetSize(int *OUTPUT, int *OUTPUT);
     wxSize GetSize();
     int GetScrollRange(int orientation);
     %name(GetSizeTuple) void GetSize(int *OUTPUT, int *OUTPUT);
     wxSize GetSize();

-    void GetTextExtent(const wxString& string, int *OUTPUT, int *OUTPUT); // int* descent = NULL, int* externalLeading = NULL, const wxFont* font = NULL, bool use16 = FALSE)
+    void GetTextExtent(const wxString& string, int *OUTPUT, int *OUTPUT);
+    %name(GetFullTextExtent)void GetTextExtent(const wxString& string,
+                       int *OUTPUT, int *OUTPUT, int *OUTPUT, int* OUTPUT,
+                       const wxFont* font = NULL); //, bool use16 = FALSE)

     wxString GetTitle();
     long GetWindowStyleFlag();
     void InitDialog();
     wxString GetTitle();
     long GetWindowStyleFlag();
     void InitDialog();


@@ -113,7 +117,8 @@ public:
     bool LoadFromResource(wxWindow* parent, const wxString& resourceName, const wxResourceTable* resourceTable = NULL);
     void Lower();
     void MakeModal(bool flag);
     bool LoadFromResource(wxWindow* parent, const wxString& resourceName, const wxResourceTable* resourceTable = NULL);
     void Lower();
     void MakeModal(bool flag);

-    void Move(int x, int y);
+    %name(MoveXY)void Move(int x, int y);
+    void Move(const wxPoint& point);

 
     //wxEvtHandler* PopEventHandler(bool deleteHandler = FALSE);
     bool PopupMenu(wxMenu *menu, int x, int y);
 
     //wxEvtHandler* PopEventHandler(bool deleteHandler = FALSE);
     bool PopupMenu(wxMenu *menu, int x, int y);


@@ -122,7 +127,9 @@ public:
     void Raise();
     void Refresh(bool eraseBackground = TRUE, const wxRect* rect = NULL);
     void ReleaseMouse();
     void Raise();
     void Refresh(bool eraseBackground = TRUE, const wxRect* rect = NULL);
     void ReleaseMouse();

-    void ScreenToClient(int *BOTH, int *BOTH);
+    %name(ScreenToClientXY)void ScreenToClient(int *BOTH, int *BOTH);
+    wxPoint ScreenToClient(const wxPoint& pt);
+

     void ScrollWindow(int dx, int dy, const wxRect* rect = NULL);
     void SetAcceleratorTable(const wxAcceleratorTable& accel);
     void SetAutoLayout(bool autoLayout);
     void ScrollWindow(int dx, int dy, const wxRect* rect = NULL);
     void SetAcceleratorTable(const wxAcceleratorTable& accel);
     void SetAutoLayout(bool autoLayout);


@@ -138,9 +145,6 @@ public:
     void SetScrollbar(int orientation, int position, int thumbSize, int range, bool refresh = TRUE);
     void SetScrollPos(int orientation, int pos, bool refresh = TRUE);
 
     void SetScrollbar(int orientation, int position, int thumbSize, int range, bool refresh = TRUE);
     void SetScrollPos(int orientation, int pos, bool refresh = TRUE);
 

-    //void SetSize(int x, int y, int width, int height, int sizeFlags=wxSIZE_AUTO);
-    //%name(SetSizeOnly) void SetSize(int width, int height);
-

     %name(SetDimensions) void SetSize(int x, int y, int width, int height, int sizeFlags=wxSIZE_AUTO);
     %addmethods {
         void SetSize(const wxSize& size) {
     %name(SetDimensions) void SetSize(int x, int y, int width, int height, int sizeFlags=wxSIZE_AUTO);
     %addmethods {
         void SetSize(const wxSize& size) {


@@ -153,7 +157,8 @@ public:
     }
 
     void SetSizeHints(int minW=-1, int minH=-1, int maxW=-1, int maxH=-1, int incW=-1, int incH=-1);
     }
 
     void SetSizeHints(int minW=-1, int minH=-1, int maxW=-1, int maxH=-1, int incW=-1, int incH=-1);

-    void SetClientSize(int width, int height);
+    %name(SetClientSizeWH)void SetClientSize(int width, int height);
+    void SetClientSize(const wxSize& size);

     //void SetPalette(wxPalette* palette);
     void SetCursor(const wxCursor&cursor);
     //void SetEventHandler(wxEvtHandler* handler);
     //void SetPalette(wxPalette* palette);
     void SetCursor(const wxCursor&cursor);
     //void SetEventHandler(wxEvtHandler* handler);


@@ -170,6 +175,9 @@ public:
     %name(ConvertPixelPointToDialog) wxPoint ConvertPixelsToDialog(const wxPoint& pt);
     %name(ConvertPixelSizeToDialog)  wxSize  ConvertPixelsToDialog(const wxSize& sz);
 
     %name(ConvertPixelPointToDialog) wxPoint ConvertPixelsToDialog(const wxPoint& pt);
     %name(ConvertPixelSizeToDialog)  wxSize  ConvertPixelsToDialog(const wxSize& sz);
 

+    %name(SetToolTipString)void SetToolTip(const wxString &tip);
+    void SetToolTip(wxToolTip *tooltip);
+    wxToolTip* GetToolTip();

 };
 
 %pragma(python) code = "
 };
 
 %pragma(python) code = "


@@ -177,16 +185,25 @@ def wxDLG_PNT(win, point):
     return win.ConvertDialogPointToPixels(point)
 
 def wxDLG_SZE(win, size):
     return win.ConvertDialogPointToPixels(point)
 
 def wxDLG_SZE(win, size):

-    return win.ConvertDialogPointToPixels(size)
+    return win.ConvertDialogSizeToPixels(size)

 "
 
 "
 

-// Static method(s)

 #ifdef __WXMSW__
 %inline %{
     wxWindow* wxWindow_FindFocus() {
         return wxWindow::FindFocus();
     }
 %}
 #ifdef __WXMSW__
 %inline %{
     wxWindow* wxWindow_FindFocus() {
         return wxWindow::FindFocus();
     }
 %}

+
+
+%inline %{
+wxWindow* wxWindow_FromHWND(unsigned long hWnd) {
+    wxWindow* win = new wxWindow;
+    win->SetHWND(hWnd);
+    win->SubclassWin(hWnd);
+    return win;
+}
+%}

 #endif
 
 
 #endif
 
 


@@ -270,6 +287,8 @@ public:
                 int checkable = FALSE);
     %name(AppendMenu)void Append(int id, const wxString& item, wxMenu *subMenu,
                 const wxString& helpString = wxPyEmptyStr);
                 int checkable = FALSE);
     %name(AppendMenu)void Append(int id, const wxString& item, wxMenu *subMenu,
                 const wxString& helpString = wxPyEmptyStr);

+    %name(AppendItem)void Append(const wxMenuItem* item);
+

     void AppendSeparator();
     void Break();
     void Check(int id, bool flag);
     void AppendSeparator();
     void Break();
     void Check(int id, bool flag);


@@ -351,7 +370,20 @@ public:
 /////////////////////////////////////////////////////////////////////////////
 //
 // $Log$
 /////////////////////////////////////////////////////////////////////////////
 //
 // $Log$

+// Revision 1.12  1999/02/20 09:03:03  RD
+// Added wxWindow_FromHWND(hWnd) for wxMSW to construct a wxWindow from a
+// window handle.  If you can get the window handle into the python code,
+// it should just work...  More news on this later.
+//
+// Added wxImageList, wxToolTip.
+//
+// Re-enabled wxConfig.DeleteAll() since it is reportedly fixed for the
+// wxRegConfig class.
+//
+// As usual, some bug fixes, tweaks, etc.
+//

 // Revision 1.11  1998/12/18 15:49:10  RR
 // Revision 1.11  1998/12/18 15:49:10  RR

+//

 //   wxClipboard now serves the primary selection as well
 //   wxPython fixes
 //   warning mesages
 //   wxClipboard now serves the primary selection as well
 //   wxPython fixes
 //   warning mesages

diff --git a/utils/wxPython/src/wx.i b/utils/wxPython/src/wx.i
index 10d859f96e1646d20846ed7b67c9e42abe526f24..86c735ca406dba2c437039afb847bd4913dbd8af 100644 (file)
--- a/utils/wxPython/src/wx.i
+++ b/utils/wxPython/src/wx.i
@@ -47,7 +47,7 @@
 
 //---------------------------------------------------------------------------
 
 
 //---------------------------------------------------------------------------
 

-#define __version__ "0.5.4"
+#define __version__ "2.0b5"

 
 wxPoint     wxPyDefaultPosition;
 wxSize      wxPyDefaultSize;
 
 wxPoint     wxPyDefaultPosition;
 wxSize      wxPyDefaultSize;


@@ -156,7 +156,20 @@ extern "C" SWIGEXPORT(void,initwindows3c)();
 /////////////////////////////////////////////////////////////////////////////
 //
 // $Log$
 /////////////////////////////////////////////////////////////////////////////
 //
 // $Log$

+// Revision 1.6  1999/02/20 09:03:04  RD
+// Added wxWindow_FromHWND(hWnd) for wxMSW to construct a wxWindow from a
+// window handle.  If you can get the window handle into the python code,
+// it should just work...  More news on this later.
+//
+// Added wxImageList, wxToolTip.
+//
+// Re-enabled wxConfig.DeleteAll() since it is reportedly fixed for the
+// wxRegConfig class.
+//
+// As usual, some bug fixes, tweaks, etc.
+//

 // Revision 1.5  1999/02/01 00:10:41  RD
 // Revision 1.5  1999/02/01 00:10:41  RD

+//

 // Added the missing EVT_LIST_ITEM_SELECTED and friends.
 //
 // Revision 1.4  1999/01/30 07:30:16  RD
 // Added the missing EVT_LIST_ITEM_SELECTED and friends.
 //
 // Revision 1.4  1999/01/30 07:30:16  RD

diff --git a/utils/wxPython/tests/bitmaps/smiles.bmp b/utils/wxPython/tests/bitmaps/smiles.bmp
new file mode 100644 (file)
index 0000000..39006fa
Binary files /dev/null and b/utils/wxPython/tests/bitmaps/smiles.bmp differ

diff --git a/utils/wxPython/tests/test1.py b/utils/wxPython/tests/test1.py
index a35465e2dbdc1d51f74a3f9503502d66e41481c5..d423811d906fa43fa8c60584e21a5cf6854933a9 100644 (file)
--- a/utils/wxPython/tests/test1.py
+++ b/utils/wxPython/tests/test1.py
@@ -5,30 +5,47 @@
 #
 # Author:       Robin Dunn
 #
 #
 # Author:       Robin Dunn
 #

-# Created:
+# Created:      A long time ago, in a galaxy far, far away...

 # RCS-ID:       $Id$
 # Copyright:    (c) 1998 by Total Control Software
 # Licence:      wxWindows license
 #----------------------------------------------------------------------------
 
 
 # RCS-ID:       $Id$
 # Copyright:    (c) 1998 by Total Control Software
 # Licence:      wxWindows license
 #----------------------------------------------------------------------------
 
 

+## import all of the wxPython GUI package

 from wxPython.wx import *
 
 
 #---------------------------------------------------------------------------
 
 from wxPython.wx import *
 
 
 #---------------------------------------------------------------------------
 

+## Create a new frame class, derived from the wxPython Frame.

 class MyFrame(wxFrame):
 class MyFrame(wxFrame):

+

     def __init__(self, parent, id, title):
     def __init__(self, parent, id, title):

-        wxFrame.__init__(self, parent, id, title, wxPoint(100, 100), wxSize(160, 100))
-        self.Connect(-1, -1, wxEVT_MOVE, self.OnMove)
+        # First, call the base class' __init__ method to create the frame
+        wxFrame.__init__(self, parent, id, title,
+                         wxPoint(100, 100), wxSize(160, 100))
+
+        # Associate some events with methods of this class
+        EVT_SIZE(self, self.OnSize)
+        EVT_MOVE(self, self.OnMove)

 
 

+
+    # This method is called automatically when the CLOSE event is
+    # sent to this window

     def OnCloseWindow(self, event):
     def OnCloseWindow(self, event):

+        # tell the window to kill itself

         self.Destroy()
 
         self.Destroy()
 

+
+    # This method is called by the System when the window is resized,
+    # because of the association above.

     def OnSize(self, event):
         size = event.GetSize()
         print "size:", size.width, size.height
 
     def OnSize(self, event):
         size = event.GetSize()
         print "size:", size.width, size.height
 

+    # This method is called by the System when the window is moved,
+    # because of the association above.

     def OnMove(self, event):
         pos = event.GetPosition()
         print "pos:", pos.x, pos.y
     def OnMove(self, event):
         pos = event.GetPosition()
         print "pos:", pos.x, pos.y


@@ -37,58 +54,29 @@ class MyFrame(wxFrame):
 
 #---------------------------------------------------------------------------
 
 
 #---------------------------------------------------------------------------
 

-
+# Every wxWindows application must have a class derived from wxApp

 class MyApp(wxApp):
 class MyApp(wxApp):

+
+    # wxWindows calls this method to initialize the application

     def OnInit(self):
     def OnInit(self):

+
+        # Create an instance of our customized Frame class

         frame = MyFrame(NULL, -1, "This is a test")
         frame.Show(true)
         frame = MyFrame(NULL, -1, "This is a test")
         frame.Show(true)

+
+        # Tell wxWindows that this is our main window

         self.SetTopWindow(frame)
         self.SetTopWindow(frame)

+
+        # Return a success flag

         return true
 
 #---------------------------------------------------------------------------
 
 
         return true
 
 #---------------------------------------------------------------------------
 
 

-def main():
-    app = MyApp(0)
-    app.MainLoop()
-
-
-def t():
-    import pdb
-    pdb.run('main()')
-
-if __name__ == '__main__':
-    main()
-
+app = MyApp(0)     # Create an instance of the application class
+app.MainLoop()     # Tell it to start processing events

 
 
 #----------------------------------------------------------------------------
 #
 
 
 #----------------------------------------------------------------------------
 #

-# $Log$
-# Revision 1.3  1998/12/15 20:44:34  RD
-# Changed the import semantics from "from wxPython import *" to "from
-# wxPython.wx import *"  This is for people who are worried about
-# namespace pollution, they can use "from wxPython import wx" and then
-# prefix all the wxPython identifiers with "wx."
-#
-# Added wxTaskbarIcon for wxMSW.
-#
-# Made the events work for wxGrid.
-#
-# Added wxConfig.
-#
-# Added wxMiniFrame for wxGTK, (untested.)
-#
-# Changed many of the args and return values that were pointers to gdi
-# objects to references to reflect changes in the wxWindows API.
-#
-# Other assorted fixes and additions.
-#
-# Revision 1.2  1998/10/02 06:42:27  RD
-#
-# Version 0.4 of wxPython for MSW.
-#
-# Revision 1.1  1998/08/09 08:28:05  RD
-# Initial version
-#
-#
+

diff --git a/utils/wxPython/tests/test3.py b/utils/wxPython/tests/test3.py
index 7da376bc5b154463f2ead412c78211e1ec8d7176..64a11120cc57f9d45f9cb61a91548c3cbe5b9900 100644 (file)
--- a/utils/wxPython/tests/test3.py
+++ b/utils/wxPython/tests/test3.py
@@ -29,7 +29,7 @@ class MyCanvas(wxWindow):
         font = wxFont(42, wxSWISS, wxNORMAL, wxNORMAL)
         dc.SetFont(font)
         st = "Python Rules!"
         font = wxFont(42, wxSWISS, wxNORMAL, wxNORMAL)
         dc.SetFont(font)
         st = "Python Rules!"

-        tw,th, d,e = dc.GetTextExtent(st)
+        tw,th = dc.GetTextExtent(st)

         dc.DrawText(st, (size.width-tw)/2, (size.height-th)/2)
         dc.EndDrawing()
 
         dc.DrawText(st, (size.width-tw)/2, (size.height-th)/2)
         dc.EndDrawing()
 


@@ -147,7 +147,20 @@ if __name__ == '__main__':
 #----------------------------------------------------------------------------
 #
 # $Log$
 #----------------------------------------------------------------------------
 #
 # $Log$

+# Revision 1.5  1999/02/20 09:04:43  RD
+# Added wxWindow_FromHWND(hWnd) for wxMSW to construct a wxWindow from a
+# window handle.  If you can get the window handle into the python code,
+# it should just work...  More news on this later.
+#
+# Added wxImageList, wxToolTip.
+#
+# Re-enabled wxConfig.DeleteAll() since it is reportedly fixed for the
+# wxRegConfig class.
+#
+# As usual, some bug fixes, tweaks, etc.
+#

 # Revision 1.4  1998/12/16 22:12:46  RD
 # Revision 1.4  1998/12/16 22:12:46  RD

+#

 # Tweaks needed to be able to build wxPython with wxGTK.
 #
 # Revision 1.3  1998/12/15 20:44:35  RD
 # Tweaks needed to be able to build wxPython with wxGTK.
 #
 # Revision 1.3  1998/12/15 20:44:35  RD

diff --git a/utils/wxPython/tests/test4.py b/utils/wxPython/tests/test4.py
index b4b1238b86ce300a4e9a3187040583fb15298d82..001a7d26deb317ed5794127065ae8d70c8451431 100644 (file)
--- a/utils/wxPython/tests/test4.py
+++ b/utils/wxPython/tests/test4.py
@@ -271,6 +271,9 @@ class TestNotebookWindow(wxFrame):
         win = TestTreeCtrlPanel(nb, log)
         nb.AddPage(win, "TreeCtrl")
 
         win = TestTreeCtrlPanel(nb, log)
         nb.AddPage(win, "TreeCtrl")
 

+        win = TestListCtrlPanel(nb, log)
+        nb.AddPage(win, "ListCtrl")
+

         win = ColoredPanel(nb, wxRED)
         nb.AddPage(win, "Red")
 
         win = ColoredPanel(nb, wxRED)
         nb.AddPage(win, "Red")
 


@@ -338,7 +341,7 @@ class CustomStatusBar(wxStatusBar):
         # figure out how tall to make it.
         dc = wxClientDC(self)
         dc.SetFont(self.GetFont())
         # figure out how tall to make it.
         dc = wxClientDC(self)
         dc.SetFont(self.GetFont())

-        (w,h, d,e) = dc.GetTextExtent('X')
+        (w,h) = dc.GetTextExtent('X')

         h = int(h * 1.8)
         self.SetSize(wxSize(100, h))
 
         h = int(h * 1.8)
         self.SetSize(wxSize(100, h))
 


@@ -499,6 +502,53 @@ class TestTreeCtrl(wxFrame):
         p = TestTreeCtrlPanel(self, log)
 
 
         p = TestTreeCtrlPanel(self, log)
 
 

+#---------------------------------------------------------------------------
+
+class TestListCtrlPanel(wxPanel):
+    def __init__(self, parent, log):
+        wxPanel.__init__(self, parent, -1)
+
+        self.log = log
+        tID = 1101
+
+        self.il = wxImageList(16, 16)
+        idx1 = self.il.Add(wxNoRefBitmap('bitmaps/smiles.bmp', wxBITMAP_TYPE_BMP))
+
+        self.list = wxListCtrl(self, tID, wxDefaultPosition, wxDefaultSize,
+                               wxLC_REPORT|wxSUNKEN_BORDER)
+        self.list.SetImageList(self.il, wxIMAGE_LIST_SMALL)
+
+        self.list.SetToolTip(wxToolTip("This is a ToolTip!"))
+        wxToolTip_Enable(true)
+
+        self.list.InsertColumn(0, "Column 0")
+        self.list.InsertColumn(1, "Column 1")
+        self.list.InsertColumn(2, "One More Column (2)")
+        for x in range(50):
+            self.list.InsertImageStringItem(x, "This is item %d" % x, idx1)
+            self.list.SetStringItem(x, 1, "Col 1, item %d" % x)
+            self.list.SetStringItem(x, 2, "item %d in column 2" % x)
+
+        self.list.SetColumnWidth(0, wxLIST_AUTOSIZE)
+        self.list.SetColumnWidth(1, wxLIST_AUTOSIZE)
+        self.list.SetColumnWidth(2, wxLIST_AUTOSIZE)
+
+
+    def OnSize(self, event):
+        w,h = self.GetClientSizeTuple()
+        self.list.SetDimensions(0, 0, w, h)
+
+
+
+
+class TestListCtrl(wxFrame):
+    def __init__(self, parent, log):
+        wxFrame.__init__(self, parent, -1, 'Test ListCtrl',
+                         wxDefaultPosition, wxSize(250, 300))
+
+        p = TestListCtrlPanel(self, log)
+
+

 #---------------------------------------------------------------------------
 
 class TestSashWindow(wxMDIParentFrame):
 #---------------------------------------------------------------------------
 
 class TestSashWindow(wxMDIParentFrame):


@@ -740,6 +790,10 @@ class AppFrame(wxFrame):
         menu.Append(mID, 'T&ree Control')
         EVT_MENU(self, mID, self.OnTestTreeCtrl)
 
         menu.Append(mID, 'T&ree Control')
         EVT_MENU(self, mID, self.OnTestTreeCtrl)
 

+        mID = NewId()
+        menu.Append(mID, '&List Control')
+        EVT_MENU(self, mID, self.OnTestListCtrl)
+

         mID = NewId()
         menu.Append(mID, 'S&ash Window and Layout Algorithm')
         EVT_MENU(self, mID, self.OnTestSashWindow)
         mID = NewId()
         menu.Append(mID, 'S&ash Window and Layout Algorithm')
         EVT_MENU(self, mID, self.OnTestSashWindow)


@@ -890,6 +944,10 @@ class AppFrame(wxFrame):
         win = TestTreeCtrl(self, self)
         win.Show(true)
 
         win = TestTreeCtrl(self, self)
         win.Show(true)
 

+    def OnTestListCtrl(self, event):
+        win = TestListCtrl(self, self)
+        win.Show(true)
+

     def OnTestSashWindow(self, event):
         win = TestSashWindow(self, self)
         win.Show(true)
     def OnTestSashWindow(self, event):
         win = TestSashWindow(self, self)
         win.Show(true)


@@ -942,7 +1000,20 @@ if __name__ == '__main__':
 #----------------------------------------------------------------------------
 #
 # $Log$
 #----------------------------------------------------------------------------
 #
 # $Log$

+# Revision 1.13  1999/02/20 09:04:44  RD
+# Added wxWindow_FromHWND(hWnd) for wxMSW to construct a wxWindow from a
+# window handle.  If you can get the window handle into the python code,
+# it should just work...  More news on this later.
+#
+# Added wxImageList, wxToolTip.
+#
+# Re-enabled wxConfig.DeleteAll() since it is reportedly fixed for the
+# wxRegConfig class.
+#
+# As usual, some bug fixes, tweaks, etc.
+#

 # Revision 1.12  1999/01/30 07:31:33  RD
 # Revision 1.12  1999/01/30 07:31:33  RD

+#

 # Added wxSashWindow, wxSashEvent, wxLayoutAlgorithm, etc.
 #
 # Various cleanup, tweaks, minor additions, etc. to maintain
 # Added wxSashWindow, wxSashEvent, wxLayoutAlgorithm, etc.
 #
 # Various cleanup, tweaks, minor additions, etc. to maintain

diff --git a/utils/wxPython/tests/test7.py b/utils/wxPython/tests/test7.py
new file mode 100644 (file)
index 0000000..50f394a
--- /dev/null
+++ b/utils/wxPython/tests/test7.py
@@ -0,0 +1,110 @@
+#!/bin/env python
+#----------------------------------------------------------------------------
+# Name:         test7.py
+# Purpose:      A minimal wxPython program that is a bit smarter than test1.
+#
+# Author:       Robin Dunn
+#
+# Created:      A long time ago, in a galaxy far, far away...
+# RCS-ID:       $Id$
+# Copyright:    (c) 1998 by Total Control Software
+# Licence:      wxWindows license
+#----------------------------------------------------------------------------
+
+
+## import all of the wxPython GUI package
+from wxPython.wx import *
+
+
+#---------------------------------------------------------------------------
+
+## Create a new frame class, derived from the wxPython Frame.
+class MyFrame(wxFrame):
+
+    def __init__(self, parent, id, title):
+        # First, call the base class' __init__ method to create the frame
+        wxFrame.__init__(self, parent, id, title,
+                         wxPoint(100, 100), wxSize(160, 100))
+
+        # Associate some events with methods of this class
+        EVT_SIZE(self, self.OnSize)
+        EVT_MOVE(self, self.OnMove)
+
+        # Add a panel and some controls to display the size and position
+        panel = wxPanel(self, -1)
+        wxStaticText(panel, -1, "Size:",
+                     wxDLG_PNT(panel, wxPoint(4, 4)),  wxDefaultSize)
+        wxStaticText(panel, -1, "Pos:",
+                     wxDLG_PNT(panel, wxPoint(4, 14)), wxDefaultSize)
+        self.sizeCtrl = wxTextCtrl(panel, -1, "",
+                                   wxDLG_PNT(panel, wxPoint(24, 4)),
+                                   wxDLG_SZE(panel, wxSize(36, -1)),
+                                   wxTE_READONLY)
+
+        self.posCtrl = wxTextCtrl(panel, -1, "",
+                                  wxDLG_PNT(panel, wxPoint(24, 14)),
+                                  wxDLG_SZE(panel, wxSize(36, -1)),
+                                  wxTE_READONLY)
+
+
+    # This method is called automatically when the CLOSE event is
+    # sent to this window
+    def OnCloseWindow(self, event):
+        # tell the window to kill itself
+        self.Destroy()
+
+
+    # This method is called by the System when the window is resized,
+    # because of the association above.
+    def OnSize(self, event):
+        size = event.GetSize()
+        self.sizeCtrl.SetValue("%s, %s" % (size.width, size.height))
+
+        # tell the event system to continue looking for an event handler,
+        # so the default handler will get called.
+        event.Skip()
+
+    # This method is called by the System when the window is moved,
+    # because of the association above.
+    def OnMove(self, event):
+        pos = event.GetPosition()
+        self.posCtrl.SetValue("%s, %s" % (pos.x, pos.y))
+
+
+
+#---------------------------------------------------------------------------
+
+# Every wxWindows application must have a class derived from wxApp
+class MyApp(wxApp):
+
+    # wxWindows calls this method to initialize the application
+    def OnInit(self):
+
+        # Create an instance of our customized Frame class
+        frame = MyFrame(NULL, -1, "This is a test")
+        frame.Show(true)
+
+        # Tell wxWindows that this is our main window
+        self.SetTopWindow(frame)
+
+        # Return a success flag
+        return true
+
+#---------------------------------------------------------------------------
+
+
+app = MyApp(0)     # Create an instance of the application class
+app.MainLoop()     # Tell it to start processing events
+
+
+#----------------------------------------------------------------------------
+#
+
+
+
+
+
+
+
+
+