Minor wxPython changes for wxWin 2.0

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

diff --git a/utils/wxPython/distrib/wxPython.wse b/utils/wxPython/distrib/wxPython.wse
index f6cefff8e576760e8dad2df8890c4523a51b77a9..94683343255c036494f64d478df5de0b62dee246 100644 (file)
--- a/utils/wxPython/distrib/wxPython.wse
+++ b/utils/wxPython/distrib/wxPython.wse
@@ -9,7 +9,7 @@ item: Global
   Progress Bar DLL=%_WISE_%\Progress\WIZ%_EXE_OS_TYPE_%.DLL
   Start Gradient=128 128 255
   End Gradient=64 0 128
   Progress Bar DLL=%_WISE_%\Progress\WIZ%_EXE_OS_TYPE_%.DLL
   Start Gradient=128 128 255
   End Gradient=64 0 128

-  Windows Flags=00000100000000010010110000001000
+  Windows Flags=00000100000000010010110000011000

   Log Pathname=%MAINDIR%\INSTALL.LOG
   Message Font=MS Sans Serif
   Font Size=8
   Log Pathname=%MAINDIR%\INSTALL.LOG
   Message Font=MS Sans Serif
   Font Size=8


@@ -17,7 +17,7 @@ item: Global
   Patch Flags=0000000000001001
   Patch Threshold=85
   Patch Memory=4000
   Patch Flags=0000000000001001
   Patch Threshold=85
   Patch Memory=4000

-  EXE Filename=wxPython-2.0b5.exe
+  EXE Filename=wxPython-2.0b6.exe

   FTP Cluster Size=20
   Per-User Version ID=1
   Dialogs Version=6
   FTP Cluster Size=20
   Per-User Version ID=1
   Dialogs Version=6


@@ -74,6 +74,9 @@ end
 item: Check Configuration
   Flags=10111011
 end
 item: Check Configuration
   Flags=10111011
 end

+item: Remark
+  Text=     1.5 and 1.5.1 have a CurrentVersion key
+end

 item: Get Registry Key Value
   Variable=PYTHONVER
   Key=SOFTWARE\Python\PythonCore\CurrentVersion
 item: Get Registry Key Value
   Variable=PYTHONVER
   Key=SOFTWARE\Python\PythonCore\CurrentVersion


@@ -84,12 +87,12 @@ item: If/While Statement
   Variable=PYTHONVER
   Value=None
 end
   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
+item: Remark
+  Text=     Just try 1.5 since 1.5.2b2 doesn't set CurrentVersion but uses 1.5

 end
 end

-item: Exit Installation
+item: Set Variable
+  Variable=PYTHONVER
+  Value=1.5

 end
 item: End Block
 end
 end
 item: End Block
 end


@@ -98,6 +101,19 @@ item: Get Registry Key Value
   Key=SOFTWARE\Python\PythonCore\%PYTHONVER%\InstallPath
   Flags=00000100
 end
   Key=SOFTWARE\Python\PythonCore\%PYTHONVER%\InstallPath
   Flags=00000100
 end

+item: If/While Statement
+  Variable=PYTHONDIR
+  Value=None
+end
+item: Display Message
+  Title=Installation Error
+  Text=An 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: Set Variable
   Variable=MAINDIR
   Value=%PYTHONDIR%
 item: Set Variable
   Variable=MAINDIR
   Value=%PYTHONDIR%


@@ -212,7 +228,7 @@ item: Custom Dialog Set
     Title=Welcome
     Title French=Bienvenue
     Title German=Willkommen
     Title=Welcome
     Title French=Bienvenue
     Title German=Willkommen

-    Title Portuguese=Bem-vindo 
+    Title Portuguese=Bem-vindo

     Title Spanish=Bienvenido
     Title Italian=Benvenuto
     Title Danish=Velkommen
     Title Spanish=Bienvenido
     Title Italian=Benvenuto
     Title Danish=Velkommen


@@ -308,11 +324,11 @@ item: Custom Dialog Set
       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 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=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=
       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=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 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.


@@ -340,7 +356,7 @@ item: Custom Dialog Set
       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=
       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=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 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.


@@ -356,7 +372,7 @@ item: Custom Dialog Set
       Text Norwegian=
       Text Norwegian=ADVARSEL: Dette programmet er beskyttet i henhold til lover om opphavsrett og internasjonale konvensjoner.
       Text Norwegian=
       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 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=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.


@@ -443,7 +459,7 @@ item: Custom Dialog Set
       Create Flags=01010000000000000000000000000000
       Text=Setup will install %APPTITLE% in the following folder.
       Text=
       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=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=
       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


@@ -615,7 +631,7 @@ item: Custom Dialog Set
       Flags=0000000000000001
       Text=Cancel
       Text French=Annuler
       Flags=0000000000000001
       Text=Cancel
       Text French=Annuler

-      Text German=Abbrechen 
+      Text German=Abbrechen

       Text Portuguese=Cancelar
       Text Spanish=Cancelar
       Text Italian=Annulla
       Text Portuguese=Cancelar
       Text Spanish=Cancelar
       Text Italian=Annulla


@@ -631,7 +647,7 @@ item: Custom Dialog Set
   Display Variable=DISPLAY
   Flags=00000001
   item: Dialog
   Display Variable=DISPLAY
   Flags=00000001
   item: Dialog

-    Title=Select Components 
+    Title=Select Components

     Title French=Sélectionner les éléments
     Title German=Komponenten auswählen
     Title Portuguese=Seleccionar Componentes
     Title French=Sélectionner les éléments
     Title German=Komponenten auswählen
     Title Portuguese=Seleccionar Componentes


@@ -961,19 +977,14 @@ item: Install File
   Flags=0000001010010010
 end
 item: Install File
   Flags=0000001010010010
 end
 item: Install File

-  Source=e:\Projects\wxPython\tests\bitmaps\tog1.bmp
-  Destination=%MAINDIR%\wxPython\demo\bitmaps\tog1.bmp
-  Flags=0000000010000010
+  Source=c:\WINNT\System32\Msvcirt.dll
+  Destination=%SYS%\Msvcirt.dll
+  Flags=0000001010000011

 end
 item: Install File
 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
+  Source=c:\WINNT\System32\Msvcrt.dll
+  Destination=%SYS%\Msvcrt.dll
+  Flags=0000001010000011

 end
 item: Install File
   Source=e:\Projects\wxPython\__init__.py
 end
 item: Install File
   Source=e:\Projects\wxPython\__init__.py


@@ -1040,6 +1051,11 @@ item: Install File
   Destination=%MAINDIR%\wxPython\windows3.py
   Flags=0000000010000010
 end
   Destination=%MAINDIR%\wxPython\windows3.py
   Flags=0000000010000010
 end

+item: Install File
+  Source=e:\Projects\wxPython\controls.py
+  Destination=%MAINDIR%\wxPython\controls.py
+  Flags=0000000010000010
+end

 item: Install File
   Source=e:\Projects\wxPython\wx.py
   Destination=%MAINDIR%\wxPython\wx.py
 item: Install File
   Source=e:\Projects\wxPython\wx.py
   Destination=%MAINDIR%\wxPython\wx.py


@@ -1095,6 +1111,11 @@ item: Install File
   Destination=%MAINDIR%\wxPython\demo\wxSlash.py
   Flags=0000000010000010
 end
   Destination=%MAINDIR%\wxPython\demo\wxSlash.py
   Flags=0000000010000010
 end

+item: Install File
+  Source=E:\PROJECTS\wxPython\tests\wxPlotCanvas.py
+  Destination=%MAINDIR%\wxPython\demo\wxPlotCanvas.py
+  Flags=0000000010000010
+end

 item: Install File
   Source=e:\Projects\wxPython\tests\bitmaps\copy.bmp
   Destination=%MAINDIR%\wxPython\demo\bitmaps\copy.bmp
 item: Install File
   Source=e:\Projects\wxPython\tests\bitmaps\copy.bmp
   Destination=%MAINDIR%\wxPython\demo\bitmaps\copy.bmp


@@ -1126,8 +1147,18 @@ item: Install File
   Flags=0000000010000010
 end
 item: Install File
   Flags=0000000010000010
 end
 item: Install File

-  Source=e:\Projects\wxPython\controls.py
-  Destination=%MAINDIR%\wxPython\controls.py
+  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: End Block
   Flags=0000000010000010
 end
 item: End Block


@@ -1336,7 +1367,7 @@ item: Custom Dialog Set
     Title=Installation Complete
     Title French=Installation en cours
     Title German=Installation abgeschlossen
     Title=Installation Complete
     Title French=Installation en cours
     Title German=Installation abgeschlossen

-    Title Portuguese=Instalação Completa 
+    Title Portuguese=Instalação Completa

     Title Spanish=Se ha completado la Instalación
     Title Italian=Installazione completata
     Title Danish=Installation gennemført
     Title Spanish=Se ha completado la Instalación
     Title Italian=Installazione completata
     Title Danish=Installation gennemført

diff --git a/utils/wxPython/distrib/wxPython.wsm b/utils/wxPython/distrib/wxPython.wsm
index 558dc99f30e049f90088066319d4dd6337cd143e..b34766c331df1a1dbcc4900cd7a0167ce40f993b 100644 (file)
Binary files a/utils/wxPython/distrib/wxPython.wsm and b/utils/wxPython/distrib/wxPython.wsm differ

diff --git a/utils/wxPython/src/makefile.vc b/utils/wxPython/src/makefile.vc
index c5c6c7b6e2794ad086291b5a27a686957a9fb593..a9c66110de789f83b5283800abba502beae9f2ee 100644 (file)
--- a/utils/wxPython/src/makefile.vc
+++ b/utils/wxPython/src/makefile.vc
@@ -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=2.0b5
+VERSION=2.0b6

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


@@ -276,7 +276,11 @@ dist:
 #------------------------------------------------------------------------
 #
 # $Log$
 #------------------------------------------------------------------------
 #
 # $Log$

+# Revision 1.4  1999/03/05 07:22:30  RD
+# Minor wxPython changes for wxWin 2.0
+#

 # Revision 1.3  1999/02/25 07:08:33  RD
 # Revision 1.3  1999/02/25 07:08:33  RD

+#

 # wxPython version 2.0b5
 #
 # Revision 1.2  1999/02/20 09:03:00  RD
 # wxPython version 2.0b5
 #
 # Revision 1.2  1999/02/20 09:03:00  RD

diff --git a/utils/wxPython/src/msw/wx.cpp b/utils/wxPython/src/msw/wx.cpp
index 79b4b8925ba4507752d1a8b3fe5ba6376968ee08..16e5518bd7bb1b91eee4c00b15a70104dbe7516f 100644 (file)
--- a/utils/wxPython/src/msw/wx.cpp
+++ b/utils/wxPython/src/msw/wx.cpp
@@ -33,8 +33,8 @@
  * and things like that.
  *
  * $Log$
  * and things like that.
  *
  * $Log$

- * Revision 1.7  1999/02/25 07:09:28  RD
- * wxPython version 2.0b5
+ * Revision 1.8  1999/03/05 07:23:03  RD
+ * Minor wxPython changes for wxWin 2.0

  *
  ************************************************************************/
 
  *
  ************************************************************************/
 


@@ -1313,6 +1313,8 @@ SWIGEXPORT(void,initwxc)() {
         PyDict_SetItemString(d,"wxCB_READONLY", PyInt_FromLong((long) wxCB_READONLY));
         PyDict_SetItemString(d,"wxRA_HORIZONTAL", PyInt_FromLong((long) wxRA_HORIZONTAL));
         PyDict_SetItemString(d,"wxRA_VERTICAL", PyInt_FromLong((long) wxRA_VERTICAL));
         PyDict_SetItemString(d,"wxCB_READONLY", PyInt_FromLong((long) wxCB_READONLY));
         PyDict_SetItemString(d,"wxRA_HORIZONTAL", PyInt_FromLong((long) wxRA_HORIZONTAL));
         PyDict_SetItemString(d,"wxRA_VERTICAL", PyInt_FromLong((long) wxRA_VERTICAL));

+        PyDict_SetItemString(d,"wxRA_SPECIFY_ROWS", PyInt_FromLong((long) wxRA_SPECIFY_ROWS));
+        PyDict_SetItemString(d,"wxRA_SPECIFY_COLS", PyInt_FromLong((long) wxRA_SPECIFY_COLS));

         PyDict_SetItemString(d,"wxRB_GROUP", PyInt_FromLong((long) wxRB_GROUP));
         PyDict_SetItemString(d,"wxGA_PROGRESSBAR", PyInt_FromLong((long) wxGA_PROGRESSBAR));
         PyDict_SetItemString(d,"wxGA_HORIZONTAL", PyInt_FromLong((long) wxGA_HORIZONTAL));
         PyDict_SetItemString(d,"wxRB_GROUP", PyInt_FromLong((long) wxRB_GROUP));
         PyDict_SetItemString(d,"wxGA_PROGRESSBAR", PyInt_FromLong((long) wxGA_PROGRESSBAR));
         PyDict_SetItemString(d,"wxGA_HORIZONTAL", PyInt_FromLong((long) wxGA_HORIZONTAL));


@@ -1753,7 +1755,7 @@ SWIGEXPORT(void,initwxc)() {
         PyDict_SetItemString(d,"wxEVT_COMMAND_TAB_SEL_CHANGING", PyInt_FromLong((long) wxEVT_COMMAND_TAB_SEL_CHANGING));
         PyDict_SetItemString(d,"wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED", PyInt_FromLong((long) wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED));
         PyDict_SetItemString(d,"wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING", PyInt_FromLong((long) wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING));
         PyDict_SetItemString(d,"wxEVT_COMMAND_TAB_SEL_CHANGING", PyInt_FromLong((long) wxEVT_COMMAND_TAB_SEL_CHANGING));
         PyDict_SetItemString(d,"wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED", PyInt_FromLong((long) wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED));
         PyDict_SetItemString(d,"wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING", PyInt_FromLong((long) wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING));

-        PyDict_SetItemString(d,"__version__", PyString_FromString("2.0b5"));
+        PyDict_SetItemString(d,"__version__", PyString_FromString("2.0b6"));

         PyDict_SetItemString(d,"cvar", SWIG_globals);
         SWIG_addvarlink(SWIG_globals,"wxPyDefaultPosition",_wrap_wxPyDefaultPosition_get, _wrap_wxPyDefaultPosition_set);
         SWIG_addvarlink(SWIG_globals,"wxPyDefaultSize",_wrap_wxPyDefaultSize_get, _wrap_wxPyDefaultSize_set);
         PyDict_SetItemString(d,"cvar", SWIG_globals);
         SWIG_addvarlink(SWIG_globals,"wxPyDefaultPosition",_wrap_wxPyDefaultPosition_get, _wrap_wxPyDefaultPosition_set);
         SWIG_addvarlink(SWIG_globals,"wxPyDefaultSize",_wrap_wxPyDefaultSize_get, _wrap_wxPyDefaultSize_set);

diff --git a/utils/wxPython/src/msw/wx.py b/utils/wxPython/src/msw/wx.py
index 45613059d097c90fda7aa5ce4273d6e6fd84be65..623173aeb78f446b80f5a07959d7735e68006ff2 100644 (file)
--- a/utils/wxPython/src/msw/wx.py
+++ b/utils/wxPython/src/msw/wx.py
@@ -185,6 +185,8 @@ wxCB_SORT = wxc.wxCB_SORT
 wxCB_READONLY = wxc.wxCB_READONLY
 wxRA_HORIZONTAL = wxc.wxRA_HORIZONTAL
 wxRA_VERTICAL = wxc.wxRA_VERTICAL
 wxCB_READONLY = wxc.wxCB_READONLY
 wxRA_HORIZONTAL = wxc.wxRA_HORIZONTAL
 wxRA_VERTICAL = wxc.wxRA_VERTICAL

+wxRA_SPECIFY_ROWS = wxc.wxRA_SPECIFY_ROWS
+wxRA_SPECIFY_COLS = wxc.wxRA_SPECIFY_COLS

 wxRB_GROUP = wxc.wxRB_GROUP
 wxGA_PROGRESSBAR = wxc.wxGA_PROGRESSBAR
 wxGA_HORIZONTAL = wxc.wxGA_HORIZONTAL
 wxRB_GROUP = wxc.wxRB_GROUP
 wxGA_PROGRESSBAR = wxc.wxGA_PROGRESSBAR
 wxGA_HORIZONTAL = wxc.wxGA_HORIZONTAL


@@ -1259,8 +1261,8 @@ class wxApp(wxPyApp):
 #----------------------------------------------------------------------------
 #
 # $Log$
 #----------------------------------------------------------------------------
 #
 # $Log$

-# Revision 1.7  1999/02/25 07:09:30  RD
-# wxPython version 2.0b5
+# Revision 1.8  1999/03/05 07:23:07  RD
+# Minor wxPython changes for wxWin 2.0

 #
 # Revision 1.11  1999/02/20 09:02:55  RD
 # Added wxWindow_FromHWND(hWnd) for wxMSW to construct a wxWindow from a
 #
 # Revision 1.11  1999/02/20 09:02:55  RD
 # Added wxWindow_FromHWND(hWnd) for wxMSW to construct a wxWindow from a

diff --git a/utils/wxPython/src/wx.i b/utils/wxPython/src/wx.i
index 932bd7e29a3eba8e47b049cbed1cb34ef030103f..a0e23c1149e3031d319ec542169c26e4e3d2b33d 100644 (file)
--- a/utils/wxPython/src/wx.i
+++ b/utils/wxPython/src/wx.i
@@ -47,7 +47,7 @@
 
 //---------------------------------------------------------------------------
 
 
 //---------------------------------------------------------------------------
 

-#define __version__ "2.0b5"
+#define __version__ "2.0b6"

 
 wxPoint     wxPyDefaultPosition;
 wxSize      wxPyDefaultSize;
 
 wxPoint     wxPyDefaultPosition;
 wxSize      wxPyDefaultSize;


@@ -158,7 +158,11 @@ extern "C" SWIGEXPORT(void,initutilsc)();
 /////////////////////////////////////////////////////////////////////////////
 //
 // $Log$
 /////////////////////////////////////////////////////////////////////////////
 //
 // $Log$

+// Revision 1.8  1999/03/05 07:22:32  RD
+// Minor wxPython changes for wxWin 2.0
+//

 // Revision 1.7  1999/02/25 07:08:37  RD
 // Revision 1.7  1999/02/25 07:08:37  RD

+//

 // wxPython version 2.0b5
 //
 // Revision 1.6  1999/02/20 09:03:04  RD
 // wxPython version 2.0b5
 //
 // Revision 1.6  1999/02/20 09:03:04  RD

diff --git a/utils/wxPython/tests/test4.py b/utils/wxPython/tests/test4.py
index ca0785ea99e5f6a0262279126b74c9d4336a41fd..2370a498ba14b2c1e2ffaf8caa67f2cf9ad13e9d 100644 (file)
--- a/utils/wxPython/tests/test4.py
+++ b/utils/wxPython/tests/test4.py
@@ -25,8 +25,8 @@ class TestSimpleControlsDlg(wxDialog):
                           wxDefaultPosition, wxSize(350, 350))
 
 
                           wxDefaultPosition, wxSize(350, 350))
 
 

-        sampleList = ['zero', 'one', 'two', 'three', 'four', 'five',
-                      'six', 'seven', 'eight']
+        sampleList = ["zero", "one", "two", "three", "four", "five",
+                      "six", "seven", "eight", "nine", "ten"]

 
         y_pos = 5
         delta = 25
 
         y_pos = 5
         delta = 25


@@ -1000,7 +1000,11 @@ if __name__ == '__main__':
 #----------------------------------------------------------------------------
 #
 # $Log$
 #----------------------------------------------------------------------------
 #
 # $Log$

+# Revision 1.15  1999/03/05 07:23:42  RD
+# Minor wxPython changes for wxWin 2.0
+#

 # Revision 1.14  1999/02/27 04:20:50  RD
 # Revision 1.14  1999/02/27 04:20:50  RD

+#

 # minor tweaks for testing
 #
 # Revision 1.13  1999/02/20 09:04:44  RD
 # minor tweaks for testing
 #
 # Revision 1.13  1999/02/20 09:04:44  RD