From: Robin Dunn Date: Mon, 10 Dec 2001 22:44:38 +0000 (+0000) Subject: More demo/distrib updates X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/4309b812efa07373abe6b8b6bba29e2fe2e4c49f More demo/distrib updates git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12974 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/wxPython/b.bat b/wxPython/b.bat index 8b33a2eda7..ed0181719c 100755 --- a/wxPython/b.bat +++ b/wxPython/b.bat @@ -9,6 +9,7 @@ set FLAGS=USE_SWIG=1 IN_CVS_TREE=1 rem Use non-default python? iff "%1" == "15" .or. "%1" == "20" .or. "%1" == "21" .or. "%1" == "22" then + set VER=%1 set PYTHON=c:\tools\python%1%\python.exe shift else @@ -67,12 +68,6 @@ rem "a" --> make all installers elseiff "%1" == "a" then shift set CMD=echo Finished! - call b.bat 15 c - call b.bat 15 f - call b.bat 15 r - call b.bat 15 c - call b.bat 15 h - call b.bat 15 r call b.bat 21 c call b.bat 21 f @@ -81,14 +76,20 @@ elseiff "%1" == "a" then call b.bat 21 h call b.bat 21 r - rem call b.bat 22 c - rem call b.bat 22 f - rem call b.bat 22 r - rem call b.bat 22 c - rem call b.bat 22 h - rem call b.bat 22 r + call b.bat 22 c + call b.bat 22 f + call b.bat 22 r + call b.bat 22 c + call b.bat 22 h + call b.bat 22 r +rem "b" --> both debug and hybrid builds +elseiff "%1" == "b" then + shift + set CMD=echo Finished! + call b.bat %VER% h + call b.bat %VER% rem (no command arg) --> normal build for development else diff --git a/wxPython/demo/Main.py b/wxPython/demo/Main.py index a9a1c742ad..a6f8cdae42 100644 --- a/wxPython/demo/Main.py +++ b/wxPython/demo/Main.py @@ -40,6 +40,7 @@ _treeList = [ 'wxEditableListBox', 'SplitTree', 'wxLEDNumberCtrl', + 'wxEditor', ]), ('Windows', ['wxFrame', 'wxDialog', 'wxMiniFrame', diff --git a/wxPython/demo/wxRightTextCtrl.py b/wxPython/demo/wxRightTextCtrl.py index 0322b3e875..35cda41756 100644 --- a/wxPython/demo/wxRightTextCtrl.py +++ b/wxPython/demo/wxRightTextCtrl.py @@ -12,8 +12,8 @@ class TestPanel(wxPanel): fgs = wxFlexGridSizer(cols=2, vgap=5, hgap=5) txt = wxStaticText(self, -1, - "These text controls will align their contents\n" - "to the right (onwxMSW) when they don't have focus.", style=wxALIGN_RIGHT ) + "These text controls will align their contents to\n" + "the right (on wxMSW) when they don't have focus.", style=wxALIGN_RIGHT ) fgs.Add(txt) fgs.Add(wxRightTextCtrl(self, -1, "", size=(75, -1))) diff --git a/wxPython/distrib/make_installer.py b/wxPython/distrib/make_installer.py index 487526e220..9a0ad4a750 100644 --- a/wxPython/distrib/make_installer.py +++ b/wxPython/distrib/make_installer.py @@ -79,7 +79,7 @@ Source: "wxPython\oglc.pyd"; DestDir: "{app}\wxPython"; Component Source: "wxPython\stc_c.pyd"; DestDir: "{app}\wxPython"; Components: core Source: "wxPython\xrcc.pyd"; DestDir: "{app}\wxPython"; Components: core Source: "wxPython\gizmosc.pyd"; DestDir: "{app}\wxPython"; Components: core -Source: "wxPython\dllwidget.pyd"; DestDir: "{app}\wxPython"; Components: core +Source: "wxPython\dllwidget_c.pyd"; DestDir: "{app}\wxPython"; Components: core Source: "wxPython\*.py"; DestDir: "{app}\wxPython"; Components: core Source: "wxPython\lib\*.py"; DestDir: "{app}\wxPython\lib"; Components: core @@ -162,12 +162,13 @@ Source: "samples\frogedit\*.py"; DestDir: "{app}\wxPython\samples\frog ;;------------------------------------------------------------ [Icons] -Name: "{group}\Run the DEMO"; Filename: "{code:GetPythonDir}\pythonw.exe"; WorkingDir: "{app}\wxPython\demo"; Parameters: "demo.py"; -Name: "{group}\wxWindows Reference"; Filename: "{app}\wxPython\docs\wx.chm"; -Name: "{group}\wxOGL Reference"; Filename: "{app}\wxPython\docs\ogl.chm"; -Name: "{group}\licence.txt"; Filename: "{app}\wxPython\docs\licence\licence.txt"; -Name: "{group}\README.txt"; Filename: "{app}\wxPython\docs\README.txt"; -Name: "{group}\CHANGES.txt"; Filename: "{app}\wxPython\docs\CHANGES.txt"; +Name: "{group}\Run the DEMO"; Filename: "{code:GetPythonDir}\pythonw.exe"; WorkingDir: "{app}\wxPython\demo"; Parameters: "demo.py"; Components: core +Name: "{group}\PyCrust"; Filename: "{code:GetPythonDir}\pythonw.exe"; WorkingDir: "c:\"; Parameters: "{app}\wxPython\lib\PyCrust\PyCrustApp.py"; IconFilename: "{app}\wxPython\lib\PyCrust\PyCrust.ico"; Components: core +Name: "{group}\wxWindows Reference"; Filename: "{app}\wxPython\docs\wx.chm"; Components: docs +Name: "{group}\wxOGL Reference"; Filename: "{app}\wxPython\docs\ogl.chm"; Components: docs +Name: "{group}\licence.txt"; Filename: "{app}\wxPython\docs\licence\licence.txt"; Components: core +Name: "{group}\README.txt"; Filename: "{app}\wxPython\docs\README.txt"; Components: core +Name: "{group}\CHANGES.txt"; Filename: "{app}\wxPython\docs\CHANGES.txt"; Components: core Name: "{group}\Sample Apps"; Filename: "{app}\wxPython\samples"; Components: samples @@ -182,6 +183,8 @@ Type: files; Name: "{app}\wxPython\lib\editor\*.pyc"; Type: files; Name: "{app}\wxPython\lib\editor\*.pyo"; Type: files; Name: "{app}\wxPython\lib\mixins\*.pyc"; Type: files; Name: "{app}\wxPython\lib\mixins\*.pyo"; +Type: files; Name: "{app}\wxPython\lib\PyCrust\*.pyc"; +Type: files; Name: "{app}\wxPython\lib\PyCrust\*.pyo"; Type: files; Name: "{app}\wxPython\demo\*.pyc"; Type: files; Name: "{app}\wxPython\demo\*.pyo"; Type: files; Name: "{app}\wxPython\demo\data\showTips"; diff --git a/wxPython/src/__version__.py b/wxPython/src/__version__.py index 1265b0ba70..436cc46cd6 100644 --- a/wxPython/src/__version__.py +++ b/wxPython/src/__version__.py @@ -1 +1 @@ -ver = '2.3.2b7+' +ver = '2.3.2'