Updates from Chris

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

diff --git a/wxPython/demo/ImageBrowser.py b/wxPython/demo/ImageBrowser.py
index 4a38b95d7c75cc8db049de99f689d6a89ea41949..863416584ef63af03b400453105a0b438a179377 100644 (file)
--- a/wxPython/demo/ImageBrowser.py
+++ b/wxPython/demo/ImageBrowser.py
@@ -9,41 +9,40 @@
 # Licence:      wxWindows license
 #----------------------------------------------------------------------------
 
 # Licence:      wxWindows license
 #----------------------------------------------------------------------------
 

-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):
 #---------------------------------------------------------------------------
 
 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
+    # 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()
     win.Centre()

-    if win.ShowModal() == wxID_OK:
-        log.WriteText("You Selected File: " + win.GetFile())        # show the selected file
+
+    if win.ShowModal() == wx.ID_OK:
+        # show the selected file
+        log.WriteText("You Selected File: " + win.GetFile())        

     else:
         log.WriteText("You pressed Cancel\n")
 
     else:
         log.WriteText("You pressed Cancel\n")
 

+    win.Destroy()
+    

 #---------------------------------------------------------------------------
 
 
 #---------------------------------------------------------------------------
 
 

-
-
-
-
-
-
-
-

 overview = """\
 """
 
 overview = """\
 """
 

-
-
-

 if __name__ == '__main__':
     import sys,os
     import run
 if __name__ == '__main__':
     import sys,os
     import run

-    run.main(['', os.path.basename(sys.argv[0])])
+    run.main(['', os.path.basename(sys.argv[0])] + sys.argv[1:])