Lerking/Phoenix
1
0
Fork 0
mirror of https://github.com/wxWidgets/Phoenix.git synced 2026-01-05 03:20:08 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge of PR 11 with the whitespace-only changes omitted.

Browse Source 
See https://github.com/RobinD42/Phoenix/pull/11

Mostly phoenix-port changes.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@74463 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2013-07-10 01:15:34 +00:00
parent 53d5fec413
commit 9f24505715
99 changed files with 617 additions and 348 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
wx/tools/dbg.py
View File

@@ -6,6 +6,7 @@
# Created: 07/11/2002
# Copyright: (c) 2002 by Will Sadkin, 2002
# License: wxWindows license
# Tags: phoenix-port
#----------------------------------------------------------------------------
# 12/21/2003 - Jeff Grimmett (grimmtooth@softhome.net)
#
@@ -231,7 +232,7 @@ if __name__ == "__main__":
import sys
import wx
wx.Log_SetActiveTarget( wx.LogStderr() )
wx.Log.SetActiveTarget(wx.LogStderr())
logger = Logger('module')
dbg = logger.dbg
dbg(enable=1)

6
wx/tools/genaxmodule.py
View File

@@ -1,3 +1,7 @@
#----------------------------------------------------------------------------
# Name: genaxmodule.py
# Tags: phoenix-port
#----------------------------------------------------------------------------
"""
@@ -24,7 +28,7 @@ def main(args=None):
args = sys.argv
if len(args) < 3:
print __doc__
print(__doc__)
sys.exit(1)
# unfortunatly we need to make an app, frame and an instance of

2
wx/tools/img2img.py
View File

@@ -28,7 +28,7 @@ def convert(file, maskClr, outputDir, outputName, outType, outExt):
else:
img = wx.Bitmap(file, wx.BITMAP_TYPE_ANY)
if not img.Ok():
if not img.IsOk():
return 0, file + " failed to load!"
else:
if maskClr:

19
wx/tools/pywxrc.py
View File

@@ -14,6 +14,7 @@
# RCS-ID: $Id$
# Copyright: (c) 2004 by Total Control Software, 2000 Vaclav Slavik
# Licence: wxWindows license
# Tags: phoenix-port
#----------------------------------------------------------------------
"""
@@ -864,20 +865,20 @@ def main(args=None):
"hpgevo:",
"help python gettext embed novar output=".split())
except getopt.GetoptError, e:
print "\nError : %s\n" % str(e)
print __doc__
print("\nError : %s\n" % str(e))
print(__doc__)
sys.exit(1)
# If there is no input file argument, show help and exit
if not args:
print __doc__
print "No xrc input file was specified."
print(__doc__)
print("No xrc input file was specified.")
sys.exit(1)
# Parse options and arguments
for opt, val in opts:
if opt in ["-h", "--help"]:
print __doc__
print(__doc__)
sys.exit(1)
if opt in ["-p", "--python"]:
@@ -918,16 +919,16 @@ def main(args=None):
comp.MakeGetTextOutput(inputFiles, outputFilename)
else:
print __doc__
print "One or both of -p, -g must be specified."
print(__doc__)
print("One or both of -p, -g must be specified.")
sys.exit(1)
except IOError, e:
print >>sys.stderr, "%s." % str(e)
print(>>sys.stderr, "%s." % str(e))
else:
if outputFilename != "-":
print >>sys.stderr, "Resources written to %s." % outputFilename
print(>>sys.stderr, "Resources written to %s." % outputFilename)
if __name__ == "__main__":
main(sys.argv[1:])