X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b881fc787d2823bdd8a415080b82feee90804a17..3d2d9036037d9ee51f47d878c3dcef4af4a6ef41:/wxPython/wx/lib/printout.py

diff --git a/wxPython/wx/lib/printout.py b/wxPython/wx/lib/printout.py
index a4e90ceba1..086a6c1fc0 100644
--- a/wxPython/wx/lib/printout.py
+++ b/wxPython/wx/lib/printout.py
@@ -60,18 +60,18 @@ class PrintBase:
                 if self.draw == True and txtdraw == True:
                     test_out = self.TestFull(vout)
                     if self.align == wx.ALIGN_LEFT:
-                        self.DC.DrawText(test_out, (self.indent+self.pcell_left_margin, y))
+                        self.DC.DrawText(test_out, self.indent+self.pcell_left_margin, y)
 
                     elif self.align == wx.ALIGN_CENTRE:
                         diff = self.GetCellDiff(test_out, self.region)
-                        self.DC.DrawText(test_out, (self.indent+diff/2, y))
+                        self.DC.DrawText(test_out, self.indent+diff/2, y)
 
                     elif self.align == wx.ALIGN_RIGHT:
                         diff = self.GetCellDiff(test_out, self.region)
-                        self.DC.DrawText(test_out, (self.indent+diff, y))
+                        self.DC.DrawText(test_out, self.indent+diff, y)
 
                     else:
-                        self.DC.DrawText(test_out, (self.indent+self.pcell_left_margin, y))
+                        self.DC.DrawText(test_out, self.indent+self.pcell_left_margin, y)
                 text = remain
                 y = y + self.space
         return y - self.space + self.pt_space_after
@@ -148,18 +148,18 @@ class PrintBase:
                 if self.draw == True and txtdraw == True:
                     test_out = vout
                     if align == wx.ALIGN_LEFT:
-                        self.DC.DrawText(test_out, (indent, y))
+                        self.DC.DrawText(test_out, indent, y)
 
                     elif align == wx.ALIGN_CENTRE:
                         diff = self.GetCellDiff(test_out, pagew)
-                        self.DC.DrawText(test_out, (indent+diff/2, y))
+                        self.DC.DrawText(test_out, indent+diff/2, y)
 
                     elif align == wx.ALIGN_RIGHT:
                         diff = self.GetCellDiff(test_out, pagew)
-                        self.DC.DrawText(test_out, (indent+diff, y))
+                        self.DC.DrawText(test_out, indent+diff, y)
 
                     else:
-                        self.DC.DrawText(test_out, (indent, y_out))
+                        self.DC.DrawText(test_out, indent, y_out)
                 text = remain
                 y = y + y_line
         return y - y_line
@@ -173,10 +173,9 @@ class PrintBase:
         return date + ' ' + time
 
     def GetNow(self):
-        full = str(wx.DateTime_Now())        # get the current date and time in print format
-        flds = full.split()
-        date = flds[0]
-        time = flds[1]
+        now = wx.DateTime.Now()
+        date = now.FormatDate()
+        time = now.FormatTime()
         return date, time
 
     def SetPreview(self, preview):
@@ -496,8 +495,8 @@ class PrintTableDraw(wx.ScrolledWindow, PrintBase):
         brush = wx.Brush(colour, wx.SOLID)
         self.DC.SetBrush(brush)
         height = self.label_space + self.label_pt_space_before + self.label_pt_space_after
-        self.DC.DrawRectangle((self.column[0], self.y),
-                              (self.end_x-self.column[0]+1, height))
+        self.DC.DrawRectangle(self.column[0], self.y,
+                              self.end_x-self.column[0]+1, height)
 
     def ColourRowCells(self, height):
         if self.draw == False:
@@ -515,7 +514,7 @@ class PrintTableDraw(wx.ScrolledWindow, PrintBase):
 
             start_x = self.column[col]
             width = self.column[col+1] - start_x + 2
-            self.DC.DrawRectangle((start_x, self.y), (width, height))
+            self.DC.DrawRectangle(start_x, self.y, width, height)
             col = col + 1
 
     def PrintRow(self, row_val, draw = True, align = wx.ALIGN_LEFT):
@@ -586,7 +585,7 @@ class PrintTableDraw(wx.ScrolledWindow, PrintBase):
 
             y_out = self.y
 #            y_out = self.y + self.pt_space_before + self.pt_space_after     # adjust for extra spacing
-            self.DC.DrawLine((self.column[0], y_out), (self.end_x, y_out))
+            self.DC.DrawLine(self.column[0], y_out, self.end_x, y_out)
 
     def DrawColumns(self):
         if self.draw == True:
@@ -605,7 +604,7 @@ class PrintTableDraw(wx.ScrolledWindow, PrintBase):
                 indent = val
 
                 self.DC.SetPen(wx.Pen(colour, size))
-                self.DC.DrawLine((indent, self.y_start), (indent, self.y))
+                self.DC.DrawLine(indent, self.y_start, indent, self.y)
                 col = col + 1
 
     def DrawText(self):