put -DNO_GCC_PRAGMA into CPPFLAGS

[wxWidgets.git] / wxPython / contrib / ogl / msw / ogl.py

diff --git a/wxPython/contrib/ogl/msw/ogl.py b/wxPython/contrib/ogl/msw/ogl.py
index ca2383219a83954612ac1f7a81d27a334fe93454..d7323ed1486357e88993a4fa3b5bb141774964b0 100644 (file)
--- a/wxPython/contrib/ogl/msw/ogl.py
+++ b/wxPython/contrib/ogl/msw/ogl.py
@@ -1,12 +1,21 @@
 # This file was created automatically by SWIG.
 # Don't modify this file, modify the SWIG interface instead.
 
+"""
+The Object Graphics Library provides for simple drawing and manipulation
+of 2D objects.  (This version is deprecated, please use wx.lib.ogl instead.)
+"""
+
 import _ogl
 
 import _windows
 import _core
 wx = _core 
-__docfilter__ = wx.__docfilter__ 
+__docfilter__ = wx.__DocFilter(globals()) 
+import warnings
+warnings.warn("This module is deprecated.  Please use the wx.lib.ogl package instead.",    
+              DeprecationWarning, stacklevel=2)
+
 #---------------------------------------------------------------------------
 
 class ShapeRegion(_core.Object):
@@ -349,7 +358,7 @@ class PyShape(PyShapeEvtHandler):
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
-        self._setOORandCallbackInfo(PyShapeEvtHandler)
+        self._setOORandCallbackInfo(PyShape)
 
     def _setCallbackInfo(*args, **kwargs):
         """_setCallbackInfo(self, PyObject self, PyObject _class)"""
@@ -1194,15 +1203,15 @@ class PseudoMetaFile(_core.Object):
         return _ogl.PseudoMetaFile_DrawText(*args, **kwargs)
 
     def DrawLines(*args, **kwargs):
-        """DrawLines(self, int PCOUNT, Point points)"""
+        """DrawLines(self, int points, Point points_array)"""
         return _ogl.PseudoMetaFile_DrawLines(*args, **kwargs)
 
     def DrawPolygon(*args, **kwargs):
-        """DrawPolygon(self, int PCOUNT, Point points, int flags=0)"""
+        """DrawPolygon(self, int points, Point points_array, int flags=0)"""
         return _ogl.PseudoMetaFile_DrawPolygon(*args, **kwargs)
 
     def DrawSpline(*args, **kwargs):
-        """DrawSpline(self, int PCOUNT, Point points)"""
+        """DrawSpline(self, int points, Point points_array)"""
         return _ogl.PseudoMetaFile_DrawSpline(*args, **kwargs)
 
     def SetClippingRect(*args, **kwargs):
@@ -1779,7 +1788,7 @@ class PyDrawnShape(PyRectangleShape):
         return _ogl.PyDrawnShape_DrawLine(*args, **kwargs)
 
     def DrawLines(*args, **kwargs):
-        """DrawLines(self, int PCOUNT, Point points)"""
+        """DrawLines(self, int points, Point points_array)"""
         return _ogl.PyDrawnShape_DrawLines(*args, **kwargs)
 
     def DrawPoint(*args, **kwargs):
@@ -1787,7 +1796,7 @@ class PyDrawnShape(PyRectangleShape):
         return _ogl.PyDrawnShape_DrawPoint(*args, **kwargs)
 
     def DrawPolygon(*args, **kwargs):
-        """DrawPolygon(self, int PCOUNT, Point points, int flags=0)"""
+        """DrawPolygon(self, int points, Point points_array, int flags=0)"""
         return _ogl.PyDrawnShape_DrawPolygon(*args, **kwargs)
 
     def DrawRectangle(*args, **kwargs):
@@ -1799,7 +1808,7 @@ class PyDrawnShape(PyRectangleShape):
         return _ogl.PyDrawnShape_DrawRoundedRectangle(*args, **kwargs)
 
     def DrawSpline(*args, **kwargs):
-        """DrawSpline(self, int PCOUNT, Point points)"""
+        """DrawSpline(self, int points, Point points_array)"""
         return _ogl.PyDrawnShape_DrawSpline(*args, **kwargs)
 
     def DrawText(*args, **kwargs):
@@ -3190,6 +3199,10 @@ class PyLineShape(PyShape):
         """GetLineControlPoints(self) -> PyObject"""
         return _ogl.PyLineShape_GetLineControlPoints(*args, **kwargs)
 
+    def SetLineControlPoints(*args, **kwargs):
+        """SetLineControlPoints(self, PyObject list)"""
+        return _ogl.PyLineShape_SetLineControlPoints(*args, **kwargs)
+
     def SetAttachmentFrom(*args, **kwargs):
         """SetAttachmentFrom(self, int fromAttach)"""
         return _ogl.PyLineShape_SetAttachmentFrom(*args, **kwargs)
@@ -3863,6 +3876,8 @@ class PyShapeCanvas(_windows.ScrolledWindow):
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
+        self._setOORandCallbackInfo(PyShapeCanvas)
+
     def _setCallbackInfo(*args, **kwargs):
         """_setCallbackInfo(self, PyObject self, PyObject _class)"""
         return _ogl.PyShapeCanvas__setCallbackInfo(*args, **kwargs)