Add wx.version()

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

diff --git a/wxPython/demo/run.py b/wxPython/demo/run.py
index d0734b6c97e819414b8cdf6ac1b43277cd29b3da..3c27661e9ed49357c2b1dbdfd2f1278d4e367e30 100755 (executable)
--- a/wxPython/demo/run.py
+++ b/wxPython/demo/run.py
@@ -21,7 +21,7 @@ import wx                  # This module uses the new wx namespace
 import sys, os
 
 # stuff for debugging
 import sys, os
 
 # stuff for debugging

-print "wx.VERSION_STRING = %s (%s)" % (wx.VERSION_STRING, wx.USE_UNICODE and 'unicode' or 'ansi')
+print "wx.version:", wx.version()

 print "pid:", os.getpid()
 ##raw_input("Press Enter...")
 
 print "pid:", os.getpid()
 ##raw_input("Press Enter...")
 

diff --git a/wxPython/src/_core_ex.py b/wxPython/src/_core_ex.py
index cf46d7211482b1f50083ce40d7c460cf0ef0ab82..bb3658d73ce2638bd120797754cdcbde44675b61 100644 (file)
--- a/wxPython/src/_core_ex.py
+++ b/wxPython/src/_core_ex.py
@@ -30,6 +30,24 @@ if RELEASE_VERSION != _core_.RELEASE_VERSION:
     import warnings
     warnings.warn("wxPython/wxWidgets release number mismatch")
 
     import warnings
     warnings.warn("wxPython/wxWidgets release number mismatch")
 

+
+def version():
+    """Returns a string containing version and port info"""
+    ctype = wx.USE_UNICODE and 'unicode' or 'ansi'
+    if wx.Platform == '__WXMSW__':
+        port = 'msw'
+    elif wx.Platform == '__WXMAC__':
+        port = 'mac'
+    elif wx.Platform == '__WXGTK__':
+        port = 'gtk'
+        if 'gtk2' in wx.PlatformInfo:
+            port = 'gtk2'
+    else:
+        port = '?'
+
+    return "%s (%s-%s)" % (wx.VERSION_STRING, port, ctype)
+                       
+    

 #----------------------------------------------------------------------------
 
 # Set wxPython's default string<-->unicode conversion encoding from
 #----------------------------------------------------------------------------
 
 # Set wxPython's default string<-->unicode conversion encoding from