apparently the check for too small rect is needed not only with wxNB_MULTILINE (see...

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

diff --git a/wxPython/demo/ImageBrowser.py b/wxPython/demo/ImageBrowser.py
index 4e234695e07a78277d86a5ca219d79625f7b3981..31509a9d0eaeb429bcda47a1cd3d602916fd469d 100644 (file)
--- a/wxPython/demo/ImageBrowser.py
+++ b/wxPython/demo/ImageBrowser.py
@@ -4,37 +4,65 @@
 #
 # Author:       Lorne White (email: lorne.white@telusplanet.net)
 #
 #
 # Author:       Lorne White (email: lorne.white@telusplanet.net)
 #

-# Version       0.5 
+# Version       0.5

 # Date:         Feb 26, 2001
 # Licence:      wxWindows license
 #----------------------------------------------------------------------------
 
 # Date:         Feb 26, 2001
 # 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):
-    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")
-            

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

+class TestPanel(wx.Panel):
+    def __init__(self, parent, log):
+        self.log = log
+        wx.Panel.__init__(self, parent, -1)
+
+        b = wx.Button(self, -1, "Create and Show an ImageDialog", (50,50))
+        self.Bind(wx.EVT_BUTTON, self.OnButton, b)
+
+
+    def OnButton(self, evt):
+        # 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
+        dlg = ib.ImageDialog(self, initial_dir)

 
 

+        dlg.Centre()

 
 

+        if dlg.ShowModal() == wx.ID_OK:
+            # show the selected file
+            self.log.WriteText("You Selected File: " + dlg.GetFile())        
+        else:
+            self.log.WriteText("You pressed Cancel\n")

 
 

+        dlg.Destroy()

 
 
 
 

+#---------------------------------------------------------------------------
+

 
 

+def runTest(frame, nb, log):
+    win = TestPanel(nb, log)
+    return win
+
+    
+#---------------------------------------------------------------------------

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

+
+if __name__ == '__main__':
+    import sys,os
+    import run
+    run.main(['', os.path.basename(sys.argv[0])] + sys.argv[1:])
+