wxCheckListBox doesn't require wxUSE_OWNER_DRAWN when using WXUNIVERSAL

[wxWidgets.git] / wxPython / wx / lib / ogl / _diagram.py

diff --git a/wxPython/wx/lib/ogl/_diagram.py b/wxPython/wx/lib/ogl/_diagram.py
index 95ef272206fa00736e805a1999481bc351f9bc4a..8e8f8347246b95412b4da1871a599d853b2bb1ee 100644 (file)
--- a/wxPython/wx/lib/ogl/_diagram.py
+++ b/wxPython/wx/lib/ogl/_diagram.py
@@ -11,8 +11,6 @@
 # Licence:      wxWindows license
 #----------------------------------------------------------------------------
 
 # Licence:      wxWindows license
 #----------------------------------------------------------------------------
 

-from __future__ import division
-

 import wx
 
 DEFAULT_MOUSE_TOLERANCE = 3
 import wx
 
 DEFAULT_MOUSE_TOLERANCE = 3


@@ -84,9 +82,9 @@ class Diagram(object):
     def ShowAll(self, show):
         """Call Show for each shape in the diagram."""
         for shape in self._shapeList:
     def ShowAll(self, show):
         """Call Show for each shape in the diagram."""
         for shape in self._shapeList:

-            shape.Show()
+            shape.Show(show)

 
 

-    def DrawOutLine(self, dc, x1, y1, x2, y2):
+    def DrawOutline(self, dc, x1, y1, x2, y2):

         """Draw an outline rectangle on the current device context."""
         dc.SetPen(wx.Pen(wx.Color(0, 0, 0), 1, wx.DOT))
         dc.SetBrush(wx.TRANSPARENT_BRUSH)
         """Draw an outline rectangle on the current device context."""
         dc.SetPen(wx.Pen(wx.Color(0, 0, 0), 1, wx.DOT))
         dc.SetBrush(wx.TRANSPARENT_BRUSH)


@@ -120,6 +118,14 @@ class Diagram(object):
             return self._gridSpacing * int(x / self._gridSpacing + 0.5), self._gridSpacing * int(y / self._gridSpacing + 0.5)
         return x, y
 
             return self._gridSpacing * int(x / self._gridSpacing + 0.5), self._gridSpacing * int(y / self._gridSpacing + 0.5)
         return x, y
 

+    def SetGridSpacing(self, spacing): 
+        """Sets grid spacing.""" 
+        self._gridSpacing = spacing 
+ 
+    def SetSnapToGrid(self, snap): 
+        """Sets snap-to-grid mode.""" 
+        self._snapToGrid = snap 
+

     def GetGridSpacing(self):
         """Return the grid spacing."""
         return self._gridSpacing
     def GetGridSpacing(self):
         """Return the grid spacing."""
         return self._gridSpacing