don't leave gaps around hidden columns/rows in wxFlexGridSizer (closes bug 1659872...

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

diff --git a/wxPython/wx/lib/ogl/_basic.py b/wxPython/wx/lib/ogl/_basic.py
index 646a95af588c67fbbff6632f26ea87bb253e46e7..5d5f461fce0fc1f12197313784871e12b398030b 100644 (file)
--- a/wxPython/wx/lib/ogl/_basic.py
+++ b/wxPython/wx/lib/ogl/_basic.py
@@ -67,9 +67,6 @@ class ShapeEvtHandler(object):
         self._previousHandler = prev
         self._handlerShape = shape
 
         self._previousHandler = prev
         self._handlerShape = shape
 

-    def __del__(self):
-        pass
-

     def SetShape(self, sh):
         self._handlerShape = sh
 
     def SetShape(self, sh):
         self._handlerShape = sh
 


@@ -232,9 +229,9 @@ class Shape(ShapeEvtHandler):
         self._canvas = canvas
         self._xpos = 0.0
         self._ypos = 0.0
         self._canvas = canvas
         self._xpos = 0.0
         self._ypos = 0.0

-        self._pen = wx.Pen(wx.BLACK, 1, wx.SOLID)
+        self._pen = BlackForegroundPen

         self._brush = wx.WHITE_BRUSH
         self._brush = wx.WHITE_BRUSH

-        self._font = wx.Font(10, wx.SWISS, wx.NORMAL, wx.NORMAL)
+        self._font = NormalFont

         self._textColour = wx.BLACK
         self._textColourName = wx.BLACK
         self._visible = False
         self._textColour = wx.BLACK
         self._textColourName = wx.BLACK
         self._visible = False


@@ -276,7 +273,7 @@ class Shape(ShapeEvtHandler):
         # the region eventually (the duplication is for compatibility)
         region = ShapeRegion()
         region.SetName("0")
         # the region eventually (the duplication is for compatibility)
         region = ShapeRegion()
         region.SetName("0")

-        region.SetFont(wx.Font(10, wx.SWISS, wx.NORMAL, wx.NORMAL))
+        region.SetFont(NormalFont)

         region.SetFormatMode(FORMAT_CENTRE_HORIZ | FORMAT_CENTRE_VERT)
         region.SetColour("BLACK")
         self._regions.append(region)
         region.SetFormatMode(FORMAT_CENTRE_HORIZ | FORMAT_CENTRE_VERT)
         region.SetColour("BLACK")
         self._regions.append(region)


@@ -311,9 +308,6 @@ class Shape(ShapeEvtHandler):
             self.GetEventHandler().OnDelete()
         self._eventHandler = None
         
             self.GetEventHandler().OnDelete()
         self._eventHandler = None
         

-    def __del__(self):
-        ShapeEvtHandler.__del__(self)
-

     def Draggable(self):
         """TRUE if the shape may be dragged by the user."""
         return True
     def Draggable(self):
         """TRUE if the shape may be dragged by the user."""
         return True


@@ -2178,7 +2172,7 @@ class Shape(ShapeEvtHandler):
         dc.SetLogicalFunction(OGLRBLF)
 
         bound_x, bound_y = self.GetBoundingBoxMin()
         dc.SetLogicalFunction(OGLRBLF)
 
         bound_x, bound_y = self.GetBoundingBoxMin()

-        self.GetEventHandler().OnEndSize(bound_x, bound_y)
+        self.GetEventHandler().OnBeginSize(bound_x, bound_y)

 
         # Choose the 'opposite corner' of the object as the stationary
         # point in case this is non-centring resizing.
 
         # Choose the 'opposite corner' of the object as the stationary
         # point in case this is non-centring resizing.