reSWIGged

[wxWidgets.git] / wxPython / wx / lib / plot.py

diff --git a/wxPython/wx/lib/plot.py b/wxPython/wx/lib/plot.py
index 7b8535945f86e0b55584620d628ee0dd5a9860be..109f89331a71d0fd9f45a33d22ec6ac1c3221748 100644 (file)
--- a/wxPython/wx/lib/plot.py
+++ b/wxPython/wx/lib/plot.py
@@ -392,9 +392,6 @@ class PlotCanvas(wx.Window):
 
         self.SetBackgroundColour("white")
         
-        self.Bind(wx.EVT_PAINT, self.OnPaint)
-        self.Bind(wx.EVT_SIZE, self.OnSize)
-        
         # Create some mouse events for zooming
         self.Bind(wx.EVT_LEFT_DOWN, self.OnMouseLeftDown)
         self.Bind(wx.EVT_LEFT_UP, self.OnMouseLeftUp)
@@ -439,10 +436,13 @@ class PlotCanvas(wx.Window):
         self._fontSizeTitle= 15
         self._fontSizeLegend= 7
 
+        self.Bind(wx.EVT_PAINT, self.OnPaint)
+        self.Bind(wx.EVT_SIZE, self.OnSize)
         # OnSize called to make sure the buffer is initialized.
         # This might result in OnSize getting called twice on some
         # platforms at initialization, but little harm done.
-        self.OnSize(None) # sets the initial size based on client size
+               if wx.Platform != "__WXMAC__":
+                   self.OnSize(None) # sets the initial size based on client size
 
         
     # SaveFile
@@ -978,7 +978,7 @@ class PlotCanvas(wx.Window):
         dc.SetPen(wx.Pen(wx.BLACK))
         dc.SetBrush(wx.Brush( wx.WHITE, wx.TRANSPARENT ) )
         dc.SetLogicalFunction(wx.INVERT)
-        dc.DrawRectangle( (ptx,pty), (rectWidth,rectHeight))
+        dc.DrawRectangle( ptx,pty, rectWidth,rectHeight)
         dc.SetLogicalFunction(wx.COPY)
         dc.EndDrawing()
 
@@ -1136,7 +1136,7 @@ class PlotPrintout(wx.Printout):
             return False
 
     def GetPageInfo(self):
-        return (0, 1, 1, 1)  # disable page numbers
+        return (1, 1, 1, 1)  # disable page numbers
 
     def OnPrintPage(self, page):
         dc = FloatDCWrapper(self.GetDC())  # allows using floats for certain functions
@@ -1204,16 +1204,16 @@ class FloatDCWrapper:
         self.theDC = aDC
 
     def DrawLine(self, x1,y1,x2,y2):
-        self.theDC.DrawLine((int(x1),int(y1)),(int(x2),int(y2)))
+        self.theDC.DrawLine(int(x1),int(y1), int(x2),int(y2))
 
     def DrawText(self, txt, x, y):
-        self.theDC.DrawText(txt, (int(x), int(y)))
+        self.theDC.DrawText(txt, int(x), int(y))
 
     def DrawRotatedText(self, txt, x, y, angle):
-        self.theDC.DrawRotatedText(txt, (int(x), int(y)), angle)
+        self.theDC.DrawRotatedText(txt, int(x), int(y), angle)
 
     def SetClippingRegion(self, x, y, width, height):
-        self.theDC.SetClippingRegion((int(x), int(y)), (int(width), int(height)))
+        self.theDC.SetClippingRegion(int(x), int(y), int(width), int(height))
 
     def SetDeviceOrigin(self, x, y):
         self.theDC.SetDeviceOrigin(int(x), int(y))