reSWIGged

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25062 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

wxPython/contrib/ogl/mac/ogl.py

@@ -137,6 +137,26 @@ class ShapeRegionPtr(ShapeRegion):
         self.__class__ = ShapeRegion
 _ogl.ShapeRegion_swigregister(ShapeRegionPtr)
 
+class AttachmentPoint(core.Object):
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxAttachmentPoint instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+    def __init__(self, *args, **kwargs):
+        """__init__(int id=0, double x=0.0, double y=0.0) -> AttachmentPoint"""
+        newobj = _ogl.new_AttachmentPoint(*args, **kwargs)
+        self.this = newobj.this
+        self.thisown = 1
+        del newobj.thisown
+    m_id = property(_ogl.AttachmentPoint_m_id_get, _ogl.AttachmentPoint_m_id_set)
+    m_x = property(_ogl.AttachmentPoint_m_x_get, _ogl.AttachmentPoint_m_x_set)
+    m_y = property(_ogl.AttachmentPoint_m_y_get, _ogl.AttachmentPoint_m_y_set)
+
+class AttachmentPointPtr(AttachmentPoint):
+    def __init__(self, this):
+        self.this = this
+        if not hasattr(self,"thisown"): self.thisown = 0
+        self.__class__ = AttachmentPoint
+_ogl.AttachmentPoint_swigregister(AttachmentPointPtr)
+
 class PyShapeEvtHandler(core.Object):
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxPyShapeEvtHandler instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
@@ -755,6 +775,10 @@ class PyShape(PyShapeEvtHandler):
         """AttachmentIsValid(int attachment) -> bool"""
         return _ogl.PyShape_AttachmentIsValid(*args, **kwargs)
 
+    def GetAttachments(*args, **kwargs):
+        """GetAttachments() -> PyObject"""
+        return _ogl.PyShape_GetAttachments(*args, **kwargs)
+
     def GetAttachmentPositionEdge(*args, **kwargs):
         """
         GetAttachmentPositionEdge(int attachment, double OUTPUT, double OUTPUT, int nth=0, 
@@ -876,6 +900,10 @@ class PyShape(PyShapeEvtHandler):
         """GetRotation() -> double"""
         return _ogl.PyShape_GetRotation(*args, **kwargs)
 
+    def SetRotation(*args, **kwargs):
+        """SetRotation(double rotation)"""
+        return _ogl.PyShape_SetRotation(*args, **kwargs)
+
     def ClearAttachments(*args, **kwargs):
         """ClearAttachments()"""
         return _ogl.PyShape_ClearAttachments(*args, **kwargs)
@@ -1235,6 +1263,10 @@ class PyRectangleShape(PyShape):
         """SetCornerRadius(double radius)"""
         return _ogl.PyRectangleShape_SetCornerRadius(*args, **kwargs)
 
+    def GetCornerRadius(*args, **kwargs):
+        """GetCornerRadius() -> double"""
+        return _ogl.PyRectangleShape_GetCornerRadius(*args, **kwargs)
+
     def base_OnDelete(*args, **kwargs):
         """base_OnDelete()"""
         return _ogl.PyRectangleShape_base_OnDelete(*args, **kwargs)
@@ -3197,6 +3229,30 @@ class PyLineShape(PyShape):
         """Unlink()"""
         return _ogl.PyLineShape_Unlink(*args, **kwargs)
 
+    def SetAlignmentOrientation(*args, **kwargs):
+        """SetAlignmentOrientation(bool isEnd, bool isHoriz)"""
+        return _ogl.PyLineShape_SetAlignmentOrientation(*args, **kwargs)
+
+    def SetAlignmentType(*args, **kwargs):
+        """SetAlignmentType(bool isEnd, int alignType)"""
+        return _ogl.PyLineShape_SetAlignmentType(*args, **kwargs)
+
+    def GetAlignmentOrientation(*args, **kwargs):
+        """GetAlignmentOrientation(bool isEnd) -> bool"""
+        return _ogl.PyLineShape_GetAlignmentOrientation(*args, **kwargs)
+
+    def GetAlignmentType(*args, **kwargs):
+        """GetAlignmentType(bool isEnd) -> int"""
+        return _ogl.PyLineShape_GetAlignmentType(*args, **kwargs)
+
+    def GetAlignmentStart(*args, **kwargs):
+        """GetAlignmentStart() -> int"""
+        return _ogl.PyLineShape_GetAlignmentStart(*args, **kwargs)
+
+    def GetAlignmentEnd(*args, **kwargs):
+        """GetAlignmentEnd() -> int"""
+        return _ogl.PyLineShape_GetAlignmentEnd(*args, **kwargs)
+
     def base_OnDraw(*args, **kwargs):
         """base_OnDraw(DC dc)"""
         return _ogl.PyLineShape_base_OnDraw(*args, **kwargs)
@@ -3367,6 +3423,26 @@ class PyPolygonShape(PyShape):
         """GetPoints() -> PyObject"""
         return _ogl.PyPolygonShape_GetPoints(*args, **kwargs)
 
+    def GetOriginalPoints(*args, **kwargs):
+        """GetOriginalPoints() -> PyObject"""
+        return _ogl.PyPolygonShape_GetOriginalPoints(*args, **kwargs)
+
+    def GetOriginalWidth(*args, **kwargs):
+        """GetOriginalWidth() -> double"""
+        return _ogl.PyPolygonShape_GetOriginalWidth(*args, **kwargs)
+
+    def GetOriginalHeight(*args, **kwargs):
+        """GetOriginalHeight() -> double"""
+        return _ogl.PyPolygonShape_GetOriginalHeight(*args, **kwargs)
+
+    def SetOriginalWidth(*args, **kwargs):
+        """SetOriginalWidth(double w)"""
+        return _ogl.PyPolygonShape_SetOriginalWidth(*args, **kwargs)
+
+    def SetOriginalHeight(*args, **kwargs):
+        """SetOriginalHeight(double h)"""
+        return _ogl.PyPolygonShape_SetOriginalHeight(*args, **kwargs)
+
     def UpdateOriginalPoints(*args, **kwargs):
         """UpdateOriginalPoints()"""
         return _ogl.PyPolygonShape_UpdateOriginalPoints(*args, **kwargs)

wxPython/contrib/ogl/msw/ogl.py

@@ -137,6 +137,26 @@ class ShapeRegionPtr(ShapeRegion):
         self.__class__ = ShapeRegion
 _ogl.ShapeRegion_swigregister(ShapeRegionPtr)
 
+class AttachmentPoint(core.Object):
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxAttachmentPoint instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+    def __init__(self, *args, **kwargs):
+        """__init__(int id=0, double x=0.0, double y=0.0) -> AttachmentPoint"""
+        newobj = _ogl.new_AttachmentPoint(*args, **kwargs)
+        self.this = newobj.this
+        self.thisown = 1
+        del newobj.thisown
+    m_id = property(_ogl.AttachmentPoint_m_id_get, _ogl.AttachmentPoint_m_id_set)
+    m_x = property(_ogl.AttachmentPoint_m_x_get, _ogl.AttachmentPoint_m_x_set)
+    m_y = property(_ogl.AttachmentPoint_m_y_get, _ogl.AttachmentPoint_m_y_set)
+
+class AttachmentPointPtr(AttachmentPoint):
+    def __init__(self, this):
+        self.this = this
+        if not hasattr(self,"thisown"): self.thisown = 0
+        self.__class__ = AttachmentPoint
+_ogl.AttachmentPoint_swigregister(AttachmentPointPtr)
+
 class PyShapeEvtHandler(core.Object):
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxPyShapeEvtHandler instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
@@ -755,6 +775,10 @@ class PyShape(PyShapeEvtHandler):
         """AttachmentIsValid(int attachment) -> bool"""
         return _ogl.PyShape_AttachmentIsValid(*args, **kwargs)
 
+    def GetAttachments(*args, **kwargs):
+        """GetAttachments() -> PyObject"""
+        return _ogl.PyShape_GetAttachments(*args, **kwargs)
+
     def GetAttachmentPositionEdge(*args, **kwargs):
         """
         GetAttachmentPositionEdge(int attachment, double OUTPUT, double OUTPUT, int nth=0, 
@@ -876,6 +900,10 @@ class PyShape(PyShapeEvtHandler):
         """GetRotation() -> double"""
         return _ogl.PyShape_GetRotation(*args, **kwargs)
 
+    def SetRotation(*args, **kwargs):
+        """SetRotation(double rotation)"""
+        return _ogl.PyShape_SetRotation(*args, **kwargs)
+
     def ClearAttachments(*args, **kwargs):
         """ClearAttachments()"""
         return _ogl.PyShape_ClearAttachments(*args, **kwargs)
@@ -1235,6 +1263,10 @@ class PyRectangleShape(PyShape):
         """SetCornerRadius(double radius)"""
         return _ogl.PyRectangleShape_SetCornerRadius(*args, **kwargs)
 
+    def GetCornerRadius(*args, **kwargs):
+        """GetCornerRadius() -> double"""
+        return _ogl.PyRectangleShape_GetCornerRadius(*args, **kwargs)
+
     def base_OnDelete(*args, **kwargs):
         """base_OnDelete()"""
         return _ogl.PyRectangleShape_base_OnDelete(*args, **kwargs)
@@ -3197,6 +3229,30 @@ class PyLineShape(PyShape):
         """Unlink()"""
         return _ogl.PyLineShape_Unlink(*args, **kwargs)
 
+    def SetAlignmentOrientation(*args, **kwargs):
+        """SetAlignmentOrientation(bool isEnd, bool isHoriz)"""
+        return _ogl.PyLineShape_SetAlignmentOrientation(*args, **kwargs)
+
+    def SetAlignmentType(*args, **kwargs):
+        """SetAlignmentType(bool isEnd, int alignType)"""
+        return _ogl.PyLineShape_SetAlignmentType(*args, **kwargs)
+
+    def GetAlignmentOrientation(*args, **kwargs):
+        """GetAlignmentOrientation(bool isEnd) -> bool"""
+        return _ogl.PyLineShape_GetAlignmentOrientation(*args, **kwargs)
+
+    def GetAlignmentType(*args, **kwargs):
+        """GetAlignmentType(bool isEnd) -> int"""
+        return _ogl.PyLineShape_GetAlignmentType(*args, **kwargs)
+
+    def GetAlignmentStart(*args, **kwargs):
+        """GetAlignmentStart() -> int"""
+        return _ogl.PyLineShape_GetAlignmentStart(*args, **kwargs)
+
+    def GetAlignmentEnd(*args, **kwargs):
+        """GetAlignmentEnd() -> int"""
+        return _ogl.PyLineShape_GetAlignmentEnd(*args, **kwargs)
+
     def base_OnDraw(*args, **kwargs):
         """base_OnDraw(DC dc)"""
         return _ogl.PyLineShape_base_OnDraw(*args, **kwargs)
@@ -3367,6 +3423,26 @@ class PyPolygonShape(PyShape):
         """GetPoints() -> PyObject"""
         return _ogl.PyPolygonShape_GetPoints(*args, **kwargs)
 
+    def GetOriginalPoints(*args, **kwargs):
+        """GetOriginalPoints() -> PyObject"""
+        return _ogl.PyPolygonShape_GetOriginalPoints(*args, **kwargs)
+
+    def GetOriginalWidth(*args, **kwargs):
+        """GetOriginalWidth() -> double"""
+        return _ogl.PyPolygonShape_GetOriginalWidth(*args, **kwargs)
+
+    def GetOriginalHeight(*args, **kwargs):
+        """GetOriginalHeight() -> double"""
+        return _ogl.PyPolygonShape_GetOriginalHeight(*args, **kwargs)
+
+    def SetOriginalWidth(*args, **kwargs):
+        """SetOriginalWidth(double w)"""
+        return _ogl.PyPolygonShape_SetOriginalWidth(*args, **kwargs)
+
+    def SetOriginalHeight(*args, **kwargs):
+        """SetOriginalHeight(double h)"""
+        return _ogl.PyPolygonShape_SetOriginalHeight(*args, **kwargs)
+
     def UpdateOriginalPoints(*args, **kwargs):
         """UpdateOriginalPoints()"""
         return _ogl.PyPolygonShape_UpdateOriginalPoints(*args, **kwargs)

wxPython/src/mac/controls.py

@@ -825,6 +825,8 @@ class CheckListBox(ListBox):
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
+        self._setOORInfo(self)
+
     def Create(*args, **kwargs):
         """
         Create(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, 

wxPython/src/mac/core.py

@@ -765,9 +765,8 @@ class Size(object):
         elif index == 1: self.height = val
         else: raise IndexError
     def __nonzero__(self):               return self.Get() != (0,0)
-    def __getinitargs__(self):           return ()
+    __safe_for_unpickling__ = True
-    def __getstate__(self):              return self.Get()
+    def __reduce__(self):                return (wx.Size, self.Get())
-    def __setstate__(self, state):       self.Set(*state)
 
 
 class SizePtr(Size):
@@ -863,9 +862,8 @@ class RealPoint(object):
         elif index == 1: self.y = val
         else: raise IndexError
     def __nonzero__(self):               return self.Get() != (0.0, 0.0)
-    def __getinitargs__(self):           return ()
+    __safe_for_unpickling__ = True
-    def __getstate__(self):              return self.Get()
+    def __reduce__(self):                return (wx.RealPoint, self.Get())
-    def __setstate__(self, state):       self.Set(*state)
 
 
 class RealPointPtr(RealPoint):
@@ -977,9 +975,8 @@ class Point(object):
         elif index == 1: self.y = val
         else: raise IndexError
     def __nonzero__(self):               return self.Get() != (0,0)
-    def __getinitargs__(self):           return ()
+    __safe_for_unpickling__ = True
-    def __getstate__(self):              return self.Get()
+    def __reduce__(self):                return (wx.Point, self.Get())
-    def __setstate__(self, state):       self.Set(*state)
 
 
 class PointPtr(Point):
@@ -1251,9 +1248,8 @@ class Rect(object):
         elif index == 3: self.height = val
         else: raise IndexError
     def __nonzero__(self):               return self.Get() != (0,0,0,0)
-    def __getinitargs__(self):           return ()
+    __safe_for_unpickling__ = True
-    def __getstate__(self):              return self.Get()
+    def __reduce__(self):                return (wx.Rect, self.Get())
-    def __setstate__(self, state):       self.Set(*state)
 
 
 class RectPtr(Rect):
@@ -1425,10 +1421,8 @@ class Point2D(object):
         elif index == 1: self.y = val
         else: raise IndexError
     def __nonzero__(self):               return self.Get() != (0.0, 0.0)
-    def __getinitargs__(self):           return ()
+    __safe_for_unpickling__ = True
-    def __getstate__(self):              return self.Get()
+    def __reduce__(self):                return (wx.Point2D, self.Get())
-    def __setstate__(self, state):       self.Set(*state)
-
 
 
 class Point2DPtr(Point2D):
@@ -7103,7 +7097,7 @@ class Sizer(Object):
                 childinfo = (childinfo, )
             self.Add(*childinfo)
 
-
+    # for backwards compatibility only, please do not use in new code
     AddWindow = AddSizer = AddSpacer = Add
     PrependWindow = PrependSizer = PrependSpacer = Prepend
     InsertWindow = InsertSizer = InsertSpacer = Insert
@@ -7486,9 +7480,8 @@ class GBPosition(object):
         elif index == 1: self.SetCol(val)
         else: raise IndexError
     def __nonzero__(self):               return self.Get() != (0,0)
-    def __getinitargs__(self):           return ()
+    __safe_for_unpickling__ = True
-    def __getstate__(self):              return self.Get()
+    def __reduce__(self):                return (wx.GBPosition, self.Get())
-    def __setstate__(self, state):       self.Set(*state)
 
     row = property(GetRow, SetRow)
     col = property(GetCol, SetCol)
@@ -7552,9 +7545,8 @@ class GBSpan(object):
         elif index == 1: self.SetColspan(val)
         else: raise IndexError
     def __nonzero__(self):               return self.Get() != (0,0)
-    def __getinitargs__(self):           return ()
+    __safe_for_unpickling__ = True
-    def __getstate__(self):              return self.Get()
+    def __reduce__(self):                return (wx.GBSpan, self.Get())
-    def __setstate__(self, state):       self.Set(*state)
 
     rowspan = property(GetRowspan, SetRowspan)
     colspan = property(GetColspan, SetColspan)

wxPython/src/mac/gdi.py

@@ -103,9 +103,8 @@ class Colour(core.Object):
     def __str__(self):                  return str(self.asTuple())
     def __repr__(self):                 return 'wx.Colour' + str(self.asTuple())
     def __nonzero__(self):              return self.Ok()
-    def __getinitargs__(self):          return ()
+    __safe_for_unpickling__ = True
-    def __getstate__(self):             return self.asTuple()
+    def __reduce__(self):               return (Colour, self.Get())
-    def __setstate__(self, state):      self.Set(*state)
 
 
 class ColourPtr(Colour):

wxPython/src/msw/controls.py

@@ -833,6 +833,8 @@ class CheckListBox(ListBox):
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
+        self._setOORInfo(self)
+
     def Create(*args, **kwargs):
         """
         Create(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize,