inserted missing back quotes around echo lost by previous change

[wxWidgets.git] / wxPython / misc / wxprojview.py

diff --git a/wxPython/misc/wxprojview.py b/wxPython/misc/wxprojview.py
index 5b002df75e18b1b242714f81553dec8e28618a46..d53a9904859c51e8f186d11d37490dc294fead18 100755 (executable)
--- a/wxPython/misc/wxprojview.py
+++ b/wxPython/misc/wxprojview.py
@@ -1,16 +1,24 @@
 #!/usr/bin/env python
 #!/usr/bin/env python

+#----------------------------------------------------------------------
+#
+#  A little app I use on my system to help me remember which version of
+#  wx I am corrently working on.  I don't expect this to work for anybody
+#  else as it uses things that are specific to my setup.
+#
+#----------------------------------------------------------------------

 
 import wx
 import wx.lib.stattext as st
 import os
 
 import wx
 import wx.lib.stattext as st
 import os

+import sys

 
 class MyFrame(wx.Frame):
 
 class MyFrame(wx.Frame):

-    def __init__(self):
+    def __init__(self, style=0):

         wx.Frame.__init__(self, None, title="wx Active Project",
         wx.Frame.__init__(self, None, title="wx Active Project",

-                          style=wx.FRAME_NO_TASKBAR|wx.STAY_ON_TOP,
-                          name="wxprojview"
+                          style=wx.FRAME_NO_TASKBAR | style
+                          ,name="wxprojview"

                           )
                           )

-        p = wx.Panel(self)#, style=wx.SIMPLE_BORDER)
+        p = wx.Panel(self)

         
         p.SetBackgroundColour("sky blue")
         self.label = st.GenStaticText(p, -1, "wx XXX")
         
         p.SetBackgroundColour("sky blue")
         self.label = st.GenStaticText(p, -1, "wx XXX")


@@ -42,9 +50,12 @@ class MyFrame(wx.Frame):
 
 
     def OnUpdateVersion(self, evt):
 
 
     def OnUpdateVersion(self, evt):

-        ver = '??'
+        ver = '?.?'

         if 'wxMSW' in wx.PlatformInfo:
         if 'wxMSW' in wx.PlatformInfo:

-            pass
+            info = open("c:/wxcurenv").read()
+            p1 = info.find("WXCUR=") + 6
+            p2 = info.find("\n", p1)
+            ver = info[p1:p2]

         else:
             link = '/opt/wx/current'
             if os.path.islink(link):
         else:
             link = '/opt/wx/current'
             if os.path.islink(link):


@@ -94,6 +105,9 @@ class MyFrame(wx.Frame):
 app = wx.PySimpleApp()
 app.SetAppName("wxprojview")
 app.SetVendorName("Robin Dunn")
 app = wx.PySimpleApp()
 app.SetAppName("wxprojview")
 app.SetVendorName("Robin Dunn")

-frm = MyFrame()
+style = wx.STAY_ON_TOP
+if len(sys.argv) > 1 and sys.argv[1] == 'nostayontop':
+    style=0
+frm = MyFrame(style)

 frm.Show()
 app.MainLoop()
 frm.Show()
 app.MainLoop()