fix text scrolling in GTK2 (patch 703988)

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

diff --git a/wxPython/demo/TablePrint.py b/wxPython/demo/TablePrint.py
index f1fa250130a88ed26025495022e5ebbeb801248e..7b370709d92af55fa88008631813abfcf0d3c838 100644 (file)
--- a/wxPython/demo/TablePrint.py
+++ b/wxPython/demo/TablePrint.py
@@ -31,7 +31,7 @@ class TablePanel(wxPanel):
             box.Add(btn, 0, wxALIGN_CENTER|wxALL, 15)
             EVT_BUTTON(self, k, self.OnButton)
 
-        self.SetAutoLayout(true)
+        self.SetAutoLayout(True)
         self.SetSizer(box)
 
     def OnButton(self, evt):
@@ -40,19 +40,18 @@ class TablePanel(wxPanel):
         eval(code)
 
     def ReadData(self):
-        test_file = "TestTable.txt"
-        print "**** ", os.getcwd()
+        test_file = "./data/testtable.txt"
         file = open(test_file,'r',1)
         i = 0
 
         data = []
         while 1:
             text = file.readline()
-            text = string.strip(text)
+            text = text.strip()
             if not text:
                 break
 
-            list_val = string.splitfields(text,'\t')
+            list_val = text.split('\t')
             data.append(list_val)
         file.close()
 
@@ -76,6 +75,7 @@ class TablePanel(wxPanel):
 
         prt.SetHeader("wxWindows Applications")
         prt.SetFooter()
+        prt.SetFooter("Date: ", type = "Date", align=wxALIGN_RIGHT, indent = -2, colour = wxNamedColour('RED'))
         prt.Preview()
 
     def PreviewNarrow(self):
@@ -105,7 +105,7 @@ class TablePanel(wxPanel):
         prt.label_font_colour = wxNamedColour('WHITE')
         prt.SetHeader("wxWindows Applications", colour = wxNamedColour('RED'))
 
-        prt.SetHeader("Date", align=wxALIGN_RIGHT, indent = -2, colour = wxNamedColour('BLUE'))
+        prt.SetHeader("Printed: ", type = "Date & Time", align=wxALIGN_RIGHT, indent = -2, colour = wxNamedColour('BLUE'))
         prt.SetFooter("Page No", colour = wxNamedColour('RED'), type ="Num")
         prt.Preview()
 
@@ -205,3 +205,12 @@ when the framework allows for it.
 
 """ % os.path.join(os.path.dirname(wxPython.lib.printout.__file__), "printout.py")
 
+
+
+
+
+if __name__ == '__main__':
+    import sys,os
+    import run
+    run.main(['', os.path.basename(sys.argv[0])])
+