Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed some float --> int warnings and ensured that the ColourDB is updated.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@23918 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2003-09-25 20:33:18 +00:00
parent ddf8d2dfb9
commit 5375befac8
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
wxPython/demo/FloatCanvas.py
View File

@@ -47,9 +47,10 @@ else:
ID_DRAWMAP_MENU = wxNewId() ID_DRAWMAP_MENU = wxNewId()
ID_DRAWMAP2_MENU = wxNewId() ID_DRAWMAP2_MENU = wxNewId()
ID_CLEAR_MENU = wxNewId() ID_CLEAR_MENU = wxNewId()
wxPython.lib.colourdb.updateColourDB()
colors = wxPython.lib.colourdb.getColourList() colors = wxPython.lib.colourdb.getColourList()
LineStyles = floatcanvas.draw_object.LineStyleList.keys() LineStyles = floatcanvas.draw_object.LineStyleList.keys()
class DrawFrame(wxFrame): class DrawFrame(wxFrame):

6
wxPython/wxPython/lib/floatcanvas.py
View File

@@ -920,9 +920,9 @@ class FloatCanvas(wxPanel):
def MakeNewBuffers(self): def MakeNewBuffers(self):
# Make new offscreen bitmap: # 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: if self.UseBackground:
self._BackBuffer = wxEmptyBitmap(self.PanelSize[0],self.PanelSize[1]) self._BackBuffer = wxEmptyBitmap((self.PanelSize[0]), (self.PanelSize[1]))
self._BackgroundDirty = 1 self._BackgroundDirty = 1
else: else:
pass pass
@@ -1006,7 +1006,7 @@ class FloatCanvas(wxPanel):
i+=1 i+=1
Object._Draw(dc,self.WorldToPixel,self.ScaleFunction) Object._Draw(dc,self.WorldToPixel,self.ScaleFunction)
if i % self.NumBetweenBlits == 0: 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 print "there were %i objects drawn"%i
dc.EndDrawing() dc.EndDrawing()
else: else: