Lerking/Phoenix
1
0
Fork 0
mirror of https://github.com/wxWidgets/Phoenix.git synced 2025-12-16 01:30:07 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Patch updating FloatCanvas for Phoenix

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@73859 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2013-04-26 06:41:06 +00:00
parent 3f4fe92c4d
commit e31baa0d8e
5 changed files with 78 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
wx/lib/floatcanvas/GUIMode.py
View File

@@ -24,31 +24,31 @@ class Cursors(object):
"""
def __init__(self):
if "wxMac" in wx.PlatformInfo: # use 16X16 cursors for wxMac
self.HandCursor = wx.CursorFromImage(Resources.getHand16Image())
self.GrabHandCursor = wx.CursorFromImage(Resources.getGrabHand16Image())
self.HandCursor = wx.Cursor(Resources.getHand16Image())
self.GrabHandCursor = wx.Cursor(Resources.getGrabHand16Image())
img = Resources.getMagPlus16Image()
img.SetOptionInt(wx.IMAGE_OPTION_CUR_HOTSPOT_X, 6)
img.SetOptionInt(wx.IMAGE_OPTION_CUR_HOTSPOT_Y, 6)
self.MagPlusCursor = wx.CursorFromImage(img)
img.SetOption(wx.IMAGE_OPTION_CUR_HOTSPOT_X, 6)
img.SetOption(wx.IMAGE_OPTION_CUR_HOTSPOT_Y, 6)
self.MagPlusCursor = wx.Cursor(img)
img = Resources.getMagMinus16Image()
img.SetOptionInt(wx.IMAGE_OPTION_CUR_HOTSPOT_X, 6)
img.SetOptionInt(wx.IMAGE_OPTION_CUR_HOTSPOT_Y, 6)
self.MagMinusCursor = wx.CursorFromImage(img)
img.SetOption(wx.IMAGE_OPTION_CUR_HOTSPOT_X, 6)
img.SetOption(wx.IMAGE_OPTION_CUR_HOTSPOT_Y, 6)
self.MagMinusCursor = wx.Cursor(img)
else: # use 24X24 cursors for GTK and Windows
self.HandCursor = wx.CursorFromImage(Resources.getHandImage())
self.GrabHandCursor = wx.CursorFromImage(Resources.getGrabHandImage())
self.HandCursor = wx.Cursor(Resources.getHandImage())
self.GrabHandCursor = wx.Cursor(Resources.getGrabHandImage())
img = Resources.getMagPlusImage()
img.SetOptionInt(wx.IMAGE_OPTION_CUR_HOTSPOT_X, 9)
img.SetOptionInt(wx.IMAGE_OPTION_CUR_HOTSPOT_Y, 9)
self.MagPlusCursor = wx.CursorFromImage(img)
img.SetOption(wx.IMAGE_OPTION_CUR_HOTSPOT_X, 9)
img.SetOption(wx.IMAGE_OPTION_CUR_HOTSPOT_Y, 9)
self.MagPlusCursor = wx.Cursor(img)
img = Resources.getMagMinusImage()
img.SetOptionInt(wx.IMAGE_OPTION_CUR_HOTSPOT_X, 9)
img.SetOptionInt(wx.IMAGE_OPTION_CUR_HOTSPOT_Y, 9)
self.MagMinusCursor = wx.CursorFromImage(img)
img.SetOption(wx.IMAGE_OPTION_CUR_HOTSPOT_X, 9)
img.SetOption(wx.IMAGE_OPTION_CUR_HOTSPOT_Y, 9)
self.MagMinusCursor = wx.Cursor(img)
class GUIBase(object):
@@ -224,7 +224,6 @@ class GUIMove(GUIBase):
wh = self.Canvas.PanelSize
xy_tl = xy1 - self.StartMove
dc = wx.ClientDC(self.Canvas)
dc.BeginDrawing()
x1,y1 = self.PrevMoveXY
x2,y2 = xy_tl
w,h = self.Canvas.PanelSize
@@ -272,10 +271,9 @@ class GUIMove(GUIBase):
dc.DrawRectangle(xb, yb, wb, hb)
self.PrevMoveXY = xy_tl
if self.Canvas._ForeDrawList:
dc.DrawBitmapPoint(self.Canvas._ForegroundBuffer,xy_tl)
dc.DrawBitmap(self.Canvas._ForegroundBuffer,xy_tl)
else:
dc.DrawBitmapPoint(self.Canvas._Buffer,xy_tl)
dc.EndDrawing()
dc.DrawBitmap(self.Canvas._Buffer,xy_tl)
#self.Canvas.Update()
def OnWheel(self, event):
@@ -327,15 +325,13 @@ class GUIZoomIn(GUIBase):
wh[1] = int(wh[0] / self.Canvas.AspectRatio)
xy_c = (xy0 + xy1) / 2
dc = wx.ClientDC(self.Canvas)
dc.BeginDrawing()
dc.SetPen(wx.Pen('WHITE', 2, wx.SHORT_DASH))
dc.SetBrush(wx.TRANSPARENT_BRUSH)
dc.SetLogicalFunction(wx.XOR)
if self.PrevRBBox:
dc.DrawRectanglePointSize(*self.PrevRBBox)
dc.DrawRectangle(*self.PrevRBBox)
self.PrevRBBox = ( xy_c - wh/2, wh )
dc.DrawRectanglePointSize( *self.PrevRBBox )
dc.EndDrawing()
dc.DrawRectangle( *self.PrevRBBox )
def UpdateScreen(self):
"""