From 5375befac89765bc320a3cf51a50f4658a809a85 Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Thu, 25 Sep 2003 20:33:18 +0000 Subject: [PATCH] Fixed some float --> int warnings and ensured that the ColourDB is updated. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@23918 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- wxPython/demo/FloatCanvas.py | 5 +++-- wxPython/wxPython/lib/floatcanvas.py | 6 +++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/wxPython/demo/FloatCanvas.py b/wxPython/demo/FloatCanvas.py index ce8d6e7ab2..174473753a 100644 --- a/wxPython/demo/FloatCanvas.py +++ b/wxPython/demo/FloatCanvas.py @@ -47,9 +47,10 @@ else: ID_DRAWMAP_MENU = wxNewId() ID_DRAWMAP2_MENU = wxNewId() ID_CLEAR_MENU = wxNewId() - + + wxPython.lib.colourdb.updateColourDB() colors = wxPython.lib.colourdb.getColourList() - + LineStyles = floatcanvas.draw_object.LineStyleList.keys() class DrawFrame(wxFrame): diff --git a/wxPython/wxPython/lib/floatcanvas.py b/wxPython/wxPython/lib/floatcanvas.py index 24c7af1721..8276da20f0 100644 --- a/wxPython/wxPython/lib/floatcanvas.py +++ b/wxPython/wxPython/lib/floatcanvas.py @@ -920,9 +920,9 @@ class FloatCanvas(wxPanel): def MakeNewBuffers(self): # Make new offscreen bitmap: - self._Buffer = wxEmptyBitmap(self.PanelSize[0],self.PanelSize[1]) + self._Buffer = wxEmptyBitmap(int(self.PanelSize[0]), int(self.PanelSize[1])) if self.UseBackground: - self._BackBuffer = wxEmptyBitmap(self.PanelSize[0],self.PanelSize[1]) + self._BackBuffer = wxEmptyBitmap((self.PanelSize[0]), (self.PanelSize[1])) self._BackgroundDirty = 1 else: pass @@ -1006,7 +1006,7 @@ class FloatCanvas(wxPanel): i+=1 Object._Draw(dc,self.WorldToPixel,self.ScaleFunction) if i % self.NumBetweenBlits == 0: - ScreenDC.Blit(0, 0, self.PanelSize[0],self.PanelSize[1], dc, 0, 0) + ScreenDC.Blit(0, 0, int(self.PanelSize[0]), int(self.PanelSize[1]), dc, 0, 0) print "there were %i objects drawn"%i dc.EndDrawing() else: