Test for wx.TB_HORZ_LAYOUT too

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

diff --git a/wxPython/demo/ImageBrowser.py b/wxPython/demo/ImageBrowser.py
index dd1c817affe2cc440368a7549d5ab4020e4b523a..31509a9d0eaeb429bcda47a1cd3d602916fd469d 100644 (file)
--- a/wxPython/demo/ImageBrowser.py
+++ b/wxPython/demo/ImageBrowser.py
@@ -8,42 +8,52 @@
 # Date:         Feb 26, 2001
 # Licence:      wxWindows license
 #----------------------------------------------------------------------------
 # 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)
-# 

 
 import  os
 
 import  wx
 import  wx.lib.imagebrowser    as  ib
 
 import  os
 
 import  wx
 import  wx.lib.imagebrowser    as  ib

+
+

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

-def runTest(frame, nb, log):
-    # get current working directory
-    dir = os.getcwd()
+class TestPanel(wx.Panel):
+    def __init__(self, parent, log):
+        self.log = log
+        wx.Panel.__init__(self, parent, -1)

 
 

-    # set the initial directory for the demo bitmaps
-    initial_dir = os.path.join(dir, 'bitmaps')
+        b = wx.Button(self, -1, "Create and Show an ImageDialog", (50,50))
+        self.Bind(wx.EVT_BUTTON, self.OnButton, b)

 
 

-    # 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")
+    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

 
 

-    win.Destroy()

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


@@ -54,5 +64,5 @@ 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:])