Merge pull request #2779 from swt2c/fix_ogl_int_issues

Fix more OGL float/int conversion issues

Author: swt2c

wx/lib/ogl/basic.py

@@ -3444,7 +3444,7 @@ def OnDraw(self, dc):
                 dc.SetPen(self._pen)
         if self._brush:
             dc.SetBrush(self._brush)
-        dc.DrawEllipse(int(self._xpos - self.GetWidth() / 2.0), int(self._ypos - self.GetHeight() / 2.0), self.GetWidth(), self.GetHeight())
+        dc.DrawEllipse(int(self._xpos - self.GetWidth() / 2.0), int(self._ypos - self.GetHeight() / 2.0), int(self.GetWidth()), int(self.GetHeight()))
 
     def SetSize(self, x, y, recursive = True):
         """

wx/lib/ogl/drawn.py

@@ -275,7 +275,7 @@ def Do(self, dc, xoffset, yoffset):
 
     def Scale(self, scaleX, scaleY):
         for i in range(self._noPoints):
-            self._points[i] = wx.Point(self._points[i][0] * scaleX, self._points[i][1] * scaleY)
+            self._points[i] = wx.Point(int(self._points[i][0] * scaleX), int(self._points[i][1] * scaleY))
 
     def Translate(self, x, y):
         for i in range(self._noPoints):