X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1e4a197e4c60e461b8068b0619692ea083e30b8b..61940a7061d0b5d5122b1e1e939cfa2d72596999:/wxPython/demo/wxGenericDirCtrl.py?ds=sidebyside

diff --git a/wxPython/demo/wxGenericDirCtrl.py b/wxPython/demo/wxGenericDirCtrl.py
index 7f338e67df..30d8bbb75e 100644
--- a/wxPython/demo/wxGenericDirCtrl.py
+++ b/wxPython/demo/wxGenericDirCtrl.py
@@ -1,41 +1,47 @@
-from wxPython.wx import *
+# 11/18/2003 - Jeff Grimmett (grimmtooth@softhome.net)
+#
+# o Updated for wx namespace
+# 
+
+import  wx
 
 #----------------------------------------------------------------------
 
-class TestPanel(wxPanel):
+class TestPanel(wx.Panel):
     def __init__(self, parent, log):
-        wxPanel.__init__(self, parent, -1)
+        wx.Panel.__init__(self, parent, -1)
         self.log = log
 
-        txt1 = wxStaticText(self, -1, "style=0")
-        dir1 = wxGenericDirCtrl(self, -1, size=(200,225), style=0)
+        txt1 = wx.StaticText(self, -1, "style=0")
+        dir1 = wx.GenericDirCtrl(self, -1, size=(200,225), style=0)
 
-        txt2 = wxStaticText(self, -1, "wxDIRCTRL_DIR_ONLY")
-        dir2 = wxGenericDirCtrl(self, -1, size=(200,225), style=wxDIRCTRL_DIR_ONLY)
+        txt2 = wx.StaticText(self, -1, "wx.DIRCTRL_DIR_ONLY")
+        dir2 = wx.GenericDirCtrl(self, -1, size=(200,225), style=wx.DIRCTRL_DIR_ONLY)
 
-        txt3 = wxStaticText(self, -1, "wxDIRCTRL_SHOW_FILTERS")
-        dir3 = wxGenericDirCtrl(self, -1, size=(200,225), style=wxDIRCTRL_SHOW_FILTERS,
+        txt3 = wx.StaticText(self, -1, "wx.DIRCTRL_SHOW_FILTERS")
+        dir3 = wx.GenericDirCtrl(self, -1, size=(200,225), style=wx.DIRCTRL_SHOW_FILTERS,
                                 filter="All files (*.*)|*.*|Python files (*.py)|*.py")
 
-        sz = wxFlexGridSizer(cols=3, hgap=5, vgap=5)
-        sz.Add(35, 35)  # some space above
-        sz.Add(35, 35)
-        sz.Add(35, 35)
+        sz = wx.FlexGridSizer(cols=3, hgap=5, vgap=5)
+        sz.Add((35, 35))  # some space above
+        sz.Add((35, 35))
+        sz.Add((35, 35))
 
         sz.Add(txt1)
         sz.Add(txt2)
         sz.Add(txt3)
 
-        sz.Add(dir1, 0, wxEXPAND)
-        sz.Add(dir2, 0, wxEXPAND)
-        sz.Add(dir3, 0, wxEXPAND)
+        sz.Add(dir1, 0, wx.EXPAND)
+        sz.Add(dir2, 0, wx.EXPAND)
+        sz.Add(dir3, 0, wx.EXPAND)
 
-        sz.Add(35,35)  # some space below
+        sz.Add((35,35))  # some space below
 
         sz.AddGrowableRow(2)
         sz.AddGrowableCol(0)
         sz.AddGrowableCol(1)
         sz.AddGrowableCol(2)
+
         self.SetSizer(sz)
         self.SetAutoLayout(True)
 
@@ -46,14 +52,22 @@ def runTest(frame, nb, log):
     win = TestPanel(nb, log)
     return win
 
-
 #----------------------------------------------------------------------
 
 
-
-
-
 overview = """\
 This control can be used to place a directory listing (with optional files)
-on an arbitrary window.
+on an arbitrary window. The control contains a TreeCtrl window representing 
+the directory hierarchy, and optionally, a Choice window containing a list 
+of filters.
+
+The filters work in the same manner as in FileDialog.
+
 """
+
+
+if __name__ == '__main__':
+    import sys,os
+    import run
+    run.main(['', os.path.basename(sys.argv[0])])
+