mirror of
https://github.com/wxWidgets/Phoenix.git
synced 2026-01-04 19:10:09 +01:00
Generate demo/version.py in the build script.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@74204 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
6
TODO.txt
6
TODO.txt
@@ -139,7 +139,11 @@ other dev stuff
|
||||
Python code, and make them visible in the core wx namespace?
|
||||
|
||||
|
||||
|
||||
* Should the demo/version.py file be maintained in the source repository?
|
||||
Or just let it always be generated like wx/__version__.py?
|
||||
|
||||
* Should demo/Main.py ignore anything in the version strings after the '-'
|
||||
when comparing?
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -1698,7 +1698,7 @@ class wxPythonDemo(wx.Frame):
|
||||
self.statusBar = self.CreateStatusBar(2)#, wx.ST_SIZEGRIP
|
||||
self.statusBar.SetStatusWidths([-2, -1])
|
||||
|
||||
statusText = "Welcome to wxPython %s"%version.VERSION_STRING
|
||||
statusText = "Welcome to wxPython %s" % wx.VERSION_STRING
|
||||
self.statusBar.SetStatusText(statusText, 0)
|
||||
|
||||
self.downloadGauge = wx.Gauge(self.statusBar, wx.ID_ANY, 50)
|
||||
@@ -2206,7 +2206,7 @@ class wxPythonDemo(wx.Frame):
|
||||
#---------------------------------------------
|
||||
def OnTreeLeftDown(self, event):
|
||||
# reset the overview text if the tree item is clicked on again
|
||||
pt = event.GetPosition();
|
||||
pt = event.GetPosition()
|
||||
item, flags = self.tree.HitTest(pt)
|
||||
if item == self.tree.GetSelection():
|
||||
self.SetOverview(self.tree.GetItemText(item)+" Overview", self.curOverview)
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
# This file was generated by setup.py...
|
||||
# This file was generated by Phoenix's wscript.
|
||||
|
||||
VERSION_STRING = '2.9.5.81-r74150'
|
||||
VERSION_STRING = '2.9.5.81-r74165'
|
||||
|
||||
6
wscript
6
wscript
@@ -406,6 +406,12 @@ def build(bld):
|
||||
"SUBRELEASE_NUMBER = %(VER_SUBREL)s\n\n"
|
||||
"VERSION = (MAJOR_VERSION, MINOR_VERSION, RELEASE_NUMBER, SUBRELEASE_NUMBER, '%(VER_FLAGS)s')\n"
|
||||
% cfg.__dict__)
|
||||
# and one for the demo folder too
|
||||
open('demo/version.py', 'w').write(
|
||||
"# This file was generated by Phoenix's wscript.\n\n"
|
||||
"VERSION_STRING = '%(VERSION)s'\n"
|
||||
% cfg.__dict__)
|
||||
|
||||
|
||||
# copy the wx locale message catalogs to the package dir
|
||||
if isWindows or isDarwin:
|
||||
|
||||
Reference in New Issue
Block a user