Fixed bad merge...

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

diff --git a/wxPython/demo/wxGenericDirCtrl.py b/wxPython/demo/wxGenericDirCtrl.py
index 3d275bebe69e839b56bfa717bae9c227374a643e..3af690277ac9e156a0aa1429a3cccd0bb21998f3 100644 (file)
--- a/wxPython/demo/wxGenericDirCtrl.py
+++ b/wxPython/demo/wxGenericDirCtrl.py
@@ -8,13 +8,13 @@ class TestPanel(wxPanel):
         self.log = log
 
         txt1 = wxStaticText(self, -1, "style=0")
         self.log = log
 
         txt1 = wxStaticText(self, -1, "style=0")

-        dir1 = wxGenericDirCtrl(self, -1, size=(200,250), style=0)
+        dir1 = wxGenericDirCtrl(self, -1, size=(200,225), style=0)

 
         txt2 = wxStaticText(self, -1, "wxDIRCTRL_DIR_ONLY")
 
         txt2 = wxStaticText(self, -1, "wxDIRCTRL_DIR_ONLY")

-        dir2 = wxGenericDirCtrl(self, -1, size=(200,250), style=wxDIRCTRL_DIR_ONLY)
+        dir2 = wxGenericDirCtrl(self, -1, size=(200,225), style=wxDIRCTRL_DIR_ONLY)

 
         txt3 = wxStaticText(self, -1, "wxDIRCTRL_SHOW_FILTERS")
 
         txt3 = wxStaticText(self, -1, "wxDIRCTRL_SHOW_FILTERS")

-        dir3 = wxGenericDirCtrl(self, -1, size=(200,250), style=wxDIRCTRL_SHOW_FILTERS,
+        dir3 = wxGenericDirCtrl(self, -1, size=(200,225), style=wxDIRCTRL_SHOW_FILTERS,

                                 filter="All files (*.*)|*.*|Python files (*.py)|*.py")
 
         sz = wxFlexGridSizer(cols=3, hgap=5, vgap=5)
                                 filter="All files (*.*)|*.*|Python files (*.py)|*.py")
 
         sz = wxFlexGridSizer(cols=3, hgap=5, vgap=5)


@@ -37,7 +37,7 @@ class TestPanel(wxPanel):
         sz.AddGrowableCol(1)
         sz.AddGrowableCol(2)
         self.SetSizer(sz)
         sz.AddGrowableCol(1)
         sz.AddGrowableCol(2)
         self.SetSizer(sz)

-        self.SetAutoLayout(true)
+        self.SetAutoLayout(True)

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


@@ -57,3 +57,10 @@ overview = """\
 This control can be used to place a directory listing (with optional files)
 on an arbitrary window.
 """
 This control can be used to place a directory listing (with optional files)
 on an arbitrary window.
 """

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