Added Brian Victor's Patch

[wxWidgets.git] / wxPython / demo / ImageBrowser.py

diff --git a/wxPython/demo/ImageBrowser.py b/wxPython/demo/ImageBrowser.py
index 4e234695e07a78277d86a5ca219d79625f7b3981..dd1c817affe2cc440368a7549d5ab4020e4b523a 100644 (file)
--- a/wxPython/demo/ImageBrowser.py
+++ b/wxPython/demo/ImageBrowser.py
@@ -4,37 +4,55 @@
 #
 # Author:       Lorne White (email: lorne.white@telusplanet.net)
 #
-# Version       0.5 
+# Version       0.5
 # Date:         Feb 26, 2001
 # Licence:      wxWindows license
 #----------------------------------------------------------------------------
+#
+# 11/23/2003 - Jeff Grimmett (grimmtooth@softhome.net)
+#
+# o Updated for wx namespace
+# 
+# 11/25/2003 - Jeff Grimmett (grimmtooth@softhome.net)
+#
+# o Library has to be updated, it is using obsolete names 
+#   (wxPyDefaultSize, etc)
+# 
 
-from wxPython.wx import *
-from wxPython.lib.imagebrowser import *
-import os
+import  os
 
+import  wx
+import  wx.lib.imagebrowser    as  ib
 #---------------------------------------------------------------------------
 
 def runTest(frame, nb, log):
-    dir = os.getcwd()       # get working directory
-    initial_dir = os.path.join(dir, 'bitmaps')  # set the initial directory for the demo bitmaps
-    win = ImageDialog(frame, initial_dir)   # open the image browser dialog
-    win.Centre()
-    if win.ShowModal() == wxID_OK:      
-        log.WriteText("You Selected File: " + win.GetFile())        # show the selected file
-    else:
-        log.WriteText("You pressed Cancel\n")
-            
-#---------------------------------------------------------------------------
-
-
-
-
+    # get current working directory
+    dir = os.getcwd()
 
+    # set the initial directory for the demo bitmaps
+    initial_dir = os.path.join(dir, 'bitmaps')
 
+    # open the image browser dialog
+    win = ib.ImageDialog(frame, initial_dir)
+    
+    win.Centre()
 
+    if win.ShowModal() == wx.ID_OK:
+        # show the selected file
+        log.WriteText("You Selected File: " + win.GetFile())        
+    else:
+        log.WriteText("You pressed Cancel\n")
 
+    win.Destroy()
+    
+#---------------------------------------------------------------------------
 
 
 overview = """\
 """
+
+if __name__ == '__main__':
+    import sys,os
+    import run
+    run.main(['', os.path.basename(sys.argv[0])])
+