commit-gnue
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[gnue] r8301 - in trunk/gnue-designer/src: forms/PagePainter uidrivers/w


From: jcater
Subject: [gnue] r8301 - in trunk/gnue-designer/src: forms/PagePainter uidrivers/wx/uihelpers/documentcanvas
Date: Mon, 3 Apr 2006 18:23:03 -0500 (CDT)

Author: jcater
Date: 2006-03-30 23:33:32 -0600 (Thu, 30 Mar 2006)
New Revision: 8301

Added:
   trunk/gnue-designer/src/uidrivers/wx/uihelpers/documentcanvas/__init__.py
   trunk/gnue-designer/src/uidrivers/wx/uihelpers/documentcanvas/colors.py
Modified:
   trunk/gnue-designer/src/forms/PagePainter/PagePainter.py
   trunk/gnue-designer/src/uidrivers/wx/uihelpers/documentcanvas/canvas.py
   trunk/gnue-designer/src/uidrivers/wx/uihelpers/documentcanvas/widget.py
Log:
restored import paths to designer runs again (though not useful yet)

Modified: trunk/gnue-designer/src/forms/PagePainter/PagePainter.py
===================================================================
--- trunk/gnue-designer/src/forms/PagePainter/PagePainter.py    2006-03-31 
00:28:55 UTC (rev 8300)
+++ trunk/gnue-designer/src/forms/PagePainter/PagePainter.py    2006-03-31 
05:33:32 UTC (rev 8301)
@@ -79,6 +79,7 @@
       xscale = max(xscale, w)
       yscale = max(yscale, h)
 
+    canvas.set_grid_size(xscale, yscale)
 
     # Draw initial objects
     self.object.walk(self.inventoryObject)
@@ -88,21 +89,22 @@
 
     canvas = self.canvas
     try:
-      x,y = object['Char:x'], object['Char:y']
+      x = object['Char:x']
+      y = object['Char:y']
     except:
       return
 
     try:
-      w,h = object['Char:width'], object['Char:height']
+      w = object['Char:width']
+      h = object['Char:height']
     except:
-      w,h = object['Char:width'], object['Char:height'] = 10,1
+      w = object['Char:width'] = 10
+      h = object['Char:height'] = 1
 
-    print x, y, w, h
     widget = MyObject(object, canvas)
-    canvas.Add(widget)
+    canvas.add(widget)
     widget.SetSize(w*xscale,h*yscale)
     widget.MoveTo(x*xscale,y*yscale)
-    print widget.bounds
 
   def __objectSelected(self, object):
     pass
@@ -122,40 +124,25 @@
 # SimpleCanvas implementations
 # ===========================================================================
 #
-# These will be reorganized into a separate file once design is completed. 
+# These will be reorganized into a separate file once design is completed.
 #
 
 import cPickle
-from gnue.designer.uidrivers.wx.uihelpers import SimpleCanvas
 
+from gnue.designer.uidrivers.wx.uihelpers.documentcanvas.canvas import 
DocumentCanvas
+from gnue.designer.uidrivers.wx.uihelpers.documentcanvas.widget import 
DocumentWidget
+from gnue.designer.uidrivers.wx.uihelpers.documentcanvas.colors import 
colorIndex
 
 #--------------------------------------------------------------------------
 # MyObject
 #--------------------------------------------------------------------------
-selectionLineColor = wx.SystemSettings_GetColour(wx.SYS_COLOUR_HIGHLIGHT)
-selectedObjectColor = wx.SystemSettings_GetColour(wx.SYS_COLOUR_HIGHLIGHT)
 
-colorIndex = {}
-def buildColorIndex(): 
-  colorIndex['selectionframe'] = 
wx.SystemSettings_GetColour(wx.SYS_COLOUR_HIGHLIGHT)
-  colorIndex['selectedframe'] = 
wx.SystemSettings_GetColour(wx.SYS_COLOUR_HIGHLIGHT)
-  colorIndex['workspace'] = 
wx.SystemSettings_GetColour(wx.SYS_COLOUR_APPWORKSPACE)
-  colorIndex['workspaceGrid'] = wx.Colour(240,240,240) # TODO: ???
-  colorIndex['panel'] = wx.SystemSettings_GetColour(wx.SYS_COLOUR_BACKGROUND)
-  colorIndex['text'] = wx.BLACK
-  colorIndex['widget'] = wx.SystemSettings_GetColour(wx.SYS_COLOUR_WINDOWFRAME)
-  
-
-class MyObject(SimpleCanvas.wxSimpleDrawableObject):
+class MyObject(DocumentWidget):
   def __init__(self, object, canvas):
     self.__object = object
-    SimpleCanvas.wxSimpleDrawableObject.__init__(self, canvas)
+    DocumentWidget.__init__(self, canvas)
 
-    if not colorIndex: 
-      buildColorIndex()
-
-
-  def Draw(self, dc):
+  def draw(self, dc):
     dc.BeginDrawing()
     dc.SetPen(wx.Pen(colorIndex['text']))
     object = self.__object
@@ -208,99 +195,6 @@
 #==========================================================================
 # Canvas implementation
 #==========================================================================
-class DocumentCanvas(SimpleCanvas.wxSimpleCanvas):
-
-  # TODO: make this a preference setting or toolbar icon
-  showRuler = True
-  gridStyle = 1  (can be 0=None, 1 = dashed lines, 2=dots)
-  
-  #------------------------------------------------------------------------
-  # To be subclassed
-  #------------------------------------------------------------------------
-  
-  def DrawDocumentBorder(self, dc): 
-    dc.BeginDrawing()
+class PaintCanvas(DocumentCanvas):
+  def draw_document_frame(self, dc):
     object = self._object
-    width = 
-
-  #------------------------------------------------------------------------
-  # Not to be subclassed
-  #------------------------------------------------------------------------
-  def __init__(self, *args, **parms): 
-    SimpleCanvas.wxSimpleCanvas(self, *args, **parms)
-
-  def Draw(self, dc): 
-    # Draw the background grid
-    self.DrawGrid(dc)
-    
-    # Draw the objects
-    SimpleCanvas.wxSimpleCanvas.Draw(self, dc)
-    
-    # Draw any selection boxes
-    self.DrawSelectionBox(dc)
-    
-  def DrawGrid(self, dc): 
-    #
-    # Draw the grid 
-    #
-    if self.gridStyle == 1: 
-      SOLIDSPACING = 4
-      w, h = self.GetClientSizeTuple()
-      pen1 = wx.Pen(colorIndex['workspaceGrid'], 1, wx.SHORT_DASH)
-      pen2 = wx.Pen(colorIndex['workspaceGrid'], 1, wx.SOLID)
-      dc.SetPen(pen1)
-      
-      # Draw vertical grid lines
-      switchToMainPen = False
-      for x in xrange(xscale,w,xscale):
-        if not x % SOLIDSPACING:
-          switchToMainPen = True
-          dc.SetPen(pen2)
-        dc.DrawLine(x,0,x,h-1)
-        if switchToMainPen: 
-          dc.SetPen(pen1)
-
-
-      # Draw horizontal grid lines
-      switchToMainPen = False
-      for y in xrange(yscale, h, yscale):
-        if not y % SOLIDSPACING:
-          switchToMainPen = True
-          dc.SetPen(pen2)
-        dc.DrawLine(0, y, w, y)
-        if switchToMainPen: 
-          dc.SetPen(pen1)
-
-    elif self.gridStyle == 2:  
-      SOLIDSPACING = 4
-      w, h = self.GetClientSizeTuple()
-      pen1 = wx.Pen(colorIndex['workspaceGrid'], 1, wx.SOLID)
-      pen2 = wx.Pen(colorIndex['workspaceGrid'], 1, wx.SOLID)
-      dc.SetPen(pen1)
-
-      
-      dc.SetPen(pen2)
-      for x in xrange(xscale,w,xscale): 
-        for y in xrange(yscale, h, yscale): 
-          dc.DrawPoint(x,y)
-
-      # Draw vertical grid lines
-      for x in xrange(xscale*SOLIDSPACING,w,xscale*SOLIDSPACING):
-        dc.DrawLine(x,0,x,h-1)
-
-
-      # Draw horizontal grid lines
-      for y in xrange(yscale*SOLIDSPACING, h, yscale*SOLIDSPACING):
-        dc.DrawLine(0, y, w, y)
-
-  
-  def DrawBackground(self, dc):
-    dc.DrawDocumentBorder(dc)
-    dc.BeginDrawing()
-    dc.SetBackgroundMode(wx.TRANSPARENT)
-    dc.Clear()
-    dc.EndDrawing()
-
-
-  def DrawSelectionBox(self, dc): 
-    print "Draw da box, fewl"

Added: trunk/gnue-designer/src/uidrivers/wx/uihelpers/documentcanvas/__init__.py
===================================================================

Modified: 
trunk/gnue-designer/src/uidrivers/wx/uihelpers/documentcanvas/canvas.py
===================================================================
--- trunk/gnue-designer/src/uidrivers/wx/uihelpers/documentcanvas/canvas.py     
2006-03-31 00:28:55 UTC (rev 8300)
+++ trunk/gnue-designer/src/uidrivers/wx/uihelpers/documentcanvas/canvas.py     
2006-03-31 05:33:32 UTC (rev 8301)
@@ -29,32 +29,46 @@
 
 import wx
 
+from colors import colorIndex, buildColorIndex
 
 # ===================================================================
 # The canvas to draw on
 # ===================================================================
 class DocumentCanvas(wx.ScrolledWindow):
+
+    # TODO: make this a preference setting or toolbar icon
+    showRuler = True
+    gridStyle = 1  # (can be 0=None, 1 = dashed lines, 2=dots)
+
     def __init__(self, *arguments, **keywords):
-        super(wxSimpleCanvas, self).__init__(*arguments, **keywords)
+        super(DocumentCanvas, self).__init__(*arguments, **keywords)
 
+        if not colorIndex:
+          buildColorIndex()
+
+
         self.autoCreateDistance = 0
         self.zOrderedDrawableObjects = []
         self.internalDnDItem = None
-        self.Bind(wx.EVT_PAINT, self.OnPaint)
-        self.Bind(wx.EVT_ERASE_BACKGROUND, self.OnEraseBackground)
-        self.Bind(wx.EVT_MOUSE_EVENTS, self.OnMouseEvent)
+        self.Bind(wx.EVT_PAINT, self.__wx_on_paint)
+        self.Bind(wx.EVT_ERASE_BACKGROUND, self.__wx_on_erase_background)
+        self.Bind(wx.EVT_MOUSE_EVENTS, self.__wx_on_mouse_event)
 
 
     def __del__(self):
         for item in self.zOrderedDrawableObjects:
             item.Destroy()
 
-    def RefreshScrolledRect(self, rect):
+    def set_grid_size(self, x, y):
+      self.grid_x_spacing = x
+      self.grid_y_spacing = y
+
+    def refresh_scrolled_rect(self, rect):
         position = rect.GetPosition()
         x, y = self.CalcScrolledPosition(position.x, position.y)
         self.RefreshRect(wx.Rect(x, y, rect.GetWidth(), rect.GetHeight()));
 
-    def OnPaint(self, event):
+    def __wx_on_paint(self, event):
         """
           wx.BufferedDC doesn't work here since it doesn't handle scrolled 
windows
         and always allocates a buffer the size of the client area. So instead 
we'll
@@ -100,8 +114,9 @@
 
         memoryDC.BeginDrawing()
 
-        self.DrawBackground(memoryDC)
-        self.Draw(memoryDC)
+        self.draw_background(memoryDC)
+        self.draw_widgets(memoryDC)
+        self.draw_selection(memoryDC)
 
         paintDC.Blit(bufferX, bufferY,
                       bufferWidth, bufferHeight,
@@ -110,7 +125,7 @@
 
         memoryDC.EndDrawing()
 
-    def Draw(self, dc):
+    def draw_widgets(self, dc):
       updateRegion = self.GetUpdateRegion()
       scrollWindowOriginX, scrollWindowOriginY = 
self.CalcUnscrolledPosition(0, 0)
       dcOriginX, dcOriginY = dc.GetDeviceOrigin()
@@ -129,19 +144,80 @@
 
         if updateRegion.ContainsRect(bounds) != wx.OutRegion and 
drawableObject.visible:
           dc.SetDeviceOrigin(objectX + dcOriginX, objectY + dcOriginY)
-          drawableObject.Draw(dc)
+          drawableObject.draw(dc)
           dc.SetDeviceOrigin(dcOriginX, dcOriginY)
         index -= 1
 
-    def OnEraseBackground(self, event):
+    def draw_background(self, dc):
+      dc.SetBackgroundMode(wx.TRANSPARENT)
+      dc.Clear()
+      #
+      # Draw the grid
+      #
+      if self.gridStyle == 1:
+        SOLIDSPACING = 4
+        w, h = self.GetClientSizeTuple()
+        pen1 = wx.Pen(colorIndex['workspaceGrid'], 1, wx.SHORT_DASH)
+        pen2 = wx.Pen(colorIndex['workspaceGrid'], 1, wx.SOLID)
+        dc.SetPen(pen1)
+
+        # Draw vertical grid lines
+        switchToMainPen = False
+        for x in xrange(self.grid_x_spacing,w,self.grid_x_spacing):
+          if not x % SOLIDSPACING:
+            switchToMainPen = True
+            dc.SetPen(pen2)
+          dc.DrawLine(x,0,x,h-1)
+          if switchToMainPen:
+            dc.SetPen(pen1)
+
+
+        # Draw horizontal grid lines
+        switchToMainPen = False
+        for y in xrange(self.grid_y_spacing, h, self.grid_y_spacing):
+          if not y % SOLIDSPACING:
+            switchToMainPen = True
+            dc.SetPen(pen2)
+          dc.DrawLine(0, y, w, y)
+          if switchToMainPen:
+            dc.SetPen(pen1)
+
+      elif self.gridStyle == 2:
+        SOLIDSPACING = 4
+        w, h = self.GetClientSizeTuple()
+        pen1 = wx.Pen(colorIndex['workspaceGrid'], 1, wx.SOLID)
+        pen2 = wx.Pen(colorIndex['workspaceGrid'], 1, wx.SOLID)
+        dc.SetPen(pen1)
+
+
+        dc.SetPen(pen2)
+        for x in xrange(self.grid_x_spacing,w,self.grid_x_spacing):
+          for y in xrange(self.grid_y_spacing, h, self.grid_y_spacing):
+            dc.DrawPoint(x,y)
+
+        # Draw vertical grid lines
+        for x in 
xrange(self.grid_x_spacing*SOLIDSPACING,w,self.grid_x_spacing*SOLIDSPACING):
+          dc.DrawLine(x,0,x,h-1)
+
+
+        # Draw horizontal grid lines
+        for y in xrange(self.grid_y_spacing*SOLIDSPACING, h, 
self.grid_y_spacing*SOLIDSPACING):
+          dc.DrawLine(0, y, w, y)
+
+
+    def draw_selection(self, dc):
+      print "Draw da box, fewl"
+
+
+    def __wx_on_erase_background(self, event):
       """
-        Override OnEraseBackground to avoid erasing background. Instead
+        Override __wx_on_erase_background to avoid erasing background. Instead
       implement OnDrawBackground to draw/erase the background. This
       design alternative will eliminate flicker
       """
       pass
 
-    def OnMouseEvent(self, event):
+    def __wx_on_mouse_event(self, event):
       x, y = event.GetPositionTuple()
       x, y = self.CalcUnscrolledPosition(x, y)
       for drawableObject in self.zOrderedDrawableObjects:
@@ -207,8 +283,8 @@
 
 
                 #self.zOrderedDrawableObjects.insert(0, 
self.dragCreateDrawableObject)
-                
#self.RefreshScrolledRect(self.dragCreateDrawableObject.bounds);
-                self.Add(object)
+                
#self.refresh_scrolled_rect(self.dragCreateDrawableObject.bounds);
+                self.add(object)
 
               return True
             else:
@@ -248,7 +324,7 @@
               y = drawableObject.bounds.GetTop()
 
               self.zOrderedDrawableObjects.insert(0, drawableObject)
-              self.RefreshScrolledRect(drawableObject.bounds);
+              self.refresh_scrolled_rect(drawableObject.bounds);
       return result
 
     def CreateHitTest(self, x, y):
@@ -286,20 +362,17 @@
       for drawableObject in self.zOrderedDrawableObjects:
           if(drawableObject.selected):
               drawableObject.selected = False
-              self.RefreshScrolledRect(drawableObject.bounds)
+              self.refresh_scrolled_rect(drawableObject.bounds)
 
-    # -----------------------------------------------------------------
-    # Additions by GNUe
-    # -----------------------------------------------------------------
-    def Add(self, object):
+    def add(self, object):
       """
       Add a DrawableObject to the canvas
       """
       self.zOrderedDrawableObjects.insert(0, object)
-      self.RefreshScrolledRect(object.bounds);
+      self.refresh_scrolled_rect(object.bounds);
 
-    def Remove(self, object):
+    def remove(self, object):
       self.zOrderedDrawableObjects.remove(object)
       bounds = object.bounds
-      self.RefreshScrolledRect(bounds)
+      self.refresh_scrolled_rect(bounds)
       object.Destroy()

Added: trunk/gnue-designer/src/uidrivers/wx/uihelpers/documentcanvas/colors.py
===================================================================
--- trunk/gnue-designer/src/uidrivers/wx/uihelpers/documentcanvas/colors.py     
2006-03-31 00:28:55 UTC (rev 8300)
+++ trunk/gnue-designer/src/uidrivers/wx/uihelpers/documentcanvas/colors.py     
2006-03-31 05:33:32 UTC (rev 8301)
@@ -0,0 +1,39 @@
+#
+# Copyright 2001-2006 Free Software Foundation
+#
+# This file is part of GNU Enterprise
+#
+# GNU Enterprise is free software; you can redistribute it
+# and/or modify it under the terms of the GNU General Public
+# License as published by the Free Software Foundation; either
+# version 2, or(at your option) any later version.
+#
+# GNU Enterprise is distributed in the hope that it will be
+# useful, but WITHOUT ANY WARRANTY; without even the implied
+# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+# PURPOSE. See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public
+# License along with program; see the file COPYING. If not,
+# write to the Free Software Foundation, Inc., 59 Temple Place
+# - Suite 330, Boston, MA 02111-1307, USA.
+#
+# $Id: TriggerEditor.py 8210 2006-03-07 00:04:31Z jcater $
+
+#
+# These classes were based on SimpleCanvas from OSA's Chandler
+# application, but heavily commented, debugged, and extended.
+#
+
+import wx
+
+colorIndex = {}
+def buildColorIndex():
+  colorIndex['selectionframe'] = 
wx.SystemSettings_GetColour(wx.SYS_COLOUR_HIGHLIGHT)
+  colorIndex['selectedframe'] = 
wx.SystemSettings_GetColour(wx.SYS_COLOUR_HIGHLIGHT)
+  colorIndex['workspace'] = 
wx.SystemSettings_GetColour(wx.SYS_COLOUR_APPWORKSPACE)
+  colorIndex['workspaceGrid'] = wx.Colour(240,240,240) # TODO: ???
+  colorIndex['panel'] = wx.SystemSettings_GetColour(wx.SYS_COLOUR_BACKGROUND)
+  colorIndex['text'] = wx.BLACK
+  colorIndex['widget'] = wx.SystemSettings_GetColour(wx.SYS_COLOUR_WINDOWFRAME)
+

Modified: 
trunk/gnue-designer/src/uidrivers/wx/uihelpers/documentcanvas/widget.py
===================================================================
--- trunk/gnue-designer/src/uidrivers/wx/uihelpers/documentcanvas/widget.py     
2006-03-31 00:28:55 UTC (rev 8300)
+++ trunk/gnue-designer/src/uidrivers/wx/uihelpers/documentcanvas/widget.py     
2006-03-31 05:33:32 UTC (rev 8301)
@@ -27,67 +27,70 @@
 
 import wx
 
+import dnd
+from colors import colorIndex
+
 # ===================================================================
 # A Drawable canvas widget
 # ===================================================================
 class DocumentWidget(wx.EvtHandler):
     def __init__(self, canvas):
-      super(wxSimpleDrawableObject, self).__init__()
+        super(DocumentWidget, self).__init__()
 
-      self.bounds = wx.Rect()
-      self.canvas = canvas
-      self.visible = True
-      self.selected = False
-      self.dragStartPos = None
+        self.bounds = wx.Rect()
+        self.canvas = canvas
+        self.visible = True
+        self.selected = False
+        self.dragStartPos = None
 
-      self.Bind(wx.EVT_MOUSE_EVENTS, self.OnMouseEvent)
+        self.Bind(wx.EVT_MOUSE_EVENTS, self.OnMouseEvent)
 
     def MoveTo(self, x, y):
-      self.canvas.RefreshScrolledRect(self.bounds);
-      self.bounds.SetLeft(x)
-      self.bounds.SetTop(y)
-      self.canvas.RefreshScrolledRect(self.bounds);
+        self.canvas.refresh_scrolled_rect(self.bounds);
+        self.bounds.SetLeft(x)
+        self.bounds.SetTop(y)
+        self.canvas.refresh_scrolled_rect(self.bounds);
 
     def SetSize(self, width, height):
-      self.canvas.RefreshScrolledRect(self.bounds);
-      self.bounds.SetWidth(width)
-      self.bounds.SetHeight(height)
-      self.canvas.RefreshScrolledRect(self.bounds);
+        self.canvas.refresh_scrolled_rect(self.bounds);
+        self.bounds.SetWidth(width)
+        self.bounds.SetHeight(height)
+        self.canvas.refresh_scrolled_rect(self.bounds);
 
     def OnMouseEvent(self, event):
-      x, y = event.GetPositionTuple()
-      if event.ButtonDown(1):
-        if self.SelectedHitTest(x, y) :
-          self.canvas.DeSelectAll()
-          self.SetSelected()
-          self.canvas.Update()
-          if self.DragHitTest(x, y):
-            self.dragStartPos =(x, y)
-        else:
-          self.dragStartPos =(x,y)
-      elif event.ButtonUp(1):
-        self.dragStartPos = None
-      elif event.Dragging() and event.LeftIsDown():
-        tolerance = 2
-        if abs(x - self.dragStartPos[0]) > tolerance or abs(y - 
self.dragStartPos[1]) > tolerance:
-          self.DoDrag(x, y)
-          return True
-      event.Skip()
-      return False
+        x, y = event.GetPositionTuple()
+        if event.ButtonDown(1):
+            if self.SelectedHitTest(x, y) :
+                self.canvas.DeSelectAll()
+                self.SetSelected()
+                self.canvas.Update()
+                if self.DragHitTest(x, y):
+                    self.dragStartPos =(x, y)
+            else:
+                self.dragStartPos =(x,y)
+        elif event.ButtonUp(1):
+            self.dragStartPos = None
+        elif event.Dragging() and event.LeftIsDown():
+            tolerance = 2
+            if abs(x - self.dragStartPos[0]) > tolerance or \
+               abs(y - self.dragStartPos[1]) > tolerance:
+                self.DoDrag(x, y)
+                return True
+        event.Skip()
+        return False
 
     def SetBounds(self, bounds):
-      self.canvas.RefreshScrolledRect(self.bounds);
-      self.bounds = bounds
-      self.canvas.RefreshScrolledRect(self.bounds);
+        self.canvas.refresh_scrolled_rect(self.bounds);
+        self.bounds = bounds
+        self.canvas.refresh_scrolled_rect(self.bounds);
 
     def Show(self, show):
-
       # Make sure show is a Boolean
       show = bool(show)
 
       if(show ^ self.visible):
         self.visible = show
-        self.canvas.RefreshScrolledRect(self.bounds);
+        self.canvas.refresh_scrolled_rect(self.bounds);
         self.canvas.Update()
 
     def ConvertToCanvasDeviceCoordinates(self, x, y):
@@ -108,7 +111,7 @@
 
       memoryDC.BeginDrawing()
       memoryDC.Clear()
-      self.Draw(memoryDC)
+      self.draw(memoryDC)
 
       maskBitmap = wx.EmptyBitmap(self.bounds.GetWidth(), 
self.bounds.GetHeight(), 1)
       memoryDC.SelectObject(maskBitmap)
@@ -116,7 +119,7 @@
       memoryDC.SetBackground(wx.BLACK_BRUSH)
       memoryDC.Clear()
 
-      self.DrawMask(memoryDC)
+      self.draw_mask(memoryDC)
       memoryDC.EndDrawing()
 
       memoryDC.SelectObject(wx.NullBitmap)
@@ -133,7 +136,7 @@
           # The "hole punching" trick dosen't work on wxGTK, move the hostspot
           # to be just outside the image
           x, y = -1, -1
-      self.dragImage = wxCanvasDragImage(offscreenBuffer)
+      self.dragImage = dnd.wxCanvasDragImage(offscreenBuffer)
 
       self.dragImage.BeginDrag(wx.Point(x,y), self.canvas, True)
       self.dragImage.Move(self.ConvertToCanvasDeviceCoordinates(x, y))
@@ -145,7 +148,7 @@
       data so the garbage collector will delete it.
       """
       dataObject = self.ConvertDrawableObjectToDataObject(x, y)
-      dropSource = wxCanvasDropSource(self, dataObject)
+      dropSource = dnd.wxCanvasDropSource(self, dataObject)
 
       self.canvas.internalDnDItem = self
       result = dropSource.DoDragDrop(wx.Drag_AllowMove)
@@ -154,56 +157,56 @@
       self.dragImage.EndDrag()
       del self.dragImage
 
-  def DrawMask(self, dc):
-    """
-      optionally implement this routine to draw a mask
-    """
-    pass
+    def draw_mask(self, dc):
+      """
+        optionally implement this routine to draw a mask
+      """
+      pass
 
-  def SizeDrag(self, dragRect, startDrag, endDrag):
-    self.canvas.RefreshScrolledRect(self.bounds)
-    self.bounds = dragRect
-    self.canvas.RefreshScrolledRect(self.bounds)
+    def SizeDrag(self, dragRect, startDrag, endDrag):
+      self.canvas.refresh_scrolled_rect(self.bounds)
+      self.bounds = dragRect
+      self.canvas.refresh_scrolled_rect(self.bounds)
 
-  """
-    You must implement the following functions
-  """
-  def Draw(self, dc):
     """
-      You must implement this routine to do draw
+      You must implement the following functions
     """
-    assert(False)
+    def draw(self, dc):
+      """
+        You must implement this routine to do draw
+      """
+      assert(False)
 
-  def DragHitTest(self, x, y):
-    """
-      You must implement this routine to do hit testing for dragable region
-    of drawable object
-    """
-    assert(False)
+    def DragHitTest(self, x, y):
+      """
+        You must implement this routine to do hit testing for dragable region
+      of drawable object
+      """
+      assert(False)
 
-  def ConvertDrawableObjectToDataObject(self, x, y):
-    """
-      You must implement this routine to create data object for drag and drop
-    """
-    assert(False)
+    def ConvertDrawableObjectToDataObject(self, x, y):
+      """
+        You must implement this routine to create data object for drag and drop
+      """
+      assert(False)
 
-  def SelectedHitTest(self, x, y):
-    """
-    You must implement this routine to do hit testing to identify the region
-    for selecting the object.
-    """
-    assert(False)
+    def SelectedHitTest(self, x, y):
+      """
+      You must implement this routine to do hit testing to identify the region
+      for selecting the object.
+      """
+      assert(False)
 
-  def SetSelected(self, selected=True):
-    """
-    Sets the selected bit for this object. Does a canvas refresh on the object
-    if it has changed state. Does not call Update on the canvas.
-    """
-    # Use the same trick as Show()
-    selected = bool(selected)
+    def SetSelected(self, selected=True):
+      """
+      Sets the selected bit for this object. Does a canvas refresh on the 
object
+      if it has changed state. Does not call Update on the canvas.
+      """
+      # Use the same trick as Show()
+      selected = bool(selected)
 
-    # Only do a refresh if we've changed state.
-    if(selected ^ self.selected):
-      self.selected = selected
-      self.canvas.RefreshScrolledRect(self.bounds);
+      # Only do a refresh if we've changed state.
+      if(selected ^ self.selected):
+        self.selected = selected
+        self.canvas.refresh_scrolled_rect(self.bounds);
 





reply via email to

[Prev in Thread] Current Thread [Next in Thread]