From 26c4d26f7124f847b77eebb7d0af38eb142f2fdf Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Fri, 3 Nov 2006 08:07:25 +0000 Subject: [PATCH] rwSWIGged git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42975 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- wxPython/src/gtk/_controls.py | 1 + wxPython/src/gtk/_gdi.py | 459 +++++++++++++------- wxPython/src/gtk/_gdi_wrap.cpp | 404 ++++++++---------- wxPython/src/gtk/_misc_wrap.cpp | 1 + wxPython/src/gtk/_windows.py | 3 + wxPython/src/gtk/aui.py | 22 +- wxPython/src/gtk/aui_wrap.cpp | 725 +++++++++++++++++++------------- wxPython/src/mac/_controls.py | 1 + wxPython/src/mac/_gdi.py | 459 +++++++++++++------- wxPython/src/mac/_gdi_wrap.cpp | 404 ++++++++---------- wxPython/src/mac/_misc_wrap.cpp | 1 + wxPython/src/mac/_windows.py | 3 + wxPython/src/mac/aui.py | 22 +- wxPython/src/mac/aui_wrap.cpp | 725 +++++++++++++++++++------------- wxPython/src/msw/_controls.py | 1 + wxPython/src/msw/_gdi.py | 459 +++++++++++++------- wxPython/src/msw/_gdi_wrap.cpp | 404 ++++++++---------- wxPython/src/msw/_misc_wrap.cpp | 1 + wxPython/src/msw/_windows.py | 3 + wxPython/src/msw/aui.py | 22 +- wxPython/src/msw/aui_wrap.cpp | 725 +++++++++++++++++++------------- 21 files changed, 2820 insertions(+), 2025 deletions(-) diff --git a/wxPython/src/gtk/_controls.py b/wxPython/src/gtk/_controls.py index f7a568944b..cbab6abfe4 100644 --- a/wxPython/src/gtk/_controls.py +++ b/wxPython/src/gtk/_controls.py @@ -5746,6 +5746,7 @@ class PyControl(_core.Control): """_setCallbackInfo(self, PyObject self, PyObject _class)""" return _controls_.PyControl__setCallbackInfo(*args, **kwargs) + SetBestSize = wx.Window.SetInitialSize def DoEraseBackground(*args, **kwargs): """DoEraseBackground(self, DC dc) -> bool""" return _controls_.PyControl_DoEraseBackground(*args, **kwargs) diff --git a/wxPython/src/gtk/_gdi.py b/wxPython/src/gtk/_gdi.py index 8feee0ed81..c40e92ff5c 100644 --- a/wxPython/src/gtk/_gdi.py +++ b/wxPython/src/gtk/_gdi.py @@ -4487,69 +4487,6 @@ _gdi_.DCClipper_swigregister(DCClipper) #--------------------------------------------------------------------------- -class MemoryDC(DC): - """ - A memory device context provides a means to draw graphics onto a - bitmap. A bitmap must be selected into the new memory DC before it may - be used for anything. Typical usage is as follows:: - - dc = wx.MemoryDC() - dc.SelectObject(bitmap) - # draw on the dc using any of the Draw methods - dc.SelectObject(wx.NullBitmap) - # the bitmap now contains wahtever was drawn upon it - - Note that the memory DC *must* be deleted (or the bitmap selected out - of it) before a bitmap can be reselected into another memory DC. - - """ - thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag') - __repr__ = _swig_repr - def __init__(self, *args, **kwargs): - """ - __init__(self, Bitmap bitmap=NullBitmap) -> MemoryDC - - Constructs a new memory device context. - - Use the Ok member to test whether the constructor was successful in - creating a usable device context. If a bitmap is not given to this - constructor then don't forget to select a bitmap into the DC before - drawing on it. - """ - _gdi_.MemoryDC_swiginit(self,_gdi_.new_MemoryDC(*args, **kwargs)) - def SelectObject(*args, **kwargs): - """ - SelectObject(self, Bitmap bitmap) - - Selects the bitmap into the device context, to use as the memory - bitmap. Selecting the bitmap into a memory DC allows you to draw into - the DC, and therefore the bitmap, and also to use Blit to copy the - bitmap to a window. - - If the argument is wx.NullBitmap (or some other uninitialised - `wx.Bitmap`) the current bitmap is selected out of the device context, - and the original bitmap restored, allowing the current bitmap to be - destroyed safely. - """ - return _gdi_.MemoryDC_SelectObject(*args, **kwargs) - - def SelectObjectAsSource(*args, **kwargs): - """SelectObjectAsSource(self, Bitmap bmp)""" - return _gdi_.MemoryDC_SelectObjectAsSource(*args, **kwargs) - -_gdi_.MemoryDC_swigregister(MemoryDC) - -def MemoryDCFromDC(*args, **kwargs): - """ - MemoryDCFromDC(DC oldDC) -> MemoryDC - - Creates a DC that is compatible with the oldDC. - """ - val = _gdi_.new_MemoryDCFromDC(*args, **kwargs) - return val - -#--------------------------------------------------------------------------- - class ScreenDC(DC): """ A wxScreenDC can be used to paint anywhere on the screen. This should @@ -4691,6 +4628,69 @@ _gdi_.PaintDC_swigregister(PaintDC) #--------------------------------------------------------------------------- +class MemoryDC(WindowDC): + """ + A memory device context provides a means to draw graphics onto a + bitmap. A bitmap must be selected into the new memory DC before it may + be used for anything. Typical usage is as follows:: + + dc = wx.MemoryDC() + dc.SelectObject(bitmap) + # draw on the dc using any of the Draw methods + dc.SelectObject(wx.NullBitmap) + # the bitmap now contains wahtever was drawn upon it + + Note that the memory DC *must* be deleted (or the bitmap selected out + of it) before a bitmap can be reselected into another memory DC. + + """ + thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag') + __repr__ = _swig_repr + def __init__(self, *args, **kwargs): + """ + __init__(self, Bitmap bitmap=NullBitmap) -> MemoryDC + + Constructs a new memory device context. + + Use the Ok member to test whether the constructor was successful in + creating a usable device context. If a bitmap is not given to this + constructor then don't forget to select a bitmap into the DC before + drawing on it. + """ + _gdi_.MemoryDC_swiginit(self,_gdi_.new_MemoryDC(*args, **kwargs)) + def SelectObject(*args, **kwargs): + """ + SelectObject(self, Bitmap bitmap) + + Selects the bitmap into the device context, to use as the memory + bitmap. Selecting the bitmap into a memory DC allows you to draw into + the DC, and therefore the bitmap, and also to use Blit to copy the + bitmap to a window. + + If the argument is wx.NullBitmap (or some other uninitialised + `wx.Bitmap`) the current bitmap is selected out of the device context, + and the original bitmap restored, allowing the current bitmap to be + destroyed safely. + """ + return _gdi_.MemoryDC_SelectObject(*args, **kwargs) + + def SelectObjectAsSource(*args, **kwargs): + """SelectObjectAsSource(self, Bitmap bmp)""" + return _gdi_.MemoryDC_SelectObjectAsSource(*args, **kwargs) + +_gdi_.MemoryDC_swigregister(MemoryDC) + +def MemoryDCFromDC(*args, **kwargs): + """ + MemoryDCFromDC(DC oldDC) -> MemoryDC + + Creates a DC that is compatible with the oldDC. + """ + val = _gdi_.new_MemoryDCFromDC(*args, **kwargs) + return val + +#--------------------------------------------------------------------------- + BUFFER_VIRTUAL_AREA = _gdi_.BUFFER_VIRTUAL_AREA BUFFER_CLIENT_AREA = _gdi_.BUFFER_CLIENT_AREA class BufferedDC(MemoryDC): @@ -4946,63 +4946,134 @@ _gdi_.PrinterDC_swigregister(PrinterDC) #--------------------------------------------------------------------------- class GraphicsObject(_core.Object): - """Proxy of C++ GraphicsObject class""" + """ + This class is the superclass of native graphics objects like pens + etc. It provides the internal reference counting. It is not to be + instantiated by user code. + """ thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag') __repr__ = _swig_repr def __init__(self, *args, **kwargs): - """__init__(self, GraphicsRenderer renderer=None) -> GraphicsObject""" + """ + __init__(self, GraphicsRenderer renderer=None) -> GraphicsObject + + This class is the superclass of native graphics objects like pens + etc. It provides the internal reference counting. It is not to be + instantiated by user code. + """ _gdi_.GraphicsObject_swiginit(self,_gdi_.new_GraphicsObject(*args, **kwargs)) __swig_destroy__ = _gdi_.delete_GraphicsObject __del__ = lambda self : None; def IsNull(*args, **kwargs): - """IsNull(self) -> bool""" + """ + IsNull(self) -> bool + + Is this object valid (false) or still empty (true)? + """ return _gdi_.GraphicsObject_IsNull(*args, **kwargs) def GetRenderer(*args, **kwargs): - """GetRenderer(self) -> GraphicsRenderer""" + """ + GetRenderer(self) -> GraphicsRenderer + + Returns the renderer that was used to create this instance, or + ``None`` if it has not been initialized yet. + """ return _gdi_.GraphicsObject_GetRenderer(*args, **kwargs) _gdi_.GraphicsObject_swigregister(GraphicsObject) class GraphicsPen(GraphicsObject): - """Proxy of C++ GraphicsPen class""" + """ + A wx.GraphicsPen is a native representation of a pen. It is used for + stroking a path on a `wx.GraphicsContext`. The contents are specific and + private to the respective renderer. The only way to get a valid instance + is via a CreatePen call on the graphics context or the renderer + instance. + """ thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag') __repr__ = _swig_repr def __init__(self, *args, **kwargs): - """__init__(self) -> GraphicsPen""" + """ + __init__(self) -> GraphicsPen + + A wx.GraphicsPen is a native representation of a pen. It is used for + stroking a path on a `wx.GraphicsContext`. The contents are specific and + private to the respective renderer. The only way to get a valid instance + is via a CreatePen call on the graphics context or the renderer + instance. + """ _gdi_.GraphicsPen_swiginit(self,_gdi_.new_GraphicsPen(*args, **kwargs)) __swig_destroy__ = _gdi_.delete_GraphicsPen __del__ = lambda self : None; _gdi_.GraphicsPen_swigregister(GraphicsPen) class GraphicsBrush(GraphicsObject): - """Proxy of C++ GraphicsBrush class""" + """ + A wx.GraphicsBrush is a native representation of a brush. It is used + for filling a path on a `wx.GraphicsContext`. The contents are + specific and private to the respective renderer. The only way to get a + valid instance is via a Create...Brush call on the graphics context or + the renderer instance. + """ thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag') __repr__ = _swig_repr def __init__(self, *args, **kwargs): - """__init__(self) -> GraphicsBrush""" + """ + __init__(self) -> GraphicsBrush + + A wx.GraphicsBrush is a native representation of a brush. It is used + for filling a path on a `wx.GraphicsContext`. The contents are + specific and private to the respective renderer. The only way to get a + valid instance is via a Create...Brush call on the graphics context or + the renderer instance. + """ _gdi_.GraphicsBrush_swiginit(self,_gdi_.new_GraphicsBrush(*args, **kwargs)) __swig_destroy__ = _gdi_.delete_GraphicsBrush __del__ = lambda self : None; _gdi_.GraphicsBrush_swigregister(GraphicsBrush) class GraphicsFont(GraphicsObject): - """Proxy of C++ GraphicsFont class""" + """ + A `wx.GraphicsFont` is a native representation of a font (including + text colour). The contents are specific an private to the respective + renderer. The only way to get a valid instance is via a CreateFont + call on the graphics context or the renderer instance. + """ thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag') __repr__ = _swig_repr def __init__(self, *args, **kwargs): - """__init__(self) -> GraphicsFont""" + """ + __init__(self) -> GraphicsFont + + A `wx.GraphicsFont` is a native representation of a font (including + text colour). The contents are specific an private to the respective + renderer. The only way to get a valid instance is via a CreateFont + call on the graphics context or the renderer instance. + """ _gdi_.GraphicsFont_swiginit(self,_gdi_.new_GraphicsFont(*args, **kwargs)) __swig_destroy__ = _gdi_.delete_GraphicsFont __del__ = lambda self : None; _gdi_.GraphicsFont_swigregister(GraphicsFont) class GraphicsMatrix(GraphicsObject): - """Proxy of C++ GraphicsMatrix class""" + """ + A wx.GraphicsMatrix is a native representation of an affine + matrix. The contents are specific an private to the respective + renderer. The only way to get a valid instance is via a CreateMatrix + call on the graphics context or the renderer instance. + """ thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag') __repr__ = _swig_repr def __init__(self, *args, **kwargs): - """__init__(self) -> GraphicsMatrix""" + """ + __init__(self) -> GraphicsMatrix + + A wx.GraphicsMatrix is a native representation of an affine + matrix. The contents are specific an private to the respective + renderer. The only way to get a valid instance is via a CreateMatrix + call on the graphics context or the renderer instance. + """ _gdi_.GraphicsMatrix_swiginit(self,_gdi_.new_GraphicsMatrix(*args, **kwargs)) __swig_destroy__ = _gdi_.delete_GraphicsMatrix __del__ = lambda self : None; @@ -5010,24 +5081,17 @@ class GraphicsMatrix(GraphicsObject): """ Concat(self, GraphicsMatrix t) - concatenates the matrix + Concatenates the passed in matrix to the current matrix. """ return _gdi_.GraphicsMatrix_Concat(*args, **kwargs) - def Copy(*args, **kwargs): - """ - Copy(self, GraphicsMatrix t) - - Copy the passed in matrix to this one. - """ - return _gdi_.GraphicsMatrix_Copy(*args, **kwargs) - def Set(*args, **kwargs): """ Set(self, Double a=1.0, Double b=0.0, Double c=0.0, Double d=1.0, Double tx=0.0, Double ty=0.0) - sets the matrix to the respective values + Sets the matrix to the specified values (default values are the + identity matrix.) """ return _gdi_.GraphicsMatrix_Set(*args, **kwargs) @@ -5035,7 +5099,7 @@ class GraphicsMatrix(GraphicsObject): """ Invert(self) - makes this the inverse matrix + Inverts the matrix. """ return _gdi_.GraphicsMatrix_Invert(*args, **kwargs) @@ -5043,7 +5107,7 @@ class GraphicsMatrix(GraphicsObject): """ IsEqual(self, GraphicsMatrix t) -> bool - returns true if the elements of the transformation matrix are equal + Returns ``True`` if the elements of the transformation matrix are equal """ return _gdi_.GraphicsMatrix_IsEqual(*args, **kwargs) @@ -5051,7 +5115,7 @@ class GraphicsMatrix(GraphicsObject): """ IsIdentity(self) -> bool - return true if this is the identity matrix + Returns ``True`` if this is the identity matrix """ return _gdi_.GraphicsMatrix_IsIdentity(*args, **kwargs) @@ -5059,7 +5123,7 @@ class GraphicsMatrix(GraphicsObject): """ Translate(self, Double dx, Double dy) - add the translation to this matrix + Add a translation to this matrix. """ return _gdi_.GraphicsMatrix_Translate(*args, **kwargs) @@ -5067,7 +5131,7 @@ class GraphicsMatrix(GraphicsObject): """ Scale(self, Double xScale, Double yScale) - add the scale to this matrix + Scales this matrix. """ return _gdi_.GraphicsMatrix_Scale(*args, **kwargs) @@ -5075,7 +5139,7 @@ class GraphicsMatrix(GraphicsObject): """ Rotate(self, Double angle) - add the rotation to this matrix (radians) + Rotates this matrix. The angle should be specified in radians. """ return _gdi_.GraphicsMatrix_Rotate(*args, **kwargs) @@ -5083,7 +5147,7 @@ class GraphicsMatrix(GraphicsObject): """ TransformPoint(self, x, y) --> (x, y) - applies that matrix to the point + Applies this matrix to a point, returns the resulting point values """ return _gdi_.GraphicsMatrix_TransformPoint(*args, **kwargs) @@ -5091,7 +5155,8 @@ class GraphicsMatrix(GraphicsObject): """ TransformDistance(self, dx, dy) --> (dx, dy) - applies the matrix except for translations + Applies this matrix to a distance (ie. performs all transforms except + translations) """ return _gdi_.GraphicsMatrix_TransformDistance(*args, **kwargs) @@ -5099,7 +5164,10 @@ class GraphicsMatrix(GraphicsObject): """ GetNativeMatrix(self) -> void - returns the native representation + Returns the native representation of the matrix. For CoreGraphics this + is a CFAffineMatrix pointer. For GDIPlus a Matrix Pointer and for + Cairo a cairo_matrix_t pointer. NOTE: For wxPython we still need a + way to make this value usable. """ return _gdi_.GraphicsMatrix_GetNativeMatrix(*args, **kwargs) @@ -5119,7 +5187,7 @@ class GraphicsPath(GraphicsObject): MoveToPoint(self, Double x, Double y) MoveToPoint(self, Point2D p) - Begins a new subpath at (x,y) + Begins a new subpath at the specified point. """ return _gdi_.GraphicsPath_MoveToPoint(*args) @@ -5128,7 +5196,7 @@ class GraphicsPath(GraphicsObject): AddLineToPoint(self, Double x, Double y) AddLineToPoint(self, Point2D p) - Adds a straight line from the current point to (x,y) + Adds a straight line from the current point to the specified point. """ return _gdi_.GraphicsPath_AddLineToPoint(*args) @@ -5147,7 +5215,7 @@ class GraphicsPath(GraphicsObject): """ AddPath(self, GraphicsPath path) - adds another path + Adds another path """ return _gdi_.GraphicsPath_AddPath(*args, **kwargs) @@ -5155,7 +5223,7 @@ class GraphicsPath(GraphicsObject): """ CloseSubpath(self) - closes the current sub-path + Closes the current sub-path. """ return _gdi_.GraphicsPath_CloseSubpath(*args, **kwargs) @@ -5192,7 +5260,7 @@ class GraphicsPath(GraphicsObject): """ AddRectangle(self, Double x, Double y, Double w, Double h) - Appends a rectangle as a new closed subpath + Appends a rectangle as a new closed subpath. """ return _gdi_.GraphicsPath_AddRectangle(*args, **kwargs) @@ -5200,7 +5268,7 @@ class GraphicsPath(GraphicsObject): """ AddCircle(self, Double x, Double y, Double r) - Appends a circle as a new closed subpath with the given radius. + Appends a circle around (x,y) with radius r as a new closed subpath. """ return _gdi_.GraphicsPath_AddCircle(*args, **kwargs) @@ -5208,7 +5276,7 @@ class GraphicsPath(GraphicsObject): """ AddArcToPoint(self, Double x1, Double y1, Double x2, Double y2, Double r) - Draws a an arc to two tangents connecting (current) to (x1,y1) and (x1,y1) + Appends an arc to two tangents connecting (current) to (x1,y1) and (x1,y1) to (x2,y2), also a straight line from (current) to (x1,y1) """ return _gdi_.GraphicsPath_AddArcToPoint(*args, **kwargs) @@ -5217,7 +5285,7 @@ class GraphicsPath(GraphicsObject): """ AddEllipse(self, Double x, Double y, Double w, Double h) - appends an ellipse + Appends an ellipse fitting into the passed in rectangle. """ return _gdi_.GraphicsPath_AddEllipse(*args, **kwargs) @@ -5225,7 +5293,7 @@ class GraphicsPath(GraphicsObject): """ AddRoundedRectangle(self, Double x, Double y, Double w, Double h, Double radius) - appends a rounded rectangle + Appends a rounded rectangle. """ return _gdi_.GraphicsPath_AddRoundedRectangle(*args, **kwargs) @@ -5233,7 +5301,9 @@ class GraphicsPath(GraphicsObject): """ GetNativePath(self) -> void - returns the native path + Returns the native path (CGPathRef for Core Graphics, Path pointer for + GDIPlus and a cairo_path_t pointer for cairo). NOTE: For wxPython we + still need a way to make this value usable. """ return _gdi_.GraphicsPath_GetNativePath(*args, **kwargs) @@ -5241,8 +5311,9 @@ class GraphicsPath(GraphicsObject): """ UnGetNativePath(self, void p) - give the native path returned by GetNativePath() back (there might be some - deallocations necessary) + Gives back the native path returned by GetNativePath() because there + might be some deallocations necessary (eg on cairo the native path + returned by GetNativePath is newly allocated each time). """ return _gdi_.GraphicsPath_UnGetNativePath(*args, **kwargs) @@ -5250,7 +5321,7 @@ class GraphicsPath(GraphicsObject): """ Transform(self, GraphicsMatrix matrix) - transforms each point of this path by the matrix + Transforms each point of this path by the matrix """ return _gdi_.GraphicsPath_Transform(*args, **kwargs) @@ -5258,7 +5329,7 @@ class GraphicsPath(GraphicsObject): """ GetBox(self) -> wxRect2DDouble - gets the bounding box enclosing all points (possibly including control points) + Gets the bounding box enclosing all points (possibly including control points) """ return _gdi_.GraphicsPath_GetBox(*args, **kwargs) @@ -5266,13 +5337,21 @@ class GraphicsPath(GraphicsObject): """ Contains(self, Double x, Double y, int fillStyle=ODDEVEN_RULE) -> bool Contains(self, wxPoint2DDouble c, int fillStyle=ODDEVEN_RULE) -> bool + + Returns ``True`` if the point is within the path. """ return _gdi_.GraphicsPath_Contains(*args) _gdi_.GraphicsPath_swigregister(GraphicsPath) class GraphicsContext(GraphicsObject): - """Proxy of C++ GraphicsContext class""" + """ + A `wx.GraphicsContext` instance is the object that is drawn upon. It is + created by a renderer using the CreateContext calls, this can be done + either directly using a renderer instance, or indirectly using the + static convenience CreateXXX functions of wx.GraphicsContext that + always delegate the task to the default renderer. + """ thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag') def __init__(self): raise AttributeError, "No constructor defined" __repr__ = _swig_repr @@ -5282,6 +5361,8 @@ class GraphicsContext(GraphicsObject): """ Create(WindowDC dc) -> GraphicsContext Create(Window window) -> GraphicsContext + + Creates a wx.GraphicsContext either from a window or a DC. """ val = _gdi_.GraphicsContext_Create(*args) val.__dc = args[0] # save a ref so the dc will not be deleted before self @@ -5289,12 +5370,22 @@ class GraphicsContext(GraphicsObject): Create = staticmethod(Create) def CreateFromNative(*args, **kwargs): - """CreateFromNative(void context) -> GraphicsContext""" + """ + CreateFromNative(void context) -> GraphicsContext + + Creates a wx.GraphicsContext from a native context. This native context + must be eg a CGContextRef for Core Graphics, a Graphics pointer for + GDIPlus or a cairo_t pointer for Cairo. + """ return _gdi_.GraphicsContext_CreateFromNative(*args, **kwargs) CreateFromNative = staticmethod(CreateFromNative) def CreateFromNativeWindow(*args, **kwargs): - """CreateFromNativeWindow(void window) -> GraphicsContext""" + """ + CreateFromNativeWindow(void window) -> GraphicsContext + + Creates a wx.GraphicsContext from a native window. + """ return _gdi_.GraphicsContext_CreateFromNativeWindow(*args, **kwargs) CreateFromNativeWindow = staticmethod(CreateFromNativeWindow) @@ -5302,16 +5393,24 @@ class GraphicsContext(GraphicsObject): """ CreatePath(self) -> GraphicsPath - creates a path instance that corresponds to the type of graphics context, ie GDIPlus, Cairo, CoreGraphics ... + Creates a native graphics path which is initially empty. """ return _gdi_.GraphicsContext_CreatePath(*args, **kwargs) def CreatePen(*args, **kwargs): - """CreatePen(self, Pen pen) -> GraphicsPen""" + """ + CreatePen(self, Pen pen) -> GraphicsPen + + Creates a native pen from a `wx.Pen`. + """ return _gdi_.GraphicsContext_CreatePen(*args, **kwargs) def CreateBrush(*args, **kwargs): - """CreateBrush(self, Brush brush) -> GraphicsBrush""" + """ + CreateBrush(self, Brush brush) -> GraphicsBrush + + Creates a native brush from a `wx.Brush`. + """ return _gdi_.GraphicsContext_CreateBrush(*args, **kwargs) def CreateLinearGradientBrush(*args, **kwargs): @@ -5319,8 +5418,8 @@ class GraphicsContext(GraphicsObject): CreateLinearGradientBrush(self, Double x1, Double y1, Double x2, Double y2, Colour c1, Colour c2) -> GraphicsBrush - sets the brush to a linear gradient, starting at (x1,y1) with color c1 - to (x2,y2) with color c2 + Creates a native brush, having a linear gradient, starting at (x1,y1) + with color c1 to (x2,y2) with color c2. """ return _gdi_.GraphicsContext_CreateLinearGradientBrush(*args, **kwargs) @@ -5329,10 +5428,9 @@ class GraphicsContext(GraphicsObject): CreateRadialGradientBrush(self, Double xo, Double yo, Double xc, Double yc, Double radius, Colour oColor, Colour cColor) -> GraphicsBrush - sets the brush to a radial gradient originating at (xo,yc) with color - oColor and ends on a circle around (xc,yc) with radius r and color - cColor - + Creates a native brush, having a radial gradient originating at + point (xo,yc) with color oColour and ends on a circle around (xc,yc) with + radius r and color cColour. """ return _gdi_.GraphicsContext_CreateRadialGradientBrush(*args, **kwargs) @@ -5340,7 +5438,7 @@ class GraphicsContext(GraphicsObject): """ CreateFont(self, Font font, Colour col=*wxBLACK) -> GraphicsFont - sets the font + Creates a native graphics font from a `wx.Font` and a text colour. """ return _gdi_.GraphicsContext_CreateFont(*args, **kwargs) @@ -5349,7 +5447,8 @@ class GraphicsContext(GraphicsObject): CreateMatrix(self, Double a=1.0, Double b=0.0, Double c=0.0, Double d=1.0, Double tx=0.0, Double ty=0.0) -> GraphicsMatrix - create a 'native' matrix corresponding to these values + Creates a native affine transformation matrix from the passed in + values. The defaults result in an identity matrix. """ return _gdi_.GraphicsContext_CreateMatrix(*args, **kwargs) @@ -5373,7 +5472,7 @@ class GraphicsContext(GraphicsObject): """ ClipRegion(self, Region region) - clips drawings to the region + Clips drawings to the region, combined to current clipping region. """ return _gdi_.GraphicsContext_ClipRegion(*args, **kwargs) @@ -5381,7 +5480,7 @@ class GraphicsContext(GraphicsObject): """ Clip(self, Double x, Double y, Double w, Double h) - clips drawings to the rect + Clips drawings to the rectangle. """ return _gdi_.GraphicsContext_Clip(*args, **kwargs) @@ -5389,7 +5488,7 @@ class GraphicsContext(GraphicsObject): """ ResetClip(self) - resets the clipping to original extent + Resets the clipping to original shape. """ return _gdi_.GraphicsContext_ResetClip(*args, **kwargs) @@ -5397,7 +5496,8 @@ class GraphicsContext(GraphicsObject): """ GetNativeContext(self) -> void - returns the native context + Returns the native context (CGContextRef for Core Graphics, Graphics + pointer for GDIPlus and cairo_t pointer for cairo). """ return _gdi_.GraphicsContext_GetNativeContext(*args, **kwargs) @@ -5405,7 +5505,7 @@ class GraphicsContext(GraphicsObject): """ Translate(self, Double dx, Double dy) - translate the current transformation matrix CTM of the context + Translates the current transformation matrix. """ return _gdi_.GraphicsContext_Translate(*args, **kwargs) @@ -5413,7 +5513,7 @@ class GraphicsContext(GraphicsObject): """ Scale(self, Double xScale, Double yScale) - scale the current transformation matrix CTM of the context + Scale the current transformation matrix of the context. """ return _gdi_.GraphicsContext_Scale(*args, **kwargs) @@ -5421,7 +5521,8 @@ class GraphicsContext(GraphicsObject): """ Rotate(self, Double angle) - rotate (radians) the current transformation matrix CTM of the context + Rotate the current transformation matrix of the context. ``angle`` is + specified in radians. """ return _gdi_.GraphicsContext_Rotate(*args, **kwargs) @@ -5429,7 +5530,8 @@ class GraphicsContext(GraphicsObject): """ ConcatTransform(self, GraphicsMatrix matrix) - concatenates this transform with the current transform of this context + Concatenates the passed in transform with the current transform of + this context. """ return _gdi_.GraphicsContext_ConcatTransform(*args, **kwargs) @@ -5437,7 +5539,7 @@ class GraphicsContext(GraphicsObject): """ SetTransform(self, GraphicsMatrix matrix) - sets the transform of this context + Sets the current transform of this context. """ return _gdi_.GraphicsContext_SetTransform(*args, **kwargs) @@ -5445,7 +5547,7 @@ class GraphicsContext(GraphicsObject): """ GetTransform(self) -> GraphicsMatrix - gets the matrix of this context + Gets the current transformation matrix of this context. """ return _gdi_.GraphicsContext_GetTransform(*args, **kwargs) @@ -5454,7 +5556,7 @@ class GraphicsContext(GraphicsObject): SetPen(self, GraphicsPen pen) SetPen(self, Pen pen) - sets the stroke pen + Sets the stroke pen """ return _gdi_.GraphicsContext_SetPen(*args) @@ -5463,7 +5565,7 @@ class GraphicsContext(GraphicsObject): SetBrush(self, GraphicsBrush brush) SetBrush(self, Brush brush) - sets the brush for filling + Sets the brush for filling """ return _gdi_.GraphicsContext_SetBrush(*args) @@ -5472,7 +5574,7 @@ class GraphicsContext(GraphicsObject): SetFont(self, GraphicsFont font) SetFont(self, Font font, Colour colour=*wxBLACK) - sets the font + Sets the font """ return _gdi_.GraphicsContext_SetFont(*args) @@ -5480,7 +5582,7 @@ class GraphicsContext(GraphicsObject): """ StrokePath(self, GraphicsPath path) - strokes along a path with the current pen + Strokes along a path with the current pen. """ return _gdi_.GraphicsContext_StrokePath(*args, **kwargs) @@ -5488,7 +5590,7 @@ class GraphicsContext(GraphicsObject): """ FillPath(self, GraphicsPath path, int fillStyle=ODDEVEN_RULE) - fills a path with the current brush + Fills a path with the current brush. """ return _gdi_.GraphicsContext_FillPath(*args, **kwargs) @@ -5496,43 +5598,80 @@ class GraphicsContext(GraphicsObject): """ DrawPath(self, GraphicsPath path, int fillStyle=ODDEVEN_RULE) - draws a path by first filling and then stroking + Draws the path by first filling and then stroking. """ return _gdi_.GraphicsContext_DrawPath(*args, **kwargs) def DrawText(*args, **kwargs): - """DrawText(self, String str, Double x, Double y)""" + """ + DrawText(self, String str, Double x, Double y) + + Draws a text at the defined position. + """ return _gdi_.GraphicsContext_DrawText(*args, **kwargs) def DrawRotatedText(*args, **kwargs): - """DrawRotatedText(self, String str, Double x, Double y, Double angle)""" + """ + DrawRotatedText(self, String str, Double x, Double y, Double angle) + + Draws a text at the defined position, at the given angle. + """ return _gdi_.GraphicsContext_DrawRotatedText(*args, **kwargs) def GetFullTextExtent(*args, **kwargs): - """GetFullTextExtent(self, text) --> (width, height, descent, externalLeading)""" + """ + GetFullTextExtent(self, text) --> (width, height, descent, externalLeading) + + Gets the dimensions of the string using the currently selected + font. ``text`` is the string to measure, ``w`` and ``h`` are the total + width and height respectively, ``descent`` is the dimension from the + baseline of the font to the bottom of the descender, and + ``externalLeading`` is any extra vertical space added to the font by + the font designer (usually is zero). + """ return _gdi_.GraphicsContext_GetFullTextExtent(*args, **kwargs) def GetTextExtent(*args, **kwargs): - """GetTextExtent(self, text) --> (width, height)""" + """ + GetTextExtent(self, text) --> (width, height) + + Gets the dimensions of the string using the currently selected + font. ``text`` is the string to measure, ``w`` and ``h`` are the total + width and height respectively. + """ return _gdi_.GraphicsContext_GetTextExtent(*args, **kwargs) def GetPartialTextExtents(*args, **kwargs): - """GetPartialTextExtents(self, text) -> [widths]""" + """ + GetPartialTextExtents(self, text) -> [widths] + + Returns a list of widths from the beginning of ``text`` to the + coresponding character in ``text``. + """ return _gdi_.GraphicsContext_GetPartialTextExtents(*args, **kwargs) def DrawBitmap(*args, **kwargs): - """DrawBitmap(self, Bitmap bmp, Double x, Double y, Double w, Double h)""" + """ + DrawBitmap(self, Bitmap bmp, Double x, Double y, Double w, Double h) + + Draws the bitmap. In case of a mono bitmap, this is treated as a mask + and the current brush is used for filling. + """ return _gdi_.GraphicsContext_DrawBitmap(*args, **kwargs) def DrawIcon(*args, **kwargs): - """DrawIcon(self, Icon icon, Double x, Double y, Double w, Double h)""" + """ + DrawIcon(self, Icon icon, Double x, Double y, Double w, Double h) + + Draws the icon. + """ return _gdi_.GraphicsContext_DrawIcon(*args, **kwargs) def StrokeLine(*args, **kwargs): """ StrokeLine(self, Double x1, Double y1, Double x2, Double y2) - strokes a single line + Strokes a single line. """ return _gdi_.GraphicsContext_StrokeLine(*args, **kwargs) @@ -5540,7 +5679,7 @@ class GraphicsContext(GraphicsObject): """ StrokeLines(self, List points) - stroke lines connecting each of the points + Stroke lines connecting each of the points """ return _gdi_.GraphicsContext_StrokeLines(*args, **kwargs) @@ -5548,7 +5687,7 @@ class GraphicsContext(GraphicsObject): """ StrokeLineSegements(self, PyObject beginPoints, PyObject endPoints) - stroke disconnected lines from begin to end points + Stroke disconnected lines from begin to end points """ return _gdi_.GraphicsContext_StrokeLineSegements(*args, **kwargs) @@ -5556,7 +5695,7 @@ class GraphicsContext(GraphicsObject): """ DrawLines(self, size_t points, int fillStyle=ODDEVEN_RULE) - draws a polygon + Draws a polygon. """ return _gdi_.GraphicsContext_DrawLines(*args, **kwargs) @@ -5564,7 +5703,7 @@ class GraphicsContext(GraphicsObject): """ DrawRectangle(self, Double x, Double y, Double w, Double h) - draws a rectangle + Draws a rectangle. """ return _gdi_.GraphicsContext_DrawRectangle(*args, **kwargs) @@ -5572,7 +5711,7 @@ class GraphicsContext(GraphicsObject): """ DrawEllipse(self, Double x, Double y, Double w, Double h) - draws an ellipse + Draws an ellipse. """ return _gdi_.GraphicsContext_DrawEllipse(*args, **kwargs) @@ -5580,7 +5719,7 @@ class GraphicsContext(GraphicsObject): """ DrawRoundedRectangle(self, Double x, Double y, Double w, Double h, Double radius) - draws a rounded rectangle + Draws a rounded rectangle """ return _gdi_.GraphicsContext_DrawRoundedRectangle(*args, **kwargs) @@ -5604,17 +5743,29 @@ def GraphicsContext_Create(*args): """ Create(WindowDC dc) -> GraphicsContext GraphicsContext_Create(Window window) -> GraphicsContext + + Creates a wx.GraphicsContext either from a window or a DC. """ val = _gdi_.GraphicsContext_Create(*args) val.__dc = args[0] # save a ref so the dc will not be deleted before self return val def GraphicsContext_CreateFromNative(*args, **kwargs): - """GraphicsContext_CreateFromNative(void context) -> GraphicsContext""" + """ + GraphicsContext_CreateFromNative(void context) -> GraphicsContext + + Creates a wx.GraphicsContext from a native context. This native context + must be eg a CGContextRef for Core Graphics, a Graphics pointer for + GDIPlus or a cairo_t pointer for Cairo. + """ return _gdi_.GraphicsContext_CreateFromNative(*args, **kwargs) def GraphicsContext_CreateFromNativeWindow(*args, **kwargs): - """GraphicsContext_CreateFromNativeWindow(void window) -> GraphicsContext""" + """ + GraphicsContext_CreateFromNativeWindow(void window) -> GraphicsContext + + Creates a wx.GraphicsContext from a native window. + """ return _gdi_.GraphicsContext_CreateFromNativeWindow(*args, **kwargs) class GraphicsRenderer(_core.Object): diff --git a/wxPython/src/gtk/_gdi_wrap.cpp b/wxPython/src/gtk/_gdi_wrap.cpp index bb97e78e9b..0dbca198ec 100644 --- a/wxPython/src/gtk/_gdi_wrap.cpp +++ b/wxPython/src/gtk/_gdi_wrap.cpp @@ -3901,9 +3901,6 @@ public: #endif -SWIGINTERN void wxGraphicsMatrix_Copy(wxGraphicsMatrix *self,wxGraphicsMatrix const &t){ - *self = t; - } SWIGINTERN PyObject *wxGraphicsContext_GetTextExtent(wxGraphicsContext *self,wxString const &text){ wxDouble width = 0.0, height = 0.0; @@ -23914,167 +23911,6 @@ SWIGINTERN PyObject *DCClipper_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject return SWIG_Python_InitShadowInstance(args); } -SWIGINTERN PyObject *_wrap_new_MemoryDC(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { - PyObject *resultobj = 0; - wxBitmap &arg1_defvalue = wxNullBitmap ; - wxBitmap *arg1 = (wxBitmap *) &arg1_defvalue ; - wxMemoryDC *result = 0 ; - void *argp1 = 0 ; - int res1 = 0 ; - PyObject * obj0 = 0 ; - char * kwnames[] = { - (char *) "bitmap", NULL - }; - - if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:new_MemoryDC",kwnames,&obj0)) SWIG_fail; - if (obj0) { - res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_wxBitmap, 0 ); - if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_MemoryDC" "', expected argument " "1"" of type '" "wxBitmap &""'"); - } - if (!argp1) { - SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_MemoryDC" "', expected argument " "1"" of type '" "wxBitmap &""'"); - } - arg1 = reinterpret_cast< wxBitmap * >(argp1); - } - { - if (!wxPyCheckForApp()) SWIG_fail; - PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxMemoryDC *)new wxMemoryDC(*arg1); - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxMemoryDC, SWIG_POINTER_NEW | 0 ); - return resultobj; -fail: - return NULL; -} - - -SWIGINTERN PyObject *_wrap_new_MemoryDCFromDC(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { - PyObject *resultobj = 0; - wxDC *arg1 = (wxDC *) 0 ; - wxMemoryDC *result = 0 ; - void *argp1 = 0 ; - int res1 = 0 ; - PyObject * obj0 = 0 ; - char * kwnames[] = { - (char *) "oldDC", NULL - }; - - if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:new_MemoryDCFromDC",kwnames,&obj0)) SWIG_fail; - res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxDC, 0 | 0 ); - if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_MemoryDCFromDC" "', expected argument " "1"" of type '" "wxDC *""'"); - } - arg1 = reinterpret_cast< wxDC * >(argp1); - { - if (!wxPyCheckForApp()) SWIG_fail; - PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxMemoryDC *)new wxMemoryDC(arg1); - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxMemoryDC, SWIG_POINTER_OWN | 0 ); - return resultobj; -fail: - return NULL; -} - - -SWIGINTERN PyObject *_wrap_MemoryDC_SelectObject(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { - PyObject *resultobj = 0; - wxMemoryDC *arg1 = (wxMemoryDC *) 0 ; - wxBitmap *arg2 = 0 ; - void *argp1 = 0 ; - int res1 = 0 ; - void *argp2 = 0 ; - int res2 = 0 ; - PyObject * obj0 = 0 ; - PyObject * obj1 = 0 ; - char * kwnames[] = { - (char *) "self",(char *) "bitmap", NULL - }; - - if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:MemoryDC_SelectObject",kwnames,&obj0,&obj1)) SWIG_fail; - res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxMemoryDC, 0 | 0 ); - if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "MemoryDC_SelectObject" "', expected argument " "1"" of type '" "wxMemoryDC *""'"); - } - arg1 = reinterpret_cast< wxMemoryDC * >(argp1); - res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_wxBitmap, 0 ); - if (!SWIG_IsOK(res2)) { - SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "MemoryDC_SelectObject" "', expected argument " "2"" of type '" "wxBitmap &""'"); - } - if (!argp2) { - SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "MemoryDC_SelectObject" "', expected argument " "2"" of type '" "wxBitmap &""'"); - } - arg2 = reinterpret_cast< wxBitmap * >(argp2); - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->SelectObject(*arg2); - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - resultobj = SWIG_Py_Void(); - return resultobj; -fail: - return NULL; -} - - -SWIGINTERN PyObject *_wrap_MemoryDC_SelectObjectAsSource(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { - PyObject *resultobj = 0; - wxMemoryDC *arg1 = (wxMemoryDC *) 0 ; - wxBitmap *arg2 = 0 ; - void *argp1 = 0 ; - int res1 = 0 ; - void *argp2 = 0 ; - int res2 = 0 ; - PyObject * obj0 = 0 ; - PyObject * obj1 = 0 ; - char * kwnames[] = { - (char *) "self",(char *) "bmp", NULL - }; - - if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:MemoryDC_SelectObjectAsSource",kwnames,&obj0,&obj1)) SWIG_fail; - res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxMemoryDC, 0 | 0 ); - if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "MemoryDC_SelectObjectAsSource" "', expected argument " "1"" of type '" "wxMemoryDC *""'"); - } - arg1 = reinterpret_cast< wxMemoryDC * >(argp1); - res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_wxBitmap, 0 | 0); - if (!SWIG_IsOK(res2)) { - SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "MemoryDC_SelectObjectAsSource" "', expected argument " "2"" of type '" "wxBitmap const &""'"); - } - if (!argp2) { - SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "MemoryDC_SelectObjectAsSource" "', expected argument " "2"" of type '" "wxBitmap const &""'"); - } - arg2 = reinterpret_cast< wxBitmap * >(argp2); - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->SelectObjectAsSource((wxBitmap const &)*arg2); - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - resultobj = SWIG_Py_Void(); - return resultobj; -fail: - return NULL; -} - - -SWIGINTERN PyObject *MemoryDC_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { - PyObject *obj; - if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL; - SWIG_TypeNewClientData(SWIGTYPE_p_wxMemoryDC, SWIG_NewClientData(obj)); - return SWIG_Py_Void(); -} - -SWIGINTERN PyObject *MemoryDC_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { - return SWIG_Python_InitShadowInstance(args); -} - SWIGINTERN PyObject *_wrap_new_ScreenDC(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; wxScreenDC *result = 0 ; @@ -24345,6 +24181,167 @@ SWIGINTERN PyObject *PaintDC_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject * return SWIG_Python_InitShadowInstance(args); } +SWIGINTERN PyObject *_wrap_new_MemoryDC(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { + PyObject *resultobj = 0; + wxBitmap &arg1_defvalue = wxNullBitmap ; + wxBitmap *arg1 = (wxBitmap *) &arg1_defvalue ; + wxMemoryDC *result = 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject * obj0 = 0 ; + char * kwnames[] = { + (char *) "bitmap", NULL + }; + + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:new_MemoryDC",kwnames,&obj0)) SWIG_fail; + if (obj0) { + res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_wxBitmap, 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_MemoryDC" "', expected argument " "1"" of type '" "wxBitmap &""'"); + } + if (!argp1) { + SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_MemoryDC" "', expected argument " "1"" of type '" "wxBitmap &""'"); + } + arg1 = reinterpret_cast< wxBitmap * >(argp1); + } + { + if (!wxPyCheckForApp()) SWIG_fail; + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (wxMemoryDC *)new wxMemoryDC(*arg1); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxMemoryDC, SWIG_POINTER_NEW | 0 ); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_new_MemoryDCFromDC(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { + PyObject *resultobj = 0; + wxDC *arg1 = (wxDC *) 0 ; + wxMemoryDC *result = 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject * obj0 = 0 ; + char * kwnames[] = { + (char *) "oldDC", NULL + }; + + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:new_MemoryDCFromDC",kwnames,&obj0)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxDC, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_MemoryDCFromDC" "', expected argument " "1"" of type '" "wxDC *""'"); + } + arg1 = reinterpret_cast< wxDC * >(argp1); + { + if (!wxPyCheckForApp()) SWIG_fail; + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (wxMemoryDC *)new wxMemoryDC(arg1); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxMemoryDC, SWIG_POINTER_OWN | 0 ); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_MemoryDC_SelectObject(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { + PyObject *resultobj = 0; + wxMemoryDC *arg1 = (wxMemoryDC *) 0 ; + wxBitmap *arg2 = 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + void *argp2 = 0 ; + int res2 = 0 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char * kwnames[] = { + (char *) "self",(char *) "bitmap", NULL + }; + + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:MemoryDC_SelectObject",kwnames,&obj0,&obj1)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxMemoryDC, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "MemoryDC_SelectObject" "', expected argument " "1"" of type '" "wxMemoryDC *""'"); + } + arg1 = reinterpret_cast< wxMemoryDC * >(argp1); + res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_wxBitmap, 0 ); + if (!SWIG_IsOK(res2)) { + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "MemoryDC_SelectObject" "', expected argument " "2"" of type '" "wxBitmap &""'"); + } + if (!argp2) { + SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "MemoryDC_SelectObject" "', expected argument " "2"" of type '" "wxBitmap &""'"); + } + arg2 = reinterpret_cast< wxBitmap * >(argp2); + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + (arg1)->SelectObject(*arg2); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_Py_Void(); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_MemoryDC_SelectObjectAsSource(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { + PyObject *resultobj = 0; + wxMemoryDC *arg1 = (wxMemoryDC *) 0 ; + wxBitmap *arg2 = 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + void *argp2 = 0 ; + int res2 = 0 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char * kwnames[] = { + (char *) "self",(char *) "bmp", NULL + }; + + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:MemoryDC_SelectObjectAsSource",kwnames,&obj0,&obj1)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxMemoryDC, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "MemoryDC_SelectObjectAsSource" "', expected argument " "1"" of type '" "wxMemoryDC *""'"); + } + arg1 = reinterpret_cast< wxMemoryDC * >(argp1); + res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_wxBitmap, 0 | 0); + if (!SWIG_IsOK(res2)) { + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "MemoryDC_SelectObjectAsSource" "', expected argument " "2"" of type '" "wxBitmap const &""'"); + } + if (!argp2) { + SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "MemoryDC_SelectObjectAsSource" "', expected argument " "2"" of type '" "wxBitmap const &""'"); + } + arg2 = reinterpret_cast< wxBitmap * >(argp2); + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + (arg1)->SelectObjectAsSource((wxBitmap const &)*arg2); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_Py_Void(); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *MemoryDC_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *obj; + if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL; + SWIG_TypeNewClientData(SWIGTYPE_p_wxMemoryDC, SWIG_NewClientData(obj)); + return SWIG_Py_Void(); +} + +SWIGINTERN PyObject *MemoryDC_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + return SWIG_Python_InitShadowInstance(args); +} + SWIGINTERN PyObject *_wrap_new_BufferedDC__SWIG_0(PyObject *SWIGUNUSEDPARM(self), int nobjs, PyObject **swig_obj) { PyObject *resultobj = 0; wxDC *arg1 = (wxDC *) 0 ; @@ -25511,45 +25508,6 @@ fail: } -SWIGINTERN PyObject *_wrap_GraphicsMatrix_Copy(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { - PyObject *resultobj = 0; - wxGraphicsMatrix *arg1 = (wxGraphicsMatrix *) 0 ; - wxGraphicsMatrix *arg2 = 0 ; - void *argp1 = 0 ; - int res1 = 0 ; - void *argp2 = 0 ; - int res2 = 0 ; - PyObject * obj0 = 0 ; - PyObject * obj1 = 0 ; - char * kwnames[] = { - (char *) "self",(char *) "t", NULL - }; - - if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:GraphicsMatrix_Copy",kwnames,&obj0,&obj1)) SWIG_fail; - res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxGraphicsMatrix, 0 | 0 ); - if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GraphicsMatrix_Copy" "', expected argument " "1"" of type '" "wxGraphicsMatrix *""'"); - } - arg1 = reinterpret_cast< wxGraphicsMatrix * >(argp1); - res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_wxGraphicsMatrix, 0 | 0); - if (!SWIG_IsOK(res2)) { - SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "GraphicsMatrix_Copy" "', expected argument " "2"" of type '" "wxGraphicsMatrix const &""'"); - } - if (!argp2) { - SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "GraphicsMatrix_Copy" "', expected argument " "2"" of type '" "wxGraphicsMatrix const &""'"); - } - arg2 = reinterpret_cast< wxGraphicsMatrix * >(argp2); - { - wxGraphicsMatrix_Copy(arg1,(wxGraphicsMatrix const &)*arg2); - if (PyErr_Occurred()) SWIG_fail; - } - resultobj = SWIG_Py_Void(); - return resultobj; -fail: - return NULL; -} - - SWIGINTERN PyObject *_wrap_GraphicsMatrix_Set(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxGraphicsMatrix *arg1 = (wxGraphicsMatrix *) 0 ; @@ -38696,12 +38654,6 @@ static PyMethodDef SwigMethods[] = { { (char *)"delete_DCClipper", (PyCFunction)_wrap_delete_DCClipper, METH_O, NULL}, { (char *)"DCClipper_swigregister", DCClipper_swigregister, METH_VARARGS, NULL}, { (char *)"DCClipper_swiginit", DCClipper_swiginit, METH_VARARGS, NULL}, - { (char *)"new_MemoryDC", (PyCFunction) _wrap_new_MemoryDC, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"new_MemoryDCFromDC", (PyCFunction) _wrap_new_MemoryDCFromDC, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"MemoryDC_SelectObject", (PyCFunction) _wrap_MemoryDC_SelectObject, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"MemoryDC_SelectObjectAsSource", (PyCFunction) _wrap_MemoryDC_SelectObjectAsSource, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"MemoryDC_swigregister", MemoryDC_swigregister, METH_VARARGS, NULL}, - { (char *)"MemoryDC_swiginit", MemoryDC_swiginit, METH_VARARGS, NULL}, { (char *)"new_ScreenDC", (PyCFunction)_wrap_new_ScreenDC, METH_NOARGS, NULL}, { (char *)"ScreenDC_StartDrawingOnTopWin", (PyCFunction) _wrap_ScreenDC_StartDrawingOnTopWin, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"ScreenDC_StartDrawingOnTop", (PyCFunction) _wrap_ScreenDC_StartDrawingOnTop, METH_VARARGS | METH_KEYWORDS, NULL}, @@ -38717,6 +38669,12 @@ static PyMethodDef SwigMethods[] = { { (char *)"new_PaintDC", (PyCFunction) _wrap_new_PaintDC, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"PaintDC_swigregister", PaintDC_swigregister, METH_VARARGS, NULL}, { (char *)"PaintDC_swiginit", PaintDC_swiginit, METH_VARARGS, NULL}, + { (char *)"new_MemoryDC", (PyCFunction) _wrap_new_MemoryDC, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"new_MemoryDCFromDC", (PyCFunction) _wrap_new_MemoryDCFromDC, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"MemoryDC_SelectObject", (PyCFunction) _wrap_MemoryDC_SelectObject, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"MemoryDC_SelectObjectAsSource", (PyCFunction) _wrap_MemoryDC_SelectObjectAsSource, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"MemoryDC_swigregister", MemoryDC_swigregister, METH_VARARGS, NULL}, + { (char *)"MemoryDC_swiginit", MemoryDC_swiginit, METH_VARARGS, NULL}, { (char *)"new_BufferedDC", _wrap_new_BufferedDC, METH_VARARGS, NULL}, { (char *)"delete_BufferedDC", (PyCFunction)_wrap_delete_BufferedDC, METH_O, NULL}, { (char *)"BufferedDC_UnMask", (PyCFunction)_wrap_BufferedDC_UnMask, METH_O, NULL}, @@ -38771,7 +38729,6 @@ static PyMethodDef SwigMethods[] = { { (char *)"new_GraphicsMatrix", (PyCFunction)_wrap_new_GraphicsMatrix, METH_NOARGS, NULL}, { (char *)"delete_GraphicsMatrix", (PyCFunction)_wrap_delete_GraphicsMatrix, METH_O, NULL}, { (char *)"GraphicsMatrix_Concat", (PyCFunction) _wrap_GraphicsMatrix_Concat, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"GraphicsMatrix_Copy", (PyCFunction) _wrap_GraphicsMatrix_Copy, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"GraphicsMatrix_Set", (PyCFunction) _wrap_GraphicsMatrix_Set, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"GraphicsMatrix_Invert", (PyCFunction)_wrap_GraphicsMatrix_Invert, METH_O, NULL}, { (char *)"GraphicsMatrix_IsEqual", (PyCFunction) _wrap_GraphicsMatrix_IsEqual, METH_VARARGS | METH_KEYWORDS, NULL}, @@ -39085,12 +39042,21 @@ static void *_p_wxBufferedDCTo_p_wxMemoryDC(void *x) { static void *_p_wxBufferedPaintDCTo_p_wxMemoryDC(void *x) { return (void *)((wxMemoryDC *) (wxBufferedDC *) ((wxBufferedPaintDC *) x)); } +static void *_p_wxBufferedDCTo_p_wxWindowDC(void *x) { + return (void *)((wxWindowDC *) (wxMemoryDC *) ((wxBufferedDC *) x)); +} +static void *_p_wxMemoryDCTo_p_wxWindowDC(void *x) { + return (void *)((wxWindowDC *) ((wxMemoryDC *) x)); +} static void *_p_wxClientDCTo_p_wxWindowDC(void *x) { return (void *)((wxWindowDC *) ((wxClientDC *) x)); } static void *_p_wxPaintDCTo_p_wxWindowDC(void *x) { return (void *)((wxWindowDC *) (wxClientDC *) ((wxPaintDC *) x)); } +static void *_p_wxBufferedPaintDCTo_p_wxWindowDC(void *x) { + return (void *)((wxWindowDC *) (wxMemoryDC *)(wxBufferedDC *) ((wxBufferedPaintDC *) x)); +} static void *_p_wxPyLocaleTo_p_wxLocale(void *x) { return (void *)((wxLocale *) ((wxPyLocale *) x)); } @@ -39143,17 +39109,17 @@ static void *_p_wxScreenDCTo_p_wxDC(void *x) { return (void *)((wxDC *) ((wxScreenDC *) x)); } static void *_p_wxBufferedDCTo_p_wxDC(void *x) { - return (void *)((wxDC *) (wxMemoryDC *) ((wxBufferedDC *) x)); + return (void *)((wxDC *) (wxWindowDC *)(wxMemoryDC *) ((wxBufferedDC *) x)); } static void *_p_wxMirrorDCTo_p_wxDC(void *x) { return (void *)((wxDC *) ((wxMirrorDC *) x)); } -static void *_p_wxMemoryDCTo_p_wxDC(void *x) { - return (void *)((wxDC *) ((wxMemoryDC *) x)); -} static void *_p_wxWindowDCTo_p_wxDC(void *x) { return (void *)((wxDC *) ((wxWindowDC *) x)); } +static void *_p_wxMemoryDCTo_p_wxDC(void *x) { + return (void *)((wxDC *) (wxWindowDC *) ((wxMemoryDC *) x)); +} static void *_p_wxMetaFileDCTo_p_wxDC(void *x) { return (void *)((wxDC *) ((wxMetaFileDC *) x)); } @@ -39164,7 +39130,7 @@ static void *_p_wxPaintDCTo_p_wxDC(void *x) { return (void *)((wxDC *) (wxWindowDC *)(wxClientDC *) ((wxPaintDC *) x)); } static void *_p_wxBufferedPaintDCTo_p_wxDC(void *x) { - return (void *)((wxDC *) (wxMemoryDC *)(wxBufferedDC *) ((wxBufferedPaintDC *) x)); + return (void *)((wxDC *) (wxWindowDC *)(wxMemoryDC *)(wxBufferedDC *) ((wxBufferedPaintDC *) x)); } static void *_p_wxAutoBufferedPaintDCTo_p_wxDC(void *x) { return (void *)((wxDC *) ((wxAutoBufferedPaintDC *) x)); @@ -39281,7 +39247,7 @@ static void *_p_wxFSFileTo_p_wxObject(void *x) { return (void *)((wxObject *) ((wxFSFile *) x)); } static void *_p_wxMemoryDCTo_p_wxObject(void *x) { - return (void *)((wxObject *) (wxDC *) ((wxMemoryDC *) x)); + return (void *)((wxObject *) (wxDC *)(wxWindowDC *) ((wxMemoryDC *) x)); } static void *_p_wxRegionTo_p_wxObject(void *x) { return (void *)((wxObject *) (wxGDIObject *) ((wxRegion *) x)); @@ -39401,7 +39367,7 @@ static void *_p_wxPaintDCTo_p_wxObject(void *x) { return (void *)((wxObject *) (wxDC *)(wxWindowDC *)(wxClientDC *) ((wxPaintDC *) x)); } static void *_p_wxBufferedPaintDCTo_p_wxObject(void *x) { - return (void *)((wxObject *) (wxDC *)(wxMemoryDC *)(wxBufferedDC *) ((wxBufferedPaintDC *) x)); + return (void *)((wxObject *) (wxDC *)(wxWindowDC *)(wxMemoryDC *)(wxBufferedDC *) ((wxBufferedPaintDC *) x)); } static void *_p_wxAutoBufferedPaintDCTo_p_wxObject(void *x) { return (void *)((wxObject *) (wxDC *) ((wxAutoBufferedPaintDC *) x)); @@ -39434,7 +39400,7 @@ static void *_p_wxPaletteTo_p_wxObject(void *x) { return (void *)((wxObject *) (wxGDIObject *) ((wxPalette *) x)); } static void *_p_wxBufferedDCTo_p_wxObject(void *x) { - return (void *)((wxObject *) (wxDC *)(wxMemoryDC *) ((wxBufferedDC *) x)); + return (void *)((wxObject *) (wxDC *)(wxWindowDC *)(wxMemoryDC *) ((wxBufferedDC *) x)); } static void *_p_wxImageListTo_p_wxObject(void *x) { return (void *)((wxObject *) ((wxImageList *) x)); @@ -40072,7 +40038,7 @@ static swig_cast_info _swigc__p_wxSplitterRenderParams[] = { {&_swigt__p_wxSpli static swig_cast_info _swigc__p_wxStockGDI[] = { {&_swigt__p_wxStockGDI, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxString[] = { {&_swigt__p_wxString, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxWindow[] = { {&_swigt__p_wxControl, _p_wxControlTo_p_wxWindow, 0, 0}, {&_swigt__p_wxWindow, 0, 0, 0}, {&_swigt__p_wxControlWithItems, _p_wxControlWithItemsTo_p_wxWindow, 0, 0}, {&_swigt__p_wxMenuBar, _p_wxMenuBarTo_p_wxWindow, 0, 0},{0, 0, 0, 0}}; -static swig_cast_info _swigc__p_wxWindowDC[] = { {&_swigt__p_wxWindowDC, 0, 0, 0}, {&_swigt__p_wxClientDC, _p_wxClientDCTo_p_wxWindowDC, 0, 0}, {&_swigt__p_wxPaintDC, _p_wxPaintDCTo_p_wxWindowDC, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_wxWindowDC[] = { {&_swigt__p_wxBufferedDC, _p_wxBufferedDCTo_p_wxWindowDC, 0, 0}, {&_swigt__p_wxWindowDC, 0, 0, 0}, {&_swigt__p_wxMemoryDC, _p_wxMemoryDCTo_p_wxWindowDC, 0, 0}, {&_swigt__p_wxBufferedPaintDC, _p_wxBufferedPaintDCTo_p_wxWindowDC, 0, 0}, {&_swigt__p_wxClientDC, _p_wxClientDCTo_p_wxWindowDC, 0, 0}, {&_swigt__p_wxPaintDC, _p_wxPaintDCTo_p_wxWindowDC, 0, 0},{0, 0, 0, 0}}; static swig_cast_info *swig_cast_initial[] = { _swigc__p_buffer, diff --git a/wxPython/src/gtk/_misc_wrap.cpp b/wxPython/src/gtk/_misc_wrap.cpp index c3d8584263..c2f77d3979 100644 --- a/wxPython/src/gtk/_misc_wrap.cpp +++ b/wxPython/src/gtk/_misc_wrap.cpp @@ -4016,6 +4016,7 @@ IMP_PYCALLBACK_BOOL_INTINT(wxPyFileDropTarget, wxFileDropTarget, OnDrop); SWIGINTERN bool wxClipboardLocker___nonzero__(wxClipboardLocker *self){ return !!(*self); } #include +#include SWIGINTERN bool wxVideoMode___eq__(wxVideoMode *self,wxVideoMode const *other){ return other ? (*self == *other) : false; } SWIGINTERN bool wxVideoMode___ne__(wxVideoMode *self,wxVideoMode const *other){ return other ? (*self != *other) : true; } diff --git a/wxPython/src/gtk/_windows.py b/wxPython/src/gtk/_windows.py index 95d2adb2a9..99300f4e70 100644 --- a/wxPython/src/gtk/_windows.py +++ b/wxPython/src/gtk/_windows.py @@ -3289,6 +3289,7 @@ class PyWindow(_core.Window): """_setCallbackInfo(self, PyObject self, PyObject _class)""" return _windows_.PyWindow__setCallbackInfo(*args, **kwargs) + SetBestSize = wx.Window.SetInitialSize def DoEraseBackground(*args, **kwargs): """DoEraseBackground(self, DC dc) -> bool""" return _windows_.PyWindow_DoEraseBackground(*args, **kwargs) @@ -3465,6 +3466,7 @@ class PyPanel(Panel): """_setCallbackInfo(self, PyObject self, PyObject _class)""" return _windows_.PyPanel__setCallbackInfo(*args, **kwargs) + SetBestSize = wx.Window.SetInitialSize def DoEraseBackground(*args, **kwargs): """DoEraseBackground(self, DC dc) -> bool""" return _windows_.PyPanel_DoEraseBackground(*args, **kwargs) @@ -3641,6 +3643,7 @@ class PyScrolledWindow(ScrolledWindow): """_setCallbackInfo(self, PyObject self, PyObject _class)""" return _windows_.PyScrolledWindow__setCallbackInfo(*args, **kwargs) + SetBestSize = wx.Window.SetInitialSize def DoEraseBackground(*args, **kwargs): """DoEraseBackground(self, DC dc) -> bool""" return _windows_.PyScrolledWindow_DoEraseBackground(*args, **kwargs) diff --git a/wxPython/src/gtk/aui.py b/wxPython/src/gtk/aui.py index 7e489cc7f6..cac179bde2 100644 --- a/wxPython/src/gtk/aui.py +++ b/wxPython/src/gtk/aui.py @@ -201,6 +201,7 @@ AUI_BUTTON_MAXIMIZE_RESTORE = _aui.AUI_BUTTON_MAXIMIZE_RESTORE AUI_BUTTON_MINIMIZE = _aui.AUI_BUTTON_MINIMIZE AUI_BUTTON_PIN = _aui.AUI_BUTTON_PIN AUI_BUTTON_OPTIONS = _aui.AUI_BUTTON_OPTIONS +AUI_BUTTON_WINDOWLIST = _aui.AUI_BUTTON_WINDOWLIST AUI_BUTTON_LEFT = _aui.AUI_BUTTON_LEFT AUI_BUTTON_RIGHT = _aui.AUI_BUTTON_RIGHT AUI_BUTTON_UP = _aui.AUI_BUTTON_UP @@ -991,7 +992,7 @@ AUI_NB_BOTTOM = _aui.AUI_NB_BOTTOM AUI_NB_TAB_SPLIT = _aui.AUI_NB_TAB_SPLIT AUI_NB_TAB_MOVE = _aui.AUI_NB_TAB_MOVE AUI_NB_SCROLL_BUTTONS = _aui.AUI_NB_SCROLL_BUTTONS -AUI_NB_PAGELIST_BUTTON = _aui.AUI_NB_PAGELIST_BUTTON +AUI_NB_WINDOWLIST_BUTTON = _aui.AUI_NB_WINDOWLIST_BUTTON AUI_NB_CLOSE_BUTTON = _aui.AUI_NB_CLOSE_BUTTON AUI_NB_CLOSE_ON_ACTIVE_TAB = _aui.AUI_NB_CLOSE_ON_ACTIVE_TAB AUI_NB_CLOSE_ON_ALL_TABS = _aui.AUI_NB_CLOSE_ON_ALL_TABS @@ -1016,27 +1017,32 @@ class AuiTabArt(object): return _aui.AuiTabArt_SetMeasuringFont(*args, **kwargs) def DrawBackground(*args, **kwargs): - """DrawBackground(self, DC dc, Rect rect)""" + """DrawBackground(self, DC dc, Window wnd, Rect rect)""" return _aui.AuiTabArt_DrawBackground(*args, **kwargs) def DrawTab(*args, **kwargs): """ - DrawTab(self, DC dc, Rect in_rect, String caption, bool active, int close_button_state, - Rect out_tab_rect, Rect out_button_rect, - int x_extent) + DrawTab(self, DC dc, Window wnd, Rect in_rect, String caption, bool active, + int close_button_state, Rect out_tab_rect, + Rect out_button_rect, int x_extent) """ return _aui.AuiTabArt_DrawTab(*args, **kwargs) def DrawButton(*args, **kwargs): """ - DrawButton(self, DC dc, Rect in_rect, int bitmap_id, int button_state, - int orientation, Bitmap bitmap_override, Rect out_rect) + DrawButton(self, DC dc, Window wnd, Rect in_rect, int bitmap_id, int button_state, + int orientation, Bitmap bitmap_override, + Rect out_rect) """ return _aui.AuiTabArt_DrawButton(*args, **kwargs) + def ShowWindowList(*args, **kwargs): + """ShowWindowList(self, Window wnd, wxArrayString items, int active_idx) -> int""" + return _aui.AuiTabArt_ShowWindowList(*args, **kwargs) + def GetTabSize(*args, **kwargs): """ - GetTabSize(self, DC dc, String caption, bool active, int close_button_state, + GetTabSize(self, DC dc, Window wnd, String caption, bool active, int close_button_state, int x_extent) -> Size """ return _aui.AuiTabArt_GetTabSize(*args, **kwargs) diff --git a/wxPython/src/gtk/aui_wrap.cpp b/wxPython/src/gtk/aui_wrap.cpp index ec224a2724..6c39705e76 100644 --- a/wxPython/src/gtk/aui_wrap.cpp +++ b/wxPython/src/gtk/aui_wrap.cpp @@ -2521,179 +2521,180 @@ SWIG_Python_MustGetPtr(PyObject *obj, swig_type_info *ty, int argnum, int flags) #define SWIGTYPE_p_wxANIHandler swig_types[55] #define SWIGTYPE_p_wxAcceleratorTable swig_types[56] #define SWIGTYPE_p_wxActivateEvent swig_types[57] -#define SWIGTYPE_p_wxAuiDefaultDockArt swig_types[58] -#define SWIGTYPE_p_wxAuiDefaultTabArt swig_types[59] -#define SWIGTYPE_p_wxAuiDockArt swig_types[60] -#define SWIGTYPE_p_wxAuiDockInfo swig_types[61] -#define SWIGTYPE_p_wxAuiDockUIPart swig_types[62] -#define SWIGTYPE_p_wxAuiFloatingFrame swig_types[63] -#define SWIGTYPE_p_wxAuiManager swig_types[64] -#define SWIGTYPE_p_wxAuiManagerEvent swig_types[65] -#define SWIGTYPE_p_wxAuiNotebook swig_types[66] -#define SWIGTYPE_p_wxAuiNotebookEvent swig_types[67] -#define SWIGTYPE_p_wxAuiNotebookPage swig_types[68] -#define SWIGTYPE_p_wxAuiNotebookPageArray swig_types[69] -#define SWIGTYPE_p_wxAuiPaneButton swig_types[70] -#define SWIGTYPE_p_wxAuiPaneButtonArray swig_types[71] -#define SWIGTYPE_p_wxAuiPaneInfo swig_types[72] -#define SWIGTYPE_p_wxAuiPaneInfoPtrArray swig_types[73] -#define SWIGTYPE_p_wxAuiTabArt swig_types[74] -#define SWIGTYPE_p_wxAuiTabContainer swig_types[75] -#define SWIGTYPE_p_wxAuiTabContainerButton swig_types[76] -#define SWIGTYPE_p_wxAuiTabCtrl swig_types[77] -#define SWIGTYPE_p_wxBMPHandler swig_types[78] -#define SWIGTYPE_p_wxBitmap swig_types[79] -#define SWIGTYPE_p_wxBoxSizer swig_types[80] -#define SWIGTYPE_p_wxCURHandler swig_types[81] -#define SWIGTYPE_p_wxCalculateLayoutEvent swig_types[82] -#define SWIGTYPE_p_wxChildFocusEvent swig_types[83] -#define SWIGTYPE_p_wxClipboardTextEvent swig_types[84] -#define SWIGTYPE_p_wxCloseEvent swig_types[85] -#define SWIGTYPE_p_wxColor swig_types[86] -#define SWIGTYPE_p_wxColour swig_types[87] -#define SWIGTYPE_p_wxColourData swig_types[88] -#define SWIGTYPE_p_wxColourDialog swig_types[89] -#define SWIGTYPE_p_wxCommandEvent swig_types[90] -#define SWIGTYPE_p_wxContextMenuEvent swig_types[91] -#define SWIGTYPE_p_wxControl swig_types[92] -#define SWIGTYPE_p_wxControlWithItems swig_types[93] -#define SWIGTYPE_p_wxDC swig_types[94] -#define SWIGTYPE_p_wxDateEvent swig_types[95] -#define SWIGTYPE_p_wxDialog swig_types[96] -#define SWIGTYPE_p_wxDirDialog swig_types[97] -#define SWIGTYPE_p_wxDisplayChangedEvent swig_types[98] -#define SWIGTYPE_p_wxDropFilesEvent swig_types[99] -#define SWIGTYPE_p_wxDuplexMode swig_types[100] -#define SWIGTYPE_p_wxEraseEvent swig_types[101] -#define SWIGTYPE_p_wxEvent swig_types[102] -#define SWIGTYPE_p_wxEvtHandler swig_types[103] -#define SWIGTYPE_p_wxFSFile swig_types[104] -#define SWIGTYPE_p_wxFileDialog swig_types[105] -#define SWIGTYPE_p_wxFileSystem swig_types[106] -#define SWIGTYPE_p_wxFindDialogEvent swig_types[107] -#define SWIGTYPE_p_wxFindReplaceData swig_types[108] -#define SWIGTYPE_p_wxFindReplaceDialog swig_types[109] -#define SWIGTYPE_p_wxFlexGridSizer swig_types[110] -#define SWIGTYPE_p_wxFocusEvent swig_types[111] -#define SWIGTYPE_p_wxFont swig_types[112] -#define SWIGTYPE_p_wxFontData swig_types[113] -#define SWIGTYPE_p_wxFontDialog swig_types[114] -#define SWIGTYPE_p_wxFrame swig_types[115] -#define SWIGTYPE_p_wxGBSizerItem swig_types[116] -#define SWIGTYPE_p_wxGIFHandler swig_types[117] -#define SWIGTYPE_p_wxGridBagSizer swig_types[118] -#define SWIGTYPE_p_wxGridSizer swig_types[119] -#define SWIGTYPE_p_wxICOHandler swig_types[120] -#define SWIGTYPE_p_wxIconizeEvent swig_types[121] -#define SWIGTYPE_p_wxIdleEvent swig_types[122] -#define SWIGTYPE_p_wxImage swig_types[123] -#define SWIGTYPE_p_wxImageHandler swig_types[124] -#define SWIGTYPE_p_wxIndividualLayoutConstraint swig_types[125] -#define SWIGTYPE_p_wxInitDialogEvent swig_types[126] -#define SWIGTYPE_p_wxJPEGHandler swig_types[127] -#define SWIGTYPE_p_wxKeyEvent swig_types[128] -#define SWIGTYPE_p_wxLayoutAlgorithm swig_types[129] -#define SWIGTYPE_p_wxLayoutConstraints swig_types[130] -#define SWIGTYPE_p_wxMDIChildFrame swig_types[131] -#define SWIGTYPE_p_wxMDIClientWindow swig_types[132] -#define SWIGTYPE_p_wxMDIParentFrame swig_types[133] -#define SWIGTYPE_p_wxMaximizeEvent swig_types[134] -#define SWIGTYPE_p_wxMenu swig_types[135] -#define SWIGTYPE_p_wxMenuBar swig_types[136] -#define SWIGTYPE_p_wxMenuEvent swig_types[137] -#define SWIGTYPE_p_wxMenuItem swig_types[138] -#define SWIGTYPE_p_wxMessageDialog swig_types[139] -#define SWIGTYPE_p_wxMiniFrame swig_types[140] -#define SWIGTYPE_p_wxMouseCaptureChangedEvent swig_types[141] -#define SWIGTYPE_p_wxMouseCaptureLostEvent swig_types[142] -#define SWIGTYPE_p_wxMouseEvent swig_types[143] -#define SWIGTYPE_p_wxMoveEvent swig_types[144] -#define SWIGTYPE_p_wxMultiChoiceDialog swig_types[145] -#define SWIGTYPE_p_wxNavigationKeyEvent swig_types[146] -#define SWIGTYPE_p_wxNcPaintEvent swig_types[147] -#define SWIGTYPE_p_wxNotifyEvent swig_types[148] -#define SWIGTYPE_p_wxNumberEntryDialog swig_types[149] -#define SWIGTYPE_p_wxObject swig_types[150] -#define SWIGTYPE_p_wxPCXHandler swig_types[151] -#define SWIGTYPE_p_wxPNGHandler swig_types[152] -#define SWIGTYPE_p_wxPNMHandler swig_types[153] -#define SWIGTYPE_p_wxPageSetupDialog swig_types[154] -#define SWIGTYPE_p_wxPageSetupDialogData swig_types[155] -#define SWIGTYPE_p_wxPaintEvent swig_types[156] -#define SWIGTYPE_p_wxPaletteChangedEvent swig_types[157] -#define SWIGTYPE_p_wxPanel swig_types[158] -#define SWIGTYPE_p_wxPaperSize swig_types[159] -#define SWIGTYPE_p_wxPasswordEntryDialog swig_types[160] -#define SWIGTYPE_p_wxPoint swig_types[161] -#define SWIGTYPE_p_wxPopupWindow swig_types[162] -#define SWIGTYPE_p_wxPreviewCanvas swig_types[163] -#define SWIGTYPE_p_wxPreviewControlBar swig_types[164] -#define SWIGTYPE_p_wxPreviewFrame swig_types[165] -#define SWIGTYPE_p_wxPrintData swig_types[166] -#define SWIGTYPE_p_wxPrintDialog swig_types[167] -#define SWIGTYPE_p_wxPrintDialogData swig_types[168] -#define SWIGTYPE_p_wxPrintPreview swig_types[169] -#define SWIGTYPE_p_wxPrinter swig_types[170] -#define SWIGTYPE_p_wxProgressDialog swig_types[171] -#define SWIGTYPE_p_wxPyApp swig_types[172] -#define SWIGTYPE_p_wxPyAuiDockArt swig_types[173] -#define SWIGTYPE_p_wxPyAuiTabArt swig_types[174] -#define SWIGTYPE_p_wxPyCommandEvent swig_types[175] -#define SWIGTYPE_p_wxPyEvent swig_types[176] -#define SWIGTYPE_p_wxPyHtmlListBox swig_types[177] -#define SWIGTYPE_p_wxPyImageHandler swig_types[178] -#define SWIGTYPE_p_wxPyPanel swig_types[179] -#define SWIGTYPE_p_wxPyPopupTransientWindow swig_types[180] -#define SWIGTYPE_p_wxPyPreviewControlBar swig_types[181] -#define SWIGTYPE_p_wxPyPreviewFrame swig_types[182] -#define SWIGTYPE_p_wxPyPrintPreview swig_types[183] -#define SWIGTYPE_p_wxPyPrintout swig_types[184] -#define SWIGTYPE_p_wxPyScrolledWindow swig_types[185] -#define SWIGTYPE_p_wxPySizer swig_types[186] -#define SWIGTYPE_p_wxPyTaskBarIcon swig_types[187] -#define SWIGTYPE_p_wxPyVListBox swig_types[188] -#define SWIGTYPE_p_wxPyVScrolledWindow swig_types[189] -#define SWIGTYPE_p_wxPyValidator swig_types[190] -#define SWIGTYPE_p_wxPyWindow swig_types[191] -#define SWIGTYPE_p_wxQueryLayoutInfoEvent swig_types[192] -#define SWIGTYPE_p_wxQueryNewPaletteEvent swig_types[193] -#define SWIGTYPE_p_wxRect swig_types[194] -#define SWIGTYPE_p_wxSashEvent swig_types[195] -#define SWIGTYPE_p_wxSashLayoutWindow swig_types[196] -#define SWIGTYPE_p_wxSashWindow swig_types[197] -#define SWIGTYPE_p_wxScrollEvent swig_types[198] -#define SWIGTYPE_p_wxScrollWinEvent swig_types[199] -#define SWIGTYPE_p_wxScrolledWindow swig_types[200] -#define SWIGTYPE_p_wxSetCursorEvent swig_types[201] -#define SWIGTYPE_p_wxShowEvent swig_types[202] -#define SWIGTYPE_p_wxSingleChoiceDialog swig_types[203] -#define SWIGTYPE_p_wxSize swig_types[204] -#define SWIGTYPE_p_wxSizeEvent swig_types[205] -#define SWIGTYPE_p_wxSizer swig_types[206] -#define SWIGTYPE_p_wxSizerItem swig_types[207] -#define SWIGTYPE_p_wxSplashScreen swig_types[208] -#define SWIGTYPE_p_wxSplashScreenWindow swig_types[209] -#define SWIGTYPE_p_wxSplitterEvent swig_types[210] -#define SWIGTYPE_p_wxSplitterWindow swig_types[211] -#define SWIGTYPE_p_wxStaticBoxSizer swig_types[212] -#define SWIGTYPE_p_wxStatusBar swig_types[213] -#define SWIGTYPE_p_wxStdDialogButtonSizer swig_types[214] -#define SWIGTYPE_p_wxString swig_types[215] -#define SWIGTYPE_p_wxSysColourChangedEvent swig_types[216] -#define SWIGTYPE_p_wxTGAHandler swig_types[217] -#define SWIGTYPE_p_wxTIFFHandler swig_types[218] -#define SWIGTYPE_p_wxTaskBarIconEvent swig_types[219] -#define SWIGTYPE_p_wxTextEntryDialog swig_types[220] -#define SWIGTYPE_p_wxTipWindow swig_types[221] -#define SWIGTYPE_p_wxTopLevelWindow swig_types[222] -#define SWIGTYPE_p_wxUpdateUIEvent swig_types[223] -#define SWIGTYPE_p_wxValidator swig_types[224] -#define SWIGTYPE_p_wxWindow swig_types[225] -#define SWIGTYPE_p_wxWindowCreateEvent swig_types[226] -#define SWIGTYPE_p_wxWindowDestroyEvent swig_types[227] -#define SWIGTYPE_p_wxXPMHandler swig_types[228] -static swig_type_info *swig_types[230]; -static swig_module_info swig_module = {swig_types, 229, 0, 0, 0, 0}; +#define SWIGTYPE_p_wxArrayString swig_types[58] +#define SWIGTYPE_p_wxAuiDefaultDockArt swig_types[59] +#define SWIGTYPE_p_wxAuiDefaultTabArt swig_types[60] +#define SWIGTYPE_p_wxAuiDockArt swig_types[61] +#define SWIGTYPE_p_wxAuiDockInfo swig_types[62] +#define SWIGTYPE_p_wxAuiDockUIPart swig_types[63] +#define SWIGTYPE_p_wxAuiFloatingFrame swig_types[64] +#define SWIGTYPE_p_wxAuiManager swig_types[65] +#define SWIGTYPE_p_wxAuiManagerEvent swig_types[66] +#define SWIGTYPE_p_wxAuiNotebook swig_types[67] +#define SWIGTYPE_p_wxAuiNotebookEvent swig_types[68] +#define SWIGTYPE_p_wxAuiNotebookPage swig_types[69] +#define SWIGTYPE_p_wxAuiNotebookPageArray swig_types[70] +#define SWIGTYPE_p_wxAuiPaneButton swig_types[71] +#define SWIGTYPE_p_wxAuiPaneButtonArray swig_types[72] +#define SWIGTYPE_p_wxAuiPaneInfo swig_types[73] +#define SWIGTYPE_p_wxAuiPaneInfoPtrArray swig_types[74] +#define SWIGTYPE_p_wxAuiTabArt swig_types[75] +#define SWIGTYPE_p_wxAuiTabContainer swig_types[76] +#define SWIGTYPE_p_wxAuiTabContainerButton swig_types[77] +#define SWIGTYPE_p_wxAuiTabCtrl swig_types[78] +#define SWIGTYPE_p_wxBMPHandler swig_types[79] +#define SWIGTYPE_p_wxBitmap swig_types[80] +#define SWIGTYPE_p_wxBoxSizer swig_types[81] +#define SWIGTYPE_p_wxCURHandler swig_types[82] +#define SWIGTYPE_p_wxCalculateLayoutEvent swig_types[83] +#define SWIGTYPE_p_wxChildFocusEvent swig_types[84] +#define SWIGTYPE_p_wxClipboardTextEvent swig_types[85] +#define SWIGTYPE_p_wxCloseEvent swig_types[86] +#define SWIGTYPE_p_wxColor swig_types[87] +#define SWIGTYPE_p_wxColour swig_types[88] +#define SWIGTYPE_p_wxColourData swig_types[89] +#define SWIGTYPE_p_wxColourDialog swig_types[90] +#define SWIGTYPE_p_wxCommandEvent swig_types[91] +#define SWIGTYPE_p_wxContextMenuEvent swig_types[92] +#define SWIGTYPE_p_wxControl swig_types[93] +#define SWIGTYPE_p_wxControlWithItems swig_types[94] +#define SWIGTYPE_p_wxDC swig_types[95] +#define SWIGTYPE_p_wxDateEvent swig_types[96] +#define SWIGTYPE_p_wxDialog swig_types[97] +#define SWIGTYPE_p_wxDirDialog swig_types[98] +#define SWIGTYPE_p_wxDisplayChangedEvent swig_types[99] +#define SWIGTYPE_p_wxDropFilesEvent swig_types[100] +#define SWIGTYPE_p_wxDuplexMode swig_types[101] +#define SWIGTYPE_p_wxEraseEvent swig_types[102] +#define SWIGTYPE_p_wxEvent swig_types[103] +#define SWIGTYPE_p_wxEvtHandler swig_types[104] +#define SWIGTYPE_p_wxFSFile swig_types[105] +#define SWIGTYPE_p_wxFileDialog swig_types[106] +#define SWIGTYPE_p_wxFileSystem swig_types[107] +#define SWIGTYPE_p_wxFindDialogEvent swig_types[108] +#define SWIGTYPE_p_wxFindReplaceData swig_types[109] +#define SWIGTYPE_p_wxFindReplaceDialog swig_types[110] +#define SWIGTYPE_p_wxFlexGridSizer swig_types[111] +#define SWIGTYPE_p_wxFocusEvent swig_types[112] +#define SWIGTYPE_p_wxFont swig_types[113] +#define SWIGTYPE_p_wxFontData swig_types[114] +#define SWIGTYPE_p_wxFontDialog swig_types[115] +#define SWIGTYPE_p_wxFrame swig_types[116] +#define SWIGTYPE_p_wxGBSizerItem swig_types[117] +#define SWIGTYPE_p_wxGIFHandler swig_types[118] +#define SWIGTYPE_p_wxGridBagSizer swig_types[119] +#define SWIGTYPE_p_wxGridSizer swig_types[120] +#define SWIGTYPE_p_wxICOHandler swig_types[121] +#define SWIGTYPE_p_wxIconizeEvent swig_types[122] +#define SWIGTYPE_p_wxIdleEvent swig_types[123] +#define SWIGTYPE_p_wxImage swig_types[124] +#define SWIGTYPE_p_wxImageHandler swig_types[125] +#define SWIGTYPE_p_wxIndividualLayoutConstraint swig_types[126] +#define SWIGTYPE_p_wxInitDialogEvent swig_types[127] +#define SWIGTYPE_p_wxJPEGHandler swig_types[128] +#define SWIGTYPE_p_wxKeyEvent swig_types[129] +#define SWIGTYPE_p_wxLayoutAlgorithm swig_types[130] +#define SWIGTYPE_p_wxLayoutConstraints swig_types[131] +#define SWIGTYPE_p_wxMDIChildFrame swig_types[132] +#define SWIGTYPE_p_wxMDIClientWindow swig_types[133] +#define SWIGTYPE_p_wxMDIParentFrame swig_types[134] +#define SWIGTYPE_p_wxMaximizeEvent swig_types[135] +#define SWIGTYPE_p_wxMenu swig_types[136] +#define SWIGTYPE_p_wxMenuBar swig_types[137] +#define SWIGTYPE_p_wxMenuEvent swig_types[138] +#define SWIGTYPE_p_wxMenuItem swig_types[139] +#define SWIGTYPE_p_wxMessageDialog swig_types[140] +#define SWIGTYPE_p_wxMiniFrame swig_types[141] +#define SWIGTYPE_p_wxMouseCaptureChangedEvent swig_types[142] +#define SWIGTYPE_p_wxMouseCaptureLostEvent swig_types[143] +#define SWIGTYPE_p_wxMouseEvent swig_types[144] +#define SWIGTYPE_p_wxMoveEvent swig_types[145] +#define SWIGTYPE_p_wxMultiChoiceDialog swig_types[146] +#define SWIGTYPE_p_wxNavigationKeyEvent swig_types[147] +#define SWIGTYPE_p_wxNcPaintEvent swig_types[148] +#define SWIGTYPE_p_wxNotifyEvent swig_types[149] +#define SWIGTYPE_p_wxNumberEntryDialog swig_types[150] +#define SWIGTYPE_p_wxObject swig_types[151] +#define SWIGTYPE_p_wxPCXHandler swig_types[152] +#define SWIGTYPE_p_wxPNGHandler swig_types[153] +#define SWIGTYPE_p_wxPNMHandler swig_types[154] +#define SWIGTYPE_p_wxPageSetupDialog swig_types[155] +#define SWIGTYPE_p_wxPageSetupDialogData swig_types[156] +#define SWIGTYPE_p_wxPaintEvent swig_types[157] +#define SWIGTYPE_p_wxPaletteChangedEvent swig_types[158] +#define SWIGTYPE_p_wxPanel swig_types[159] +#define SWIGTYPE_p_wxPaperSize swig_types[160] +#define SWIGTYPE_p_wxPasswordEntryDialog swig_types[161] +#define SWIGTYPE_p_wxPoint swig_types[162] +#define SWIGTYPE_p_wxPopupWindow swig_types[163] +#define SWIGTYPE_p_wxPreviewCanvas swig_types[164] +#define SWIGTYPE_p_wxPreviewControlBar swig_types[165] +#define SWIGTYPE_p_wxPreviewFrame swig_types[166] +#define SWIGTYPE_p_wxPrintData swig_types[167] +#define SWIGTYPE_p_wxPrintDialog swig_types[168] +#define SWIGTYPE_p_wxPrintDialogData swig_types[169] +#define SWIGTYPE_p_wxPrintPreview swig_types[170] +#define SWIGTYPE_p_wxPrinter swig_types[171] +#define SWIGTYPE_p_wxProgressDialog swig_types[172] +#define SWIGTYPE_p_wxPyApp swig_types[173] +#define SWIGTYPE_p_wxPyAuiDockArt swig_types[174] +#define SWIGTYPE_p_wxPyAuiTabArt swig_types[175] +#define SWIGTYPE_p_wxPyCommandEvent swig_types[176] +#define SWIGTYPE_p_wxPyEvent swig_types[177] +#define SWIGTYPE_p_wxPyHtmlListBox swig_types[178] +#define SWIGTYPE_p_wxPyImageHandler swig_types[179] +#define SWIGTYPE_p_wxPyPanel swig_types[180] +#define SWIGTYPE_p_wxPyPopupTransientWindow swig_types[181] +#define SWIGTYPE_p_wxPyPreviewControlBar swig_types[182] +#define SWIGTYPE_p_wxPyPreviewFrame swig_types[183] +#define SWIGTYPE_p_wxPyPrintPreview swig_types[184] +#define SWIGTYPE_p_wxPyPrintout swig_types[185] +#define SWIGTYPE_p_wxPyScrolledWindow swig_types[186] +#define SWIGTYPE_p_wxPySizer swig_types[187] +#define SWIGTYPE_p_wxPyTaskBarIcon swig_types[188] +#define SWIGTYPE_p_wxPyVListBox swig_types[189] +#define SWIGTYPE_p_wxPyVScrolledWindow swig_types[190] +#define SWIGTYPE_p_wxPyValidator swig_types[191] +#define SWIGTYPE_p_wxPyWindow swig_types[192] +#define SWIGTYPE_p_wxQueryLayoutInfoEvent swig_types[193] +#define SWIGTYPE_p_wxQueryNewPaletteEvent swig_types[194] +#define SWIGTYPE_p_wxRect swig_types[195] +#define SWIGTYPE_p_wxSashEvent swig_types[196] +#define SWIGTYPE_p_wxSashLayoutWindow swig_types[197] +#define SWIGTYPE_p_wxSashWindow swig_types[198] +#define SWIGTYPE_p_wxScrollEvent swig_types[199] +#define SWIGTYPE_p_wxScrollWinEvent swig_types[200] +#define SWIGTYPE_p_wxScrolledWindow swig_types[201] +#define SWIGTYPE_p_wxSetCursorEvent swig_types[202] +#define SWIGTYPE_p_wxShowEvent swig_types[203] +#define SWIGTYPE_p_wxSingleChoiceDialog swig_types[204] +#define SWIGTYPE_p_wxSize swig_types[205] +#define SWIGTYPE_p_wxSizeEvent swig_types[206] +#define SWIGTYPE_p_wxSizer swig_types[207] +#define SWIGTYPE_p_wxSizerItem swig_types[208] +#define SWIGTYPE_p_wxSplashScreen swig_types[209] +#define SWIGTYPE_p_wxSplashScreenWindow swig_types[210] +#define SWIGTYPE_p_wxSplitterEvent swig_types[211] +#define SWIGTYPE_p_wxSplitterWindow swig_types[212] +#define SWIGTYPE_p_wxStaticBoxSizer swig_types[213] +#define SWIGTYPE_p_wxStatusBar swig_types[214] +#define SWIGTYPE_p_wxStdDialogButtonSizer swig_types[215] +#define SWIGTYPE_p_wxString swig_types[216] +#define SWIGTYPE_p_wxSysColourChangedEvent swig_types[217] +#define SWIGTYPE_p_wxTGAHandler swig_types[218] +#define SWIGTYPE_p_wxTIFFHandler swig_types[219] +#define SWIGTYPE_p_wxTaskBarIconEvent swig_types[220] +#define SWIGTYPE_p_wxTextEntryDialog swig_types[221] +#define SWIGTYPE_p_wxTipWindow swig_types[222] +#define SWIGTYPE_p_wxTopLevelWindow swig_types[223] +#define SWIGTYPE_p_wxUpdateUIEvent swig_types[224] +#define SWIGTYPE_p_wxValidator swig_types[225] +#define SWIGTYPE_p_wxWindow swig_types[226] +#define SWIGTYPE_p_wxWindowCreateEvent swig_types[227] +#define SWIGTYPE_p_wxWindowDestroyEvent swig_types[228] +#define SWIGTYPE_p_wxXPMHandler swig_types[229] +static swig_type_info *swig_types[231]; +static swig_module_info swig_module = {swig_types, 230, 0, 0, 0, 0}; #define SWIG_TypeQuery(name) SWIG_TypeQueryModule(&swig_module, &swig_module, name) #define SWIG_MangledTypeQuery(name) SWIG_MangledTypeQueryModule(&swig_module, &swig_module, name) @@ -3079,23 +3080,27 @@ class wxPyAuiTabArt : public wxAuiDefaultTabArt virtual void DrawBackground( wxDC* dc, + wxWindow* wnd, const wxRect& rect ) { bool found; wxPyBlock_t blocked = wxPyBeginBlockThreads(); if ((found = wxPyCBH_findCallback(m_myInst, "DrawBackground"))) { PyObject* odc = wxPyMake_wxObject(dc, false); + PyObject* ownd = wxPyMake_wxObject(wnd, false); PyObject* orect = wxPyConstructObject((void*)&rect, wxT("wxRect"), 0); - wxPyCBH_callCallback(m_myInst, Py_BuildValue("(OO)", odc, orect)); + wxPyCBH_callCallback(m_myInst, Py_BuildValue("(OOO)", odc, ownd, orect)); Py_DECREF(odc); + Py_DECREF(ownd); Py_DECREF(orect); } wxPyEndBlockThreads(blocked); if (!found) - wxAuiDefaultTabArt::DrawBackground(dc, rect); + wxAuiDefaultTabArt::DrawBackground(dc, wnd, rect); } virtual void DrawTab( wxDC* dc, + wxWindow* wnd, const wxRect& in_rect, const wxString& caption, bool active, @@ -3109,12 +3114,13 @@ class wxPyAuiTabArt : public wxAuiDefaultTabArt wxPyBlock_t blocked = wxPyBeginBlockThreads(); if ((found = wxPyCBH_findCallback(m_myInst, "DrawTab"))) { PyObject* odc = wxPyMake_wxObject(dc, false); + PyObject* ownd = wxPyMake_wxObject(wnd, false); PyObject* orect = wxPyConstructObject((void*)&in_rect, wxT("wxRect"), 0); PyObject* otext = wx2PyString(caption); PyObject* ro; ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue( - "(OOOii)", - odc, orect, otext, + "(OOOOii)", + odc, ownd, orect, otext, (int)active, close_button_state)); if (ro) { if (PySequence_Check(ro) && PyObject_Length(ro) == 3) { @@ -3141,16 +3147,18 @@ class wxPyAuiTabArt : public wxAuiDefaultTabArt } Py_DECREF(odc); + Py_DECREF(ownd); Py_DECREF(orect); Py_DECREF(otext); } wxPyEndBlockThreads(blocked); if (!found) - wxAuiDefaultTabArt::DrawTab(dc, in_rect, caption, active, close_button_state, out_tab_rect, out_button_rect, x_extent); + wxAuiDefaultTabArt::DrawTab(dc, wnd, in_rect, caption, active, close_button_state, out_tab_rect, out_button_rect, x_extent); } virtual void DrawButton( wxDC* dc, + wxWindow* wnd, const wxRect& in_rect, int bitmap_id, int button_state, @@ -3163,10 +3171,11 @@ class wxPyAuiTabArt : public wxAuiDefaultTabArt wxPyBlock_t blocked = wxPyBeginBlockThreads(); if ((found = wxPyCBH_findCallback(m_myInst, "DrawButton"))) { PyObject* odc = wxPyMake_wxObject(dc, false); + PyObject* ownd = wxPyMake_wxObject(wnd, false); PyObject* orect = wxPyConstructObject((void*)&in_rect, wxT("wxRect"), 0); PyObject* obmp = wxPyConstructObject((void*)&bitmap_override, wxT("wxBitmap"), 0); PyObject* ro; - ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("(OOiiiO)", odc, orect, + ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("(OOOiiiO)", odc, ownd, orect, bitmap_id, button_state, orientation, obmp)); if (ro) { @@ -3176,16 +3185,24 @@ class wxPyAuiTabArt : public wxAuiDefaultTabArt } Py_DECREF(odc); + Py_DECREF(ownd); Py_DECREF(orect); Py_DECREF(obmp); } wxPyEndBlockThreads(blocked); if (!found) - wxAuiDefaultTabArt::DrawButton(dc, in_rect, bitmap_id, button_state, orientation, bitmap_override, out_rect); + wxAuiDefaultTabArt::DrawButton(dc, wnd, in_rect, bitmap_id, button_state, orientation, bitmap_override, out_rect); } + +// TODO +// virtual int ShowWindowList( +// wxWindow* wnd, +// const wxArrayString& items, +// int active_idx); virtual wxSize GetTabSize( wxDC* dc, + wxWindow* wnd, const wxString& caption, bool active, int close_button_state, @@ -3197,10 +3214,11 @@ class wxPyAuiTabArt : public wxAuiDefaultTabArt wxPyBlock_t blocked = wxPyBeginBlockThreads(); if ((found = wxPyCBH_findCallback(m_myInst, "GetTabSize"))) { PyObject* odc = wxPyMake_wxObject(dc, false); + PyObject* ownd = wxPyMake_wxObject(wnd, false); PyObject* otext = wx2PyString(caption); PyObject* ro; ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue( - "(OOi)", odc, otext, (int)active, close_button_state)); + "(OOOi)", odc, ownd, otext, (int)active, close_button_state)); if (ro) { if (PySequence_Check(ro) && PyObject_Length(ro) == 2) { PyObject* o1 = PySequence_GetItem(ro, 0); @@ -3222,15 +3240,18 @@ class wxPyAuiTabArt : public wxAuiDefaultTabArt } Py_DECREF(odc); + Py_DECREF(ownd); Py_DECREF(otext); } wxPyEndBlockThreads(blocked); if (!found) - rv = wxAuiDefaultTabArt::GetTabSize(dc, caption, active, close_button_state, x_extent); + rv = wxAuiDefaultTabArt::GetTabSize(dc, wnd, caption, active, close_button_state, x_extent); return rv; } - - + +// TODO +// virtual int GetBestTabCtrlSize(wxWindow* wnd); + DEC_PYCALLBACK__FONT(SetNormalFont); DEC_PYCALLBACK__FONT(SetSelectedFont); @@ -11510,20 +11531,24 @@ SWIGINTERN PyObject *_wrap_AuiTabArt_DrawBackground(PyObject *SWIGUNUSEDPARM(sel PyObject *resultobj = 0; wxAuiTabArt *arg1 = (wxAuiTabArt *) 0 ; wxDC *arg2 = (wxDC *) 0 ; - wxRect *arg3 = 0 ; + wxWindow *arg3 = (wxWindow *) 0 ; + wxRect *arg4 = 0 ; void *argp1 = 0 ; int res1 = 0 ; void *argp2 = 0 ; int res2 = 0 ; - wxRect temp3 ; + void *argp3 = 0 ; + int res3 = 0 ; + wxRect temp4 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char * kwnames[] = { - (char *) "self",(char *) "dc",(char *) "rect", NULL + (char *) "self",(char *) "dc",(char *) "wnd",(char *) "rect", NULL }; - if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:AuiTabArt_DrawBackground",kwnames,&obj0,&obj1,&obj2)) SWIG_fail; + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:AuiTabArt_DrawBackground",kwnames,&obj0,&obj1,&obj2,&obj3)) SWIG_fail; res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxAuiTabArt, 0 | 0 ); if (!SWIG_IsOK(res1)) { SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AuiTabArt_DrawBackground" "', expected argument " "1"" of type '" "wxAuiTabArt *""'"); @@ -11534,13 +11559,18 @@ SWIGINTERN PyObject *_wrap_AuiTabArt_DrawBackground(PyObject *SWIGUNUSEDPARM(sel SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "AuiTabArt_DrawBackground" "', expected argument " "2"" of type '" "wxDC *""'"); } arg2 = reinterpret_cast< wxDC * >(argp2); + res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_p_wxWindow, 0 | 0 ); + if (!SWIG_IsOK(res3)) { + SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "AuiTabArt_DrawBackground" "', expected argument " "3"" of type '" "wxWindow *""'"); + } + arg3 = reinterpret_cast< wxWindow * >(argp3); { - arg3 = &temp3; - if ( ! wxRect_helper(obj2, &arg3)) SWIG_fail; + arg4 = &temp4; + if ( ! wxRect_helper(obj3, &arg4)) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->DrawBackground(arg2,(wxRect const &)*arg3); + (arg1)->DrawBackground(arg2,arg3,(wxRect const &)*arg4); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } @@ -11555,29 +11585,32 @@ SWIGINTERN PyObject *_wrap_AuiTabArt_DrawTab(PyObject *SWIGUNUSEDPARM(self), PyO PyObject *resultobj = 0; wxAuiTabArt *arg1 = (wxAuiTabArt *) 0 ; wxDC *arg2 = (wxDC *) 0 ; - wxRect *arg3 = 0 ; - wxString *arg4 = 0 ; - bool arg5 ; - int arg6 ; - wxRect *arg7 = (wxRect *) 0 ; + wxWindow *arg3 = (wxWindow *) 0 ; + wxRect *arg4 = 0 ; + wxString *arg5 = 0 ; + bool arg6 ; + int arg7 ; wxRect *arg8 = (wxRect *) 0 ; - int *arg9 = (int *) 0 ; + wxRect *arg9 = (wxRect *) 0 ; + int *arg10 = (int *) 0 ; void *argp1 = 0 ; int res1 = 0 ; void *argp2 = 0 ; int res2 = 0 ; - wxRect temp3 ; - bool temp4 = false ; - bool val5 ; - int ecode5 = 0 ; - int val6 ; + void *argp3 = 0 ; + int res3 = 0 ; + wxRect temp4 ; + bool temp5 = false ; + bool val6 ; int ecode6 = 0 ; - void *argp7 = 0 ; - int res7 = 0 ; + int val7 ; + int ecode7 = 0 ; void *argp8 = 0 ; int res8 = 0 ; void *argp9 = 0 ; int res9 = 0 ; + void *argp10 = 0 ; + int res10 = 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; @@ -11587,11 +11620,12 @@ SWIGINTERN PyObject *_wrap_AuiTabArt_DrawTab(PyObject *SWIGUNUSEDPARM(self), PyO PyObject * obj6 = 0 ; PyObject * obj7 = 0 ; PyObject * obj8 = 0 ; + PyObject * obj9 = 0 ; char * kwnames[] = { - (char *) "self",(char *) "dc",(char *) "in_rect",(char *) "caption",(char *) "active",(char *) "close_button_state",(char *) "out_tab_rect",(char *) "out_button_rect",(char *) "x_extent", NULL + (char *) "self",(char *) "dc",(char *) "wnd",(char *) "in_rect",(char *) "caption",(char *) "active",(char *) "close_button_state",(char *) "out_tab_rect",(char *) "out_button_rect",(char *) "x_extent", NULL }; - if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOOOOO:AuiTabArt_DrawTab",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8)) SWIG_fail; + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOOOOOO:AuiTabArt_DrawTab",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9)) SWIG_fail; res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxAuiTabArt, 0 | 0 ); if (!SWIG_IsOK(res1)) { SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AuiTabArt_DrawTab" "', expected argument " "1"" of type '" "wxAuiTabArt *""'"); @@ -11602,56 +11636,61 @@ SWIGINTERN PyObject *_wrap_AuiTabArt_DrawTab(PyObject *SWIGUNUSEDPARM(self), PyO SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "AuiTabArt_DrawTab" "', expected argument " "2"" of type '" "wxDC *""'"); } arg2 = reinterpret_cast< wxDC * >(argp2); + res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_p_wxWindow, 0 | 0 ); + if (!SWIG_IsOK(res3)) { + SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "AuiTabArt_DrawTab" "', expected argument " "3"" of type '" "wxWindow *""'"); + } + arg3 = reinterpret_cast< wxWindow * >(argp3); { - arg3 = &temp3; - if ( ! wxRect_helper(obj2, &arg3)) SWIG_fail; + arg4 = &temp4; + if ( ! wxRect_helper(obj3, &arg4)) SWIG_fail; } { - arg4 = wxString_in_helper(obj3); - if (arg4 == NULL) SWIG_fail; - temp4 = true; + arg5 = wxString_in_helper(obj4); + if (arg5 == NULL) SWIG_fail; + temp5 = true; } - ecode5 = SWIG_AsVal_bool(obj4, &val5); - if (!SWIG_IsOK(ecode5)) { - SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "AuiTabArt_DrawTab" "', expected argument " "5"" of type '" "bool""'"); - } - arg5 = static_cast< bool >(val5); - ecode6 = SWIG_AsVal_int(obj5, &val6); + ecode6 = SWIG_AsVal_bool(obj5, &val6); if (!SWIG_IsOK(ecode6)) { - SWIG_exception_fail(SWIG_ArgError(ecode6), "in method '" "AuiTabArt_DrawTab" "', expected argument " "6"" of type '" "int""'"); + SWIG_exception_fail(SWIG_ArgError(ecode6), "in method '" "AuiTabArt_DrawTab" "', expected argument " "6"" of type '" "bool""'"); } - arg6 = static_cast< int >(val6); - res7 = SWIG_ConvertPtr(obj6, &argp7,SWIGTYPE_p_wxRect, 0 | 0 ); - if (!SWIG_IsOK(res7)) { - SWIG_exception_fail(SWIG_ArgError(res7), "in method '" "AuiTabArt_DrawTab" "', expected argument " "7"" of type '" "wxRect *""'"); - } - arg7 = reinterpret_cast< wxRect * >(argp7); + arg6 = static_cast< bool >(val6); + ecode7 = SWIG_AsVal_int(obj6, &val7); + if (!SWIG_IsOK(ecode7)) { + SWIG_exception_fail(SWIG_ArgError(ecode7), "in method '" "AuiTabArt_DrawTab" "', expected argument " "7"" of type '" "int""'"); + } + arg7 = static_cast< int >(val7); res8 = SWIG_ConvertPtr(obj7, &argp8,SWIGTYPE_p_wxRect, 0 | 0 ); if (!SWIG_IsOK(res8)) { SWIG_exception_fail(SWIG_ArgError(res8), "in method '" "AuiTabArt_DrawTab" "', expected argument " "8"" of type '" "wxRect *""'"); } arg8 = reinterpret_cast< wxRect * >(argp8); - res9 = SWIG_ConvertPtr(obj8, &argp9,SWIGTYPE_p_int, 0 | 0 ); + res9 = SWIG_ConvertPtr(obj8, &argp9,SWIGTYPE_p_wxRect, 0 | 0 ); if (!SWIG_IsOK(res9)) { - SWIG_exception_fail(SWIG_ArgError(res9), "in method '" "AuiTabArt_DrawTab" "', expected argument " "9"" of type '" "int *""'"); + SWIG_exception_fail(SWIG_ArgError(res9), "in method '" "AuiTabArt_DrawTab" "', expected argument " "9"" of type '" "wxRect *""'"); } - arg9 = reinterpret_cast< int * >(argp9); + arg9 = reinterpret_cast< wxRect * >(argp9); + res10 = SWIG_ConvertPtr(obj9, &argp10,SWIGTYPE_p_int, 0 | 0 ); + if (!SWIG_IsOK(res10)) { + SWIG_exception_fail(SWIG_ArgError(res10), "in method '" "AuiTabArt_DrawTab" "', expected argument " "10"" of type '" "int *""'"); + } + arg10 = reinterpret_cast< int * >(argp10); { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->DrawTab(arg2,(wxRect const &)*arg3,(wxString const &)*arg4,arg5,arg6,arg7,arg8,arg9); + (arg1)->DrawTab(arg2,arg3,(wxRect const &)*arg4,(wxString const &)*arg5,arg6,arg7,arg8,arg9,arg10); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } resultobj = SWIG_Py_Void(); { - if (temp4) - delete arg4; + if (temp5) + delete arg5; } return resultobj; fail: { - if (temp4) - delete arg4; + if (temp5) + delete arg5; } return NULL; } @@ -11661,27 +11700,30 @@ SWIGINTERN PyObject *_wrap_AuiTabArt_DrawButton(PyObject *SWIGUNUSEDPARM(self), PyObject *resultobj = 0; wxAuiTabArt *arg1 = (wxAuiTabArt *) 0 ; wxDC *arg2 = (wxDC *) 0 ; - wxRect *arg3 = 0 ; - int arg4 ; + wxWindow *arg3 = (wxWindow *) 0 ; + wxRect *arg4 = 0 ; int arg5 ; int arg6 ; - wxBitmap *arg7 = 0 ; - wxRect *arg8 = (wxRect *) 0 ; + int arg7 ; + wxBitmap *arg8 = 0 ; + wxRect *arg9 = (wxRect *) 0 ; void *argp1 = 0 ; int res1 = 0 ; void *argp2 = 0 ; int res2 = 0 ; - wxRect temp3 ; - int val4 ; - int ecode4 = 0 ; + void *argp3 = 0 ; + int res3 = 0 ; + wxRect temp4 ; int val5 ; int ecode5 = 0 ; int val6 ; int ecode6 = 0 ; - void *argp7 = 0 ; - int res7 = 0 ; + int val7 ; + int ecode7 = 0 ; void *argp8 = 0 ; int res8 = 0 ; + void *argp9 = 0 ; + int res9 = 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; @@ -11690,11 +11732,12 @@ SWIGINTERN PyObject *_wrap_AuiTabArt_DrawButton(PyObject *SWIGUNUSEDPARM(self), PyObject * obj5 = 0 ; PyObject * obj6 = 0 ; PyObject * obj7 = 0 ; + PyObject * obj8 = 0 ; char * kwnames[] = { - (char *) "self",(char *) "dc",(char *) "in_rect",(char *) "bitmap_id",(char *) "button_state",(char *) "orientation",(char *) "bitmap_override",(char *) "out_rect", NULL + (char *) "self",(char *) "dc",(char *) "wnd",(char *) "in_rect",(char *) "bitmap_id",(char *) "button_state",(char *) "orientation",(char *) "bitmap_override",(char *) "out_rect", NULL }; - if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOOOO:AuiTabArt_DrawButton",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) SWIG_fail; + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOOOOO:AuiTabArt_DrawButton",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8)) SWIG_fail; res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxAuiTabArt, 0 | 0 ); if (!SWIG_IsOK(res1)) { SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AuiTabArt_DrawButton" "', expected argument " "1"" of type '" "wxAuiTabArt *""'"); @@ -11705,15 +11748,15 @@ SWIGINTERN PyObject *_wrap_AuiTabArt_DrawButton(PyObject *SWIGUNUSEDPARM(self), SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "AuiTabArt_DrawButton" "', expected argument " "2"" of type '" "wxDC *""'"); } arg2 = reinterpret_cast< wxDC * >(argp2); + res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_p_wxWindow, 0 | 0 ); + if (!SWIG_IsOK(res3)) { + SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "AuiTabArt_DrawButton" "', expected argument " "3"" of type '" "wxWindow *""'"); + } + arg3 = reinterpret_cast< wxWindow * >(argp3); { - arg3 = &temp3; - if ( ! wxRect_helper(obj2, &arg3)) SWIG_fail; + arg4 = &temp4; + if ( ! wxRect_helper(obj3, &arg4)) SWIG_fail; } - ecode4 = SWIG_AsVal_int(obj3, &val4); - if (!SWIG_IsOK(ecode4)) { - SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "AuiTabArt_DrawButton" "', expected argument " "4"" of type '" "int""'"); - } - arg4 = static_cast< int >(val4); ecode5 = SWIG_AsVal_int(obj4, &val5); if (!SWIG_IsOK(ecode5)) { SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "AuiTabArt_DrawButton" "', expected argument " "5"" of type '" "int""'"); @@ -11724,22 +11767,27 @@ SWIGINTERN PyObject *_wrap_AuiTabArt_DrawButton(PyObject *SWIGUNUSEDPARM(self), SWIG_exception_fail(SWIG_ArgError(ecode6), "in method '" "AuiTabArt_DrawButton" "', expected argument " "6"" of type '" "int""'"); } arg6 = static_cast< int >(val6); - res7 = SWIG_ConvertPtr(obj6, &argp7, SWIGTYPE_p_wxBitmap, 0 | 0); - if (!SWIG_IsOK(res7)) { - SWIG_exception_fail(SWIG_ArgError(res7), "in method '" "AuiTabArt_DrawButton" "', expected argument " "7"" of type '" "wxBitmap const &""'"); + ecode7 = SWIG_AsVal_int(obj6, &val7); + if (!SWIG_IsOK(ecode7)) { + SWIG_exception_fail(SWIG_ArgError(ecode7), "in method '" "AuiTabArt_DrawButton" "', expected argument " "7"" of type '" "int""'"); + } + arg7 = static_cast< int >(val7); + res8 = SWIG_ConvertPtr(obj7, &argp8, SWIGTYPE_p_wxBitmap, 0 | 0); + if (!SWIG_IsOK(res8)) { + SWIG_exception_fail(SWIG_ArgError(res8), "in method '" "AuiTabArt_DrawButton" "', expected argument " "8"" of type '" "wxBitmap const &""'"); } - if (!argp7) { - SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "AuiTabArt_DrawButton" "', expected argument " "7"" of type '" "wxBitmap const &""'"); + if (!argp8) { + SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "AuiTabArt_DrawButton" "', expected argument " "8"" of type '" "wxBitmap const &""'"); } - arg7 = reinterpret_cast< wxBitmap * >(argp7); - res8 = SWIG_ConvertPtr(obj7, &argp8,SWIGTYPE_p_wxRect, 0 | 0 ); - if (!SWIG_IsOK(res8)) { - SWIG_exception_fail(SWIG_ArgError(res8), "in method '" "AuiTabArt_DrawButton" "', expected argument " "8"" of type '" "wxRect *""'"); + arg8 = reinterpret_cast< wxBitmap * >(argp8); + res9 = SWIG_ConvertPtr(obj8, &argp9,SWIGTYPE_p_wxRect, 0 | 0 ); + if (!SWIG_IsOK(res9)) { + SWIG_exception_fail(SWIG_ArgError(res9), "in method '" "AuiTabArt_DrawButton" "', expected argument " "9"" of type '" "wxRect *""'"); } - arg8 = reinterpret_cast< wxRect * >(argp8); + arg9 = reinterpret_cast< wxRect * >(argp9); { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->DrawButton(arg2,(wxRect const &)*arg3,arg4,arg5,arg6,(wxBitmap const &)*arg7,arg8); + (arg1)->DrawButton(arg2,arg3,(wxRect const &)*arg4,arg5,arg6,arg7,(wxBitmap const &)*arg8,arg9); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } @@ -11750,37 +11798,115 @@ fail: } +SWIGINTERN PyObject *_wrap_AuiTabArt_ShowWindowList(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { + PyObject *resultobj = 0; + wxAuiTabArt *arg1 = (wxAuiTabArt *) 0 ; + wxWindow *arg2 = (wxWindow *) 0 ; + wxArrayString *arg3 = 0 ; + int arg4 ; + int result; + void *argp1 = 0 ; + int res1 = 0 ; + void *argp2 = 0 ; + int res2 = 0 ; + bool temp3 = false ; + int val4 ; + int ecode4 = 0 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + char * kwnames[] = { + (char *) "self",(char *) "wnd",(char *) "items",(char *) "active_idx", NULL + }; + + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:AuiTabArt_ShowWindowList",kwnames,&obj0,&obj1,&obj2,&obj3)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxAuiTabArt, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AuiTabArt_ShowWindowList" "', expected argument " "1"" of type '" "wxAuiTabArt *""'"); + } + arg1 = reinterpret_cast< wxAuiTabArt * >(argp1); + res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_wxWindow, 0 | 0 ); + if (!SWIG_IsOK(res2)) { + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "AuiTabArt_ShowWindowList" "', expected argument " "2"" of type '" "wxWindow *""'"); + } + arg2 = reinterpret_cast< wxWindow * >(argp2); + { + if (! PySequence_Check(obj2)) { + PyErr_SetString(PyExc_TypeError, "Sequence of strings expected."); + SWIG_fail; + } + arg3 = new wxArrayString; + temp3 = true; + int i, len=PySequence_Length(obj2); + for (i=0; iAdd(*s); + delete s; + Py_DECREF(item); + } + } + ecode4 = SWIG_AsVal_int(obj3, &val4); + if (!SWIG_IsOK(ecode4)) { + SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "AuiTabArt_ShowWindowList" "', expected argument " "4"" of type '" "int""'"); + } + arg4 = static_cast< int >(val4); + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (int)(arg1)->ShowWindowList(arg2,(wxArrayString const &)*arg3,arg4); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_From_int(static_cast< int >(result)); + { + if (temp3) delete arg3; + } + return resultobj; +fail: + { + if (temp3) delete arg3; + } + return NULL; +} + + SWIGINTERN PyObject *_wrap_AuiTabArt_GetTabSize(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxAuiTabArt *arg1 = (wxAuiTabArt *) 0 ; wxDC *arg2 = (wxDC *) 0 ; - wxString *arg3 = 0 ; - bool arg4 ; - int arg5 ; - int *arg6 = (int *) 0 ; + wxWindow *arg3 = (wxWindow *) 0 ; + wxString *arg4 = 0 ; + bool arg5 ; + int arg6 ; + int *arg7 = (int *) 0 ; wxSize result; void *argp1 = 0 ; int res1 = 0 ; void *argp2 = 0 ; int res2 = 0 ; - bool temp3 = false ; - bool val4 ; - int ecode4 = 0 ; - int val5 ; + void *argp3 = 0 ; + int res3 = 0 ; + bool temp4 = false ; + bool val5 ; int ecode5 = 0 ; - void *argp6 = 0 ; - int res6 = 0 ; + int val6 ; + int ecode6 = 0 ; + void *argp7 = 0 ; + int res7 = 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; PyObject * obj4 = 0 ; PyObject * obj5 = 0 ; + PyObject * obj6 = 0 ; char * kwnames[] = { - (char *) "self",(char *) "dc",(char *) "caption",(char *) "active",(char *) "close_button_state",(char *) "x_extent", NULL + (char *) "self",(char *) "dc",(char *) "wnd",(char *) "caption",(char *) "active",(char *) "close_button_state",(char *) "x_extent", NULL }; - if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO:AuiTabArt_GetTabSize",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail; + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOOO:AuiTabArt_GetTabSize",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) SWIG_fail; res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxAuiTabArt, 0 | 0 ); if (!SWIG_IsOK(res1)) { SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AuiTabArt_GetTabSize" "', expected argument " "1"" of type '" "wxAuiTabArt *""'"); @@ -11791,42 +11917,47 @@ SWIGINTERN PyObject *_wrap_AuiTabArt_GetTabSize(PyObject *SWIGUNUSEDPARM(self), SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "AuiTabArt_GetTabSize" "', expected argument " "2"" of type '" "wxDC *""'"); } arg2 = reinterpret_cast< wxDC * >(argp2); + res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_p_wxWindow, 0 | 0 ); + if (!SWIG_IsOK(res3)) { + SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "AuiTabArt_GetTabSize" "', expected argument " "3"" of type '" "wxWindow *""'"); + } + arg3 = reinterpret_cast< wxWindow * >(argp3); { - arg3 = wxString_in_helper(obj2); - if (arg3 == NULL) SWIG_fail; - temp3 = true; + arg4 = wxString_in_helper(obj3); + if (arg4 == NULL) SWIG_fail; + temp4 = true; } - ecode4 = SWIG_AsVal_bool(obj3, &val4); - if (!SWIG_IsOK(ecode4)) { - SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "AuiTabArt_GetTabSize" "', expected argument " "4"" of type '" "bool""'"); - } - arg4 = static_cast< bool >(val4); - ecode5 = SWIG_AsVal_int(obj4, &val5); + ecode5 = SWIG_AsVal_bool(obj4, &val5); if (!SWIG_IsOK(ecode5)) { - SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "AuiTabArt_GetTabSize" "', expected argument " "5"" of type '" "int""'"); + SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "AuiTabArt_GetTabSize" "', expected argument " "5"" of type '" "bool""'"); } - arg5 = static_cast< int >(val5); - res6 = SWIG_ConvertPtr(obj5, &argp6,SWIGTYPE_p_int, 0 | 0 ); - if (!SWIG_IsOK(res6)) { - SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "AuiTabArt_GetTabSize" "', expected argument " "6"" of type '" "int *""'"); + arg5 = static_cast< bool >(val5); + ecode6 = SWIG_AsVal_int(obj5, &val6); + if (!SWIG_IsOK(ecode6)) { + SWIG_exception_fail(SWIG_ArgError(ecode6), "in method '" "AuiTabArt_GetTabSize" "', expected argument " "6"" of type '" "int""'"); + } + arg6 = static_cast< int >(val6); + res7 = SWIG_ConvertPtr(obj6, &argp7,SWIGTYPE_p_int, 0 | 0 ); + if (!SWIG_IsOK(res7)) { + SWIG_exception_fail(SWIG_ArgError(res7), "in method '" "AuiTabArt_GetTabSize" "', expected argument " "7"" of type '" "int *""'"); } - arg6 = reinterpret_cast< int * >(argp6); + arg7 = reinterpret_cast< int * >(argp7); { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (arg1)->GetTabSize(arg2,(wxString const &)*arg3,arg4,arg5,arg6); + result = (arg1)->GetTabSize(arg2,arg3,(wxString const &)*arg4,arg5,arg6,arg7); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } resultobj = SWIG_NewPointerObj((new wxSize(static_cast< const wxSize& >(result))), SWIGTYPE_p_wxSize, SWIG_POINTER_OWN | 0 ); { - if (temp3) - delete arg3; + if (temp4) + delete arg4; } return resultobj; fail: { - if (temp3) - delete arg3; + if (temp4) + delete arg4; } return NULL; } @@ -15161,6 +15292,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"AuiTabArt_DrawBackground", (PyCFunction) _wrap_AuiTabArt_DrawBackground, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"AuiTabArt_DrawTab", (PyCFunction) _wrap_AuiTabArt_DrawTab, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"AuiTabArt_DrawButton", (PyCFunction) _wrap_AuiTabArt_DrawButton, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"AuiTabArt_ShowWindowList", (PyCFunction) _wrap_AuiTabArt_ShowWindowList, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"AuiTabArt_GetTabSize", (PyCFunction) _wrap_AuiTabArt_GetTabSize, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"AuiTabArt_GetBestTabCtrlSize", (PyCFunction) _wrap_AuiTabArt_GetBestTabCtrlSize, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"AuiTabArt_swigregister", AuiTabArt_swigregister, METH_VARARGS, NULL}, @@ -16530,6 +16662,7 @@ static swig_type_info _swigt__p_p_wxMDIParentFrame = {"_p_p_wxMDIParentFrame", 0 static swig_type_info _swigt__p_unsigned_char = {"_p_unsigned_char", "unsigned char *|byte *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_unsigned_int = {"_p_unsigned_int", "unsigned int *|time_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_unsigned_long = {"_p_unsigned_long", "unsigned long *|wxUIntPtr *", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_wxArrayString = {"_p_wxArrayString", "wxArrayString *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_wxAuiDefaultDockArt = {"_p_wxAuiDefaultDockArt", "wxAuiDefaultDockArt *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_wxAuiDefaultTabArt = {"_p_wxAuiDefaultTabArt", "wxAuiDefaultTabArt *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_wxAuiDockArt = {"_p_wxAuiDockArt", "wxAuiDockArt *", 0, 0, (void*)0, 0}; @@ -16764,6 +16897,7 @@ static swig_type_info *swig_type_initial[] = { &_swigt__p_wxANIHandler, &_swigt__p_wxAcceleratorTable, &_swigt__p_wxActivateEvent, + &_swigt__p_wxArrayString, &_swigt__p_wxAuiDefaultDockArt, &_swigt__p_wxAuiDefaultTabArt, &_swigt__p_wxAuiDockArt, @@ -16992,6 +17126,7 @@ static swig_cast_info _swigc__p_p_wxWindow[] = { {&_swigt__p_p_wxSplashScreen, static swig_cast_info _swigc__p_unsigned_char[] = { {&_swigt__p_unsigned_char, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_unsigned_int[] = { {&_swigt__p_unsigned_int, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_unsigned_long[] = { {&_swigt__p_unsigned_long, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_wxArrayString[] = { {&_swigt__p_wxArrayString, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxAuiDefaultDockArt[] = { {&_swigt__p_wxAuiDefaultDockArt, 0, 0, 0}, {&_swigt__p_wxPyAuiDockArt, _p_wxPyAuiDockArtTo_p_wxAuiDefaultDockArt, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxAuiDefaultTabArt[] = { {&_swigt__p_wxAuiDefaultTabArt, 0, 0, 0}, {&_swigt__p_wxPyAuiTabArt, _p_wxPyAuiTabArtTo_p_wxAuiDefaultTabArt, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxAuiDockArt[] = { {&_swigt__p_wxAuiDockArt, 0, 0, 0}, {&_swigt__p_wxAuiDefaultDockArt, _p_wxAuiDefaultDockArtTo_p_wxAuiDockArt, 0, 0}, {&_swigt__p_wxPyAuiDockArt, _p_wxPyAuiDockArtTo_p_wxAuiDockArt, 0, 0},{0, 0, 0, 0}}; @@ -17226,6 +17361,7 @@ static swig_cast_info *swig_cast_initial[] = { _swigc__p_wxANIHandler, _swigc__p_wxAcceleratorTable, _swigc__p_wxActivateEvent, + _swigc__p_wxArrayString, _swigc__p_wxAuiDefaultDockArt, _swigc__p_wxAuiDefaultTabArt, _swigc__p_wxAuiDockArt, @@ -17947,6 +18083,7 @@ SWIGEXPORT void SWIG_init(void) { SWIG_Python_SetConstant(d, "AUI_BUTTON_MINIMIZE",SWIG_From_int(static_cast< int >(wxAUI_BUTTON_MINIMIZE))); SWIG_Python_SetConstant(d, "AUI_BUTTON_PIN",SWIG_From_int(static_cast< int >(wxAUI_BUTTON_PIN))); SWIG_Python_SetConstant(d, "AUI_BUTTON_OPTIONS",SWIG_From_int(static_cast< int >(wxAUI_BUTTON_OPTIONS))); + SWIG_Python_SetConstant(d, "AUI_BUTTON_WINDOWLIST",SWIG_From_int(static_cast< int >(wxAUI_BUTTON_WINDOWLIST))); SWIG_Python_SetConstant(d, "AUI_BUTTON_LEFT",SWIG_From_int(static_cast< int >(wxAUI_BUTTON_LEFT))); SWIG_Python_SetConstant(d, "AUI_BUTTON_RIGHT",SWIG_From_int(static_cast< int >(wxAUI_BUTTON_RIGHT))); SWIG_Python_SetConstant(d, "AUI_BUTTON_UP",SWIG_From_int(static_cast< int >(wxAUI_BUTTON_UP))); @@ -18007,7 +18144,7 @@ SWIGEXPORT void SWIG_init(void) { SWIG_Python_SetConstant(d, "AUI_NB_TAB_SPLIT",SWIG_From_int(static_cast< int >(wxAUI_NB_TAB_SPLIT))); SWIG_Python_SetConstant(d, "AUI_NB_TAB_MOVE",SWIG_From_int(static_cast< int >(wxAUI_NB_TAB_MOVE))); SWIG_Python_SetConstant(d, "AUI_NB_SCROLL_BUTTONS",SWIG_From_int(static_cast< int >(wxAUI_NB_SCROLL_BUTTONS))); - SWIG_Python_SetConstant(d, "AUI_NB_PAGELIST_BUTTON",SWIG_From_int(static_cast< int >(wxAUI_NB_PAGELIST_BUTTON))); + SWIG_Python_SetConstant(d, "AUI_NB_WINDOWLIST_BUTTON",SWIG_From_int(static_cast< int >(wxAUI_NB_WINDOWLIST_BUTTON))); SWIG_Python_SetConstant(d, "AUI_NB_CLOSE_BUTTON",SWIG_From_int(static_cast< int >(wxAUI_NB_CLOSE_BUTTON))); SWIG_Python_SetConstant(d, "AUI_NB_CLOSE_ON_ACTIVE_TAB",SWIG_From_int(static_cast< int >(wxAUI_NB_CLOSE_ON_ACTIVE_TAB))); SWIG_Python_SetConstant(d, "AUI_NB_CLOSE_ON_ALL_TABS",SWIG_From_int(static_cast< int >(wxAUI_NB_CLOSE_ON_ALL_TABS))); diff --git a/wxPython/src/mac/_controls.py b/wxPython/src/mac/_controls.py index a126f13bfd..c84271335a 100644 --- a/wxPython/src/mac/_controls.py +++ b/wxPython/src/mac/_controls.py @@ -5739,6 +5739,7 @@ class PyControl(_core.Control): """_setCallbackInfo(self, PyObject self, PyObject _class)""" return _controls_.PyControl__setCallbackInfo(*args, **kwargs) + SetBestSize = wx.Window.SetInitialSize def DoEraseBackground(*args, **kwargs): """DoEraseBackground(self, DC dc) -> bool""" return _controls_.PyControl_DoEraseBackground(*args, **kwargs) diff --git a/wxPython/src/mac/_gdi.py b/wxPython/src/mac/_gdi.py index ce9847fafa..7e10d2e6b2 100644 --- a/wxPython/src/mac/_gdi.py +++ b/wxPython/src/mac/_gdi.py @@ -4486,69 +4486,6 @@ _gdi_.DCClipper_swigregister(DCClipper) #--------------------------------------------------------------------------- -class MemoryDC(DC): - """ - A memory device context provides a means to draw graphics onto a - bitmap. A bitmap must be selected into the new memory DC before it may - be used for anything. Typical usage is as follows:: - - dc = wx.MemoryDC() - dc.SelectObject(bitmap) - # draw on the dc using any of the Draw methods - dc.SelectObject(wx.NullBitmap) - # the bitmap now contains wahtever was drawn upon it - - Note that the memory DC *must* be deleted (or the bitmap selected out - of it) before a bitmap can be reselected into another memory DC. - - """ - thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag') - __repr__ = _swig_repr - def __init__(self, *args, **kwargs): - """ - __init__(self, Bitmap bitmap=NullBitmap) -> MemoryDC - - Constructs a new memory device context. - - Use the Ok member to test whether the constructor was successful in - creating a usable device context. If a bitmap is not given to this - constructor then don't forget to select a bitmap into the DC before - drawing on it. - """ - _gdi_.MemoryDC_swiginit(self,_gdi_.new_MemoryDC(*args, **kwargs)) - def SelectObject(*args, **kwargs): - """ - SelectObject(self, Bitmap bitmap) - - Selects the bitmap into the device context, to use as the memory - bitmap. Selecting the bitmap into a memory DC allows you to draw into - the DC, and therefore the bitmap, and also to use Blit to copy the - bitmap to a window. - - If the argument is wx.NullBitmap (or some other uninitialised - `wx.Bitmap`) the current bitmap is selected out of the device context, - and the original bitmap restored, allowing the current bitmap to be - destroyed safely. - """ - return _gdi_.MemoryDC_SelectObject(*args, **kwargs) - - def SelectObjectAsSource(*args, **kwargs): - """SelectObjectAsSource(self, Bitmap bmp)""" - return _gdi_.MemoryDC_SelectObjectAsSource(*args, **kwargs) - -_gdi_.MemoryDC_swigregister(MemoryDC) - -def MemoryDCFromDC(*args, **kwargs): - """ - MemoryDCFromDC(DC oldDC) -> MemoryDC - - Creates a DC that is compatible with the oldDC. - """ - val = _gdi_.new_MemoryDCFromDC(*args, **kwargs) - return val - -#--------------------------------------------------------------------------- - class ScreenDC(DC): """ A wxScreenDC can be used to paint anywhere on the screen. This should @@ -4690,6 +4627,69 @@ _gdi_.PaintDC_swigregister(PaintDC) #--------------------------------------------------------------------------- +class MemoryDC(WindowDC): + """ + A memory device context provides a means to draw graphics onto a + bitmap. A bitmap must be selected into the new memory DC before it may + be used for anything. Typical usage is as follows:: + + dc = wx.MemoryDC() + dc.SelectObject(bitmap) + # draw on the dc using any of the Draw methods + dc.SelectObject(wx.NullBitmap) + # the bitmap now contains wahtever was drawn upon it + + Note that the memory DC *must* be deleted (or the bitmap selected out + of it) before a bitmap can be reselected into another memory DC. + + """ + thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag') + __repr__ = _swig_repr + def __init__(self, *args, **kwargs): + """ + __init__(self, Bitmap bitmap=NullBitmap) -> MemoryDC + + Constructs a new memory device context. + + Use the Ok member to test whether the constructor was successful in + creating a usable device context. If a bitmap is not given to this + constructor then don't forget to select a bitmap into the DC before + drawing on it. + """ + _gdi_.MemoryDC_swiginit(self,_gdi_.new_MemoryDC(*args, **kwargs)) + def SelectObject(*args, **kwargs): + """ + SelectObject(self, Bitmap bitmap) + + Selects the bitmap into the device context, to use as the memory + bitmap. Selecting the bitmap into a memory DC allows you to draw into + the DC, and therefore the bitmap, and also to use Blit to copy the + bitmap to a window. + + If the argument is wx.NullBitmap (or some other uninitialised + `wx.Bitmap`) the current bitmap is selected out of the device context, + and the original bitmap restored, allowing the current bitmap to be + destroyed safely. + """ + return _gdi_.MemoryDC_SelectObject(*args, **kwargs) + + def SelectObjectAsSource(*args, **kwargs): + """SelectObjectAsSource(self, Bitmap bmp)""" + return _gdi_.MemoryDC_SelectObjectAsSource(*args, **kwargs) + +_gdi_.MemoryDC_swigregister(MemoryDC) + +def MemoryDCFromDC(*args, **kwargs): + """ + MemoryDCFromDC(DC oldDC) -> MemoryDC + + Creates a DC that is compatible with the oldDC. + """ + val = _gdi_.new_MemoryDCFromDC(*args, **kwargs) + return val + +#--------------------------------------------------------------------------- + BUFFER_VIRTUAL_AREA = _gdi_.BUFFER_VIRTUAL_AREA BUFFER_CLIENT_AREA = _gdi_.BUFFER_CLIENT_AREA class BufferedDC(MemoryDC): @@ -4973,63 +4973,134 @@ _gdi_.PrinterDC_swigregister(PrinterDC) #--------------------------------------------------------------------------- class GraphicsObject(_core.Object): - """Proxy of C++ GraphicsObject class""" + """ + This class is the superclass of native graphics objects like pens + etc. It provides the internal reference counting. It is not to be + instantiated by user code. + """ thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag') __repr__ = _swig_repr def __init__(self, *args, **kwargs): - """__init__(self, GraphicsRenderer renderer=None) -> GraphicsObject""" + """ + __init__(self, GraphicsRenderer renderer=None) -> GraphicsObject + + This class is the superclass of native graphics objects like pens + etc. It provides the internal reference counting. It is not to be + instantiated by user code. + """ _gdi_.GraphicsObject_swiginit(self,_gdi_.new_GraphicsObject(*args, **kwargs)) __swig_destroy__ = _gdi_.delete_GraphicsObject __del__ = lambda self : None; def IsNull(*args, **kwargs): - """IsNull(self) -> bool""" + """ + IsNull(self) -> bool + + Is this object valid (false) or still empty (true)? + """ return _gdi_.GraphicsObject_IsNull(*args, **kwargs) def GetRenderer(*args, **kwargs): - """GetRenderer(self) -> GraphicsRenderer""" + """ + GetRenderer(self) -> GraphicsRenderer + + Returns the renderer that was used to create this instance, or + ``None`` if it has not been initialized yet. + """ return _gdi_.GraphicsObject_GetRenderer(*args, **kwargs) _gdi_.GraphicsObject_swigregister(GraphicsObject) class GraphicsPen(GraphicsObject): - """Proxy of C++ GraphicsPen class""" + """ + A wx.GraphicsPen is a native representation of a pen. It is used for + stroking a path on a `wx.GraphicsContext`. The contents are specific and + private to the respective renderer. The only way to get a valid instance + is via a CreatePen call on the graphics context or the renderer + instance. + """ thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag') __repr__ = _swig_repr def __init__(self, *args, **kwargs): - """__init__(self) -> GraphicsPen""" + """ + __init__(self) -> GraphicsPen + + A wx.GraphicsPen is a native representation of a pen. It is used for + stroking a path on a `wx.GraphicsContext`. The contents are specific and + private to the respective renderer. The only way to get a valid instance + is via a CreatePen call on the graphics context or the renderer + instance. + """ _gdi_.GraphicsPen_swiginit(self,_gdi_.new_GraphicsPen(*args, **kwargs)) __swig_destroy__ = _gdi_.delete_GraphicsPen __del__ = lambda self : None; _gdi_.GraphicsPen_swigregister(GraphicsPen) class GraphicsBrush(GraphicsObject): - """Proxy of C++ GraphicsBrush class""" + """ + A wx.GraphicsBrush is a native representation of a brush. It is used + for filling a path on a `wx.GraphicsContext`. The contents are + specific and private to the respective renderer. The only way to get a + valid instance is via a Create...Brush call on the graphics context or + the renderer instance. + """ thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag') __repr__ = _swig_repr def __init__(self, *args, **kwargs): - """__init__(self) -> GraphicsBrush""" + """ + __init__(self) -> GraphicsBrush + + A wx.GraphicsBrush is a native representation of a brush. It is used + for filling a path on a `wx.GraphicsContext`. The contents are + specific and private to the respective renderer. The only way to get a + valid instance is via a Create...Brush call on the graphics context or + the renderer instance. + """ _gdi_.GraphicsBrush_swiginit(self,_gdi_.new_GraphicsBrush(*args, **kwargs)) __swig_destroy__ = _gdi_.delete_GraphicsBrush __del__ = lambda self : None; _gdi_.GraphicsBrush_swigregister(GraphicsBrush) class GraphicsFont(GraphicsObject): - """Proxy of C++ GraphicsFont class""" + """ + A `wx.GraphicsFont` is a native representation of a font (including + text colour). The contents are specific an private to the respective + renderer. The only way to get a valid instance is via a CreateFont + call on the graphics context or the renderer instance. + """ thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag') __repr__ = _swig_repr def __init__(self, *args, **kwargs): - """__init__(self) -> GraphicsFont""" + """ + __init__(self) -> GraphicsFont + + A `wx.GraphicsFont` is a native representation of a font (including + text colour). The contents are specific an private to the respective + renderer. The only way to get a valid instance is via a CreateFont + call on the graphics context or the renderer instance. + """ _gdi_.GraphicsFont_swiginit(self,_gdi_.new_GraphicsFont(*args, **kwargs)) __swig_destroy__ = _gdi_.delete_GraphicsFont __del__ = lambda self : None; _gdi_.GraphicsFont_swigregister(GraphicsFont) class GraphicsMatrix(GraphicsObject): - """Proxy of C++ GraphicsMatrix class""" + """ + A wx.GraphicsMatrix is a native representation of an affine + matrix. The contents are specific an private to the respective + renderer. The only way to get a valid instance is via a CreateMatrix + call on the graphics context or the renderer instance. + """ thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag') __repr__ = _swig_repr def __init__(self, *args, **kwargs): - """__init__(self) -> GraphicsMatrix""" + """ + __init__(self) -> GraphicsMatrix + + A wx.GraphicsMatrix is a native representation of an affine + matrix. The contents are specific an private to the respective + renderer. The only way to get a valid instance is via a CreateMatrix + call on the graphics context or the renderer instance. + """ _gdi_.GraphicsMatrix_swiginit(self,_gdi_.new_GraphicsMatrix(*args, **kwargs)) __swig_destroy__ = _gdi_.delete_GraphicsMatrix __del__ = lambda self : None; @@ -5037,24 +5108,17 @@ class GraphicsMatrix(GraphicsObject): """ Concat(self, GraphicsMatrix t) - concatenates the matrix + Concatenates the passed in matrix to the current matrix. """ return _gdi_.GraphicsMatrix_Concat(*args, **kwargs) - def Copy(*args, **kwargs): - """ - Copy(self, GraphicsMatrix t) - - Copy the passed in matrix to this one. - """ - return _gdi_.GraphicsMatrix_Copy(*args, **kwargs) - def Set(*args, **kwargs): """ Set(self, Double a=1.0, Double b=0.0, Double c=0.0, Double d=1.0, Double tx=0.0, Double ty=0.0) - sets the matrix to the respective values + Sets the matrix to the specified values (default values are the + identity matrix.) """ return _gdi_.GraphicsMatrix_Set(*args, **kwargs) @@ -5062,7 +5126,7 @@ class GraphicsMatrix(GraphicsObject): """ Invert(self) - makes this the inverse matrix + Inverts the matrix. """ return _gdi_.GraphicsMatrix_Invert(*args, **kwargs) @@ -5070,7 +5134,7 @@ class GraphicsMatrix(GraphicsObject): """ IsEqual(self, GraphicsMatrix t) -> bool - returns true if the elements of the transformation matrix are equal + Returns ``True`` if the elements of the transformation matrix are equal """ return _gdi_.GraphicsMatrix_IsEqual(*args, **kwargs) @@ -5078,7 +5142,7 @@ class GraphicsMatrix(GraphicsObject): """ IsIdentity(self) -> bool - return true if this is the identity matrix + Returns ``True`` if this is the identity matrix """ return _gdi_.GraphicsMatrix_IsIdentity(*args, **kwargs) @@ -5086,7 +5150,7 @@ class GraphicsMatrix(GraphicsObject): """ Translate(self, Double dx, Double dy) - add the translation to this matrix + Add a translation to this matrix. """ return _gdi_.GraphicsMatrix_Translate(*args, **kwargs) @@ -5094,7 +5158,7 @@ class GraphicsMatrix(GraphicsObject): """ Scale(self, Double xScale, Double yScale) - add the scale to this matrix + Scales this matrix. """ return _gdi_.GraphicsMatrix_Scale(*args, **kwargs) @@ -5102,7 +5166,7 @@ class GraphicsMatrix(GraphicsObject): """ Rotate(self, Double angle) - add the rotation to this matrix (radians) + Rotates this matrix. The angle should be specified in radians. """ return _gdi_.GraphicsMatrix_Rotate(*args, **kwargs) @@ -5110,7 +5174,7 @@ class GraphicsMatrix(GraphicsObject): """ TransformPoint(self, x, y) --> (x, y) - applies that matrix to the point + Applies this matrix to a point, returns the resulting point values """ return _gdi_.GraphicsMatrix_TransformPoint(*args, **kwargs) @@ -5118,7 +5182,8 @@ class GraphicsMatrix(GraphicsObject): """ TransformDistance(self, dx, dy) --> (dx, dy) - applies the matrix except for translations + Applies this matrix to a distance (ie. performs all transforms except + translations) """ return _gdi_.GraphicsMatrix_TransformDistance(*args, **kwargs) @@ -5126,7 +5191,10 @@ class GraphicsMatrix(GraphicsObject): """ GetNativeMatrix(self) -> void - returns the native representation + Returns the native representation of the matrix. For CoreGraphics this + is a CFAffineMatrix pointer. For GDIPlus a Matrix Pointer and for + Cairo a cairo_matrix_t pointer. NOTE: For wxPython we still need a + way to make this value usable. """ return _gdi_.GraphicsMatrix_GetNativeMatrix(*args, **kwargs) @@ -5146,7 +5214,7 @@ class GraphicsPath(GraphicsObject): MoveToPoint(self, Double x, Double y) MoveToPoint(self, Point2D p) - Begins a new subpath at (x,y) + Begins a new subpath at the specified point. """ return _gdi_.GraphicsPath_MoveToPoint(*args) @@ -5155,7 +5223,7 @@ class GraphicsPath(GraphicsObject): AddLineToPoint(self, Double x, Double y) AddLineToPoint(self, Point2D p) - Adds a straight line from the current point to (x,y) + Adds a straight line from the current point to the specified point. """ return _gdi_.GraphicsPath_AddLineToPoint(*args) @@ -5174,7 +5242,7 @@ class GraphicsPath(GraphicsObject): """ AddPath(self, GraphicsPath path) - adds another path + Adds another path """ return _gdi_.GraphicsPath_AddPath(*args, **kwargs) @@ -5182,7 +5250,7 @@ class GraphicsPath(GraphicsObject): """ CloseSubpath(self) - closes the current sub-path + Closes the current sub-path. """ return _gdi_.GraphicsPath_CloseSubpath(*args, **kwargs) @@ -5219,7 +5287,7 @@ class GraphicsPath(GraphicsObject): """ AddRectangle(self, Double x, Double y, Double w, Double h) - Appends a rectangle as a new closed subpath + Appends a rectangle as a new closed subpath. """ return _gdi_.GraphicsPath_AddRectangle(*args, **kwargs) @@ -5227,7 +5295,7 @@ class GraphicsPath(GraphicsObject): """ AddCircle(self, Double x, Double y, Double r) - Appends a circle as a new closed subpath with the given radius. + Appends a circle around (x,y) with radius r as a new closed subpath. """ return _gdi_.GraphicsPath_AddCircle(*args, **kwargs) @@ -5235,7 +5303,7 @@ class GraphicsPath(GraphicsObject): """ AddArcToPoint(self, Double x1, Double y1, Double x2, Double y2, Double r) - Draws a an arc to two tangents connecting (current) to (x1,y1) and (x1,y1) + Appends an arc to two tangents connecting (current) to (x1,y1) and (x1,y1) to (x2,y2), also a straight line from (current) to (x1,y1) """ return _gdi_.GraphicsPath_AddArcToPoint(*args, **kwargs) @@ -5244,7 +5312,7 @@ class GraphicsPath(GraphicsObject): """ AddEllipse(self, Double x, Double y, Double w, Double h) - appends an ellipse + Appends an ellipse fitting into the passed in rectangle. """ return _gdi_.GraphicsPath_AddEllipse(*args, **kwargs) @@ -5252,7 +5320,7 @@ class GraphicsPath(GraphicsObject): """ AddRoundedRectangle(self, Double x, Double y, Double w, Double h, Double radius) - appends a rounded rectangle + Appends a rounded rectangle. """ return _gdi_.GraphicsPath_AddRoundedRectangle(*args, **kwargs) @@ -5260,7 +5328,9 @@ class GraphicsPath(GraphicsObject): """ GetNativePath(self) -> void - returns the native path + Returns the native path (CGPathRef for Core Graphics, Path pointer for + GDIPlus and a cairo_path_t pointer for cairo). NOTE: For wxPython we + still need a way to make this value usable. """ return _gdi_.GraphicsPath_GetNativePath(*args, **kwargs) @@ -5268,8 +5338,9 @@ class GraphicsPath(GraphicsObject): """ UnGetNativePath(self, void p) - give the native path returned by GetNativePath() back (there might be some - deallocations necessary) + Gives back the native path returned by GetNativePath() because there + might be some deallocations necessary (eg on cairo the native path + returned by GetNativePath is newly allocated each time). """ return _gdi_.GraphicsPath_UnGetNativePath(*args, **kwargs) @@ -5277,7 +5348,7 @@ class GraphicsPath(GraphicsObject): """ Transform(self, GraphicsMatrix matrix) - transforms each point of this path by the matrix + Transforms each point of this path by the matrix """ return _gdi_.GraphicsPath_Transform(*args, **kwargs) @@ -5285,7 +5356,7 @@ class GraphicsPath(GraphicsObject): """ GetBox(self) -> wxRect2DDouble - gets the bounding box enclosing all points (possibly including control points) + Gets the bounding box enclosing all points (possibly including control points) """ return _gdi_.GraphicsPath_GetBox(*args, **kwargs) @@ -5293,13 +5364,21 @@ class GraphicsPath(GraphicsObject): """ Contains(self, Double x, Double y, int fillStyle=ODDEVEN_RULE) -> bool Contains(self, wxPoint2DDouble c, int fillStyle=ODDEVEN_RULE) -> bool + + Returns ``True`` if the point is within the path. """ return _gdi_.GraphicsPath_Contains(*args) _gdi_.GraphicsPath_swigregister(GraphicsPath) class GraphicsContext(GraphicsObject): - """Proxy of C++ GraphicsContext class""" + """ + A `wx.GraphicsContext` instance is the object that is drawn upon. It is + created by a renderer using the CreateContext calls, this can be done + either directly using a renderer instance, or indirectly using the + static convenience CreateXXX functions of wx.GraphicsContext that + always delegate the task to the default renderer. + """ thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag') def __init__(self): raise AttributeError, "No constructor defined" __repr__ = _swig_repr @@ -5309,6 +5388,8 @@ class GraphicsContext(GraphicsObject): """ Create(WindowDC dc) -> GraphicsContext Create(Window window) -> GraphicsContext + + Creates a wx.GraphicsContext either from a window or a DC. """ val = _gdi_.GraphicsContext_Create(*args) val.__dc = args[0] # save a ref so the dc will not be deleted before self @@ -5316,12 +5397,22 @@ class GraphicsContext(GraphicsObject): Create = staticmethod(Create) def CreateFromNative(*args, **kwargs): - """CreateFromNative(void context) -> GraphicsContext""" + """ + CreateFromNative(void context) -> GraphicsContext + + Creates a wx.GraphicsContext from a native context. This native context + must be eg a CGContextRef for Core Graphics, a Graphics pointer for + GDIPlus or a cairo_t pointer for Cairo. + """ return _gdi_.GraphicsContext_CreateFromNative(*args, **kwargs) CreateFromNative = staticmethod(CreateFromNative) def CreateFromNativeWindow(*args, **kwargs): - """CreateFromNativeWindow(void window) -> GraphicsContext""" + """ + CreateFromNativeWindow(void window) -> GraphicsContext + + Creates a wx.GraphicsContext from a native window. + """ return _gdi_.GraphicsContext_CreateFromNativeWindow(*args, **kwargs) CreateFromNativeWindow = staticmethod(CreateFromNativeWindow) @@ -5329,16 +5420,24 @@ class GraphicsContext(GraphicsObject): """ CreatePath(self) -> GraphicsPath - creates a path instance that corresponds to the type of graphics context, ie GDIPlus, Cairo, CoreGraphics ... + Creates a native graphics path which is initially empty. """ return _gdi_.GraphicsContext_CreatePath(*args, **kwargs) def CreatePen(*args, **kwargs): - """CreatePen(self, Pen pen) -> GraphicsPen""" + """ + CreatePen(self, Pen pen) -> GraphicsPen + + Creates a native pen from a `wx.Pen`. + """ return _gdi_.GraphicsContext_CreatePen(*args, **kwargs) def CreateBrush(*args, **kwargs): - """CreateBrush(self, Brush brush) -> GraphicsBrush""" + """ + CreateBrush(self, Brush brush) -> GraphicsBrush + + Creates a native brush from a `wx.Brush`. + """ return _gdi_.GraphicsContext_CreateBrush(*args, **kwargs) def CreateLinearGradientBrush(*args, **kwargs): @@ -5346,8 +5445,8 @@ class GraphicsContext(GraphicsObject): CreateLinearGradientBrush(self, Double x1, Double y1, Double x2, Double y2, Colour c1, Colour c2) -> GraphicsBrush - sets the brush to a linear gradient, starting at (x1,y1) with color c1 - to (x2,y2) with color c2 + Creates a native brush, having a linear gradient, starting at (x1,y1) + with color c1 to (x2,y2) with color c2. """ return _gdi_.GraphicsContext_CreateLinearGradientBrush(*args, **kwargs) @@ -5356,10 +5455,9 @@ class GraphicsContext(GraphicsObject): CreateRadialGradientBrush(self, Double xo, Double yo, Double xc, Double yc, Double radius, Colour oColor, Colour cColor) -> GraphicsBrush - sets the brush to a radial gradient originating at (xo,yc) with color - oColor and ends on a circle around (xc,yc) with radius r and color - cColor - + Creates a native brush, having a radial gradient originating at + point (xo,yc) with color oColour and ends on a circle around (xc,yc) with + radius r and color cColour. """ return _gdi_.GraphicsContext_CreateRadialGradientBrush(*args, **kwargs) @@ -5367,7 +5465,7 @@ class GraphicsContext(GraphicsObject): """ CreateFont(self, Font font, Colour col=*wxBLACK) -> GraphicsFont - sets the font + Creates a native graphics font from a `wx.Font` and a text colour. """ return _gdi_.GraphicsContext_CreateFont(*args, **kwargs) @@ -5376,7 +5474,8 @@ class GraphicsContext(GraphicsObject): CreateMatrix(self, Double a=1.0, Double b=0.0, Double c=0.0, Double d=1.0, Double tx=0.0, Double ty=0.0) -> GraphicsMatrix - create a 'native' matrix corresponding to these values + Creates a native affine transformation matrix from the passed in + values. The defaults result in an identity matrix. """ return _gdi_.GraphicsContext_CreateMatrix(*args, **kwargs) @@ -5400,7 +5499,7 @@ class GraphicsContext(GraphicsObject): """ ClipRegion(self, Region region) - clips drawings to the region + Clips drawings to the region, combined to current clipping region. """ return _gdi_.GraphicsContext_ClipRegion(*args, **kwargs) @@ -5408,7 +5507,7 @@ class GraphicsContext(GraphicsObject): """ Clip(self, Double x, Double y, Double w, Double h) - clips drawings to the rect + Clips drawings to the rectangle. """ return _gdi_.GraphicsContext_Clip(*args, **kwargs) @@ -5416,7 +5515,7 @@ class GraphicsContext(GraphicsObject): """ ResetClip(self) - resets the clipping to original extent + Resets the clipping to original shape. """ return _gdi_.GraphicsContext_ResetClip(*args, **kwargs) @@ -5424,7 +5523,8 @@ class GraphicsContext(GraphicsObject): """ GetNativeContext(self) -> void - returns the native context + Returns the native context (CGContextRef for Core Graphics, Graphics + pointer for GDIPlus and cairo_t pointer for cairo). """ return _gdi_.GraphicsContext_GetNativeContext(*args, **kwargs) @@ -5432,7 +5532,7 @@ class GraphicsContext(GraphicsObject): """ Translate(self, Double dx, Double dy) - translate the current transformation matrix CTM of the context + Translates the current transformation matrix. """ return _gdi_.GraphicsContext_Translate(*args, **kwargs) @@ -5440,7 +5540,7 @@ class GraphicsContext(GraphicsObject): """ Scale(self, Double xScale, Double yScale) - scale the current transformation matrix CTM of the context + Scale the current transformation matrix of the context. """ return _gdi_.GraphicsContext_Scale(*args, **kwargs) @@ -5448,7 +5548,8 @@ class GraphicsContext(GraphicsObject): """ Rotate(self, Double angle) - rotate (radians) the current transformation matrix CTM of the context + Rotate the current transformation matrix of the context. ``angle`` is + specified in radians. """ return _gdi_.GraphicsContext_Rotate(*args, **kwargs) @@ -5456,7 +5557,8 @@ class GraphicsContext(GraphicsObject): """ ConcatTransform(self, GraphicsMatrix matrix) - concatenates this transform with the current transform of this context + Concatenates the passed in transform with the current transform of + this context. """ return _gdi_.GraphicsContext_ConcatTransform(*args, **kwargs) @@ -5464,7 +5566,7 @@ class GraphicsContext(GraphicsObject): """ SetTransform(self, GraphicsMatrix matrix) - sets the transform of this context + Sets the current transform of this context. """ return _gdi_.GraphicsContext_SetTransform(*args, **kwargs) @@ -5472,7 +5574,7 @@ class GraphicsContext(GraphicsObject): """ GetTransform(self) -> GraphicsMatrix - gets the matrix of this context + Gets the current transformation matrix of this context. """ return _gdi_.GraphicsContext_GetTransform(*args, **kwargs) @@ -5481,7 +5583,7 @@ class GraphicsContext(GraphicsObject): SetPen(self, GraphicsPen pen) SetPen(self, Pen pen) - sets the stroke pen + Sets the stroke pen """ return _gdi_.GraphicsContext_SetPen(*args) @@ -5490,7 +5592,7 @@ class GraphicsContext(GraphicsObject): SetBrush(self, GraphicsBrush brush) SetBrush(self, Brush brush) - sets the brush for filling + Sets the brush for filling """ return _gdi_.GraphicsContext_SetBrush(*args) @@ -5499,7 +5601,7 @@ class GraphicsContext(GraphicsObject): SetFont(self, GraphicsFont font) SetFont(self, Font font, Colour colour=*wxBLACK) - sets the font + Sets the font """ return _gdi_.GraphicsContext_SetFont(*args) @@ -5507,7 +5609,7 @@ class GraphicsContext(GraphicsObject): """ StrokePath(self, GraphicsPath path) - strokes along a path with the current pen + Strokes along a path with the current pen. """ return _gdi_.GraphicsContext_StrokePath(*args, **kwargs) @@ -5515,7 +5617,7 @@ class GraphicsContext(GraphicsObject): """ FillPath(self, GraphicsPath path, int fillStyle=ODDEVEN_RULE) - fills a path with the current brush + Fills a path with the current brush. """ return _gdi_.GraphicsContext_FillPath(*args, **kwargs) @@ -5523,43 +5625,80 @@ class GraphicsContext(GraphicsObject): """ DrawPath(self, GraphicsPath path, int fillStyle=ODDEVEN_RULE) - draws a path by first filling and then stroking + Draws the path by first filling and then stroking. """ return _gdi_.GraphicsContext_DrawPath(*args, **kwargs) def DrawText(*args, **kwargs): - """DrawText(self, String str, Double x, Double y)""" + """ + DrawText(self, String str, Double x, Double y) + + Draws a text at the defined position. + """ return _gdi_.GraphicsContext_DrawText(*args, **kwargs) def DrawRotatedText(*args, **kwargs): - """DrawRotatedText(self, String str, Double x, Double y, Double angle)""" + """ + DrawRotatedText(self, String str, Double x, Double y, Double angle) + + Draws a text at the defined position, at the given angle. + """ return _gdi_.GraphicsContext_DrawRotatedText(*args, **kwargs) def GetFullTextExtent(*args, **kwargs): - """GetFullTextExtent(self, text) --> (width, height, descent, externalLeading)""" + """ + GetFullTextExtent(self, text) --> (width, height, descent, externalLeading) + + Gets the dimensions of the string using the currently selected + font. ``text`` is the string to measure, ``w`` and ``h`` are the total + width and height respectively, ``descent`` is the dimension from the + baseline of the font to the bottom of the descender, and + ``externalLeading`` is any extra vertical space added to the font by + the font designer (usually is zero). + """ return _gdi_.GraphicsContext_GetFullTextExtent(*args, **kwargs) def GetTextExtent(*args, **kwargs): - """GetTextExtent(self, text) --> (width, height)""" + """ + GetTextExtent(self, text) --> (width, height) + + Gets the dimensions of the string using the currently selected + font. ``text`` is the string to measure, ``w`` and ``h`` are the total + width and height respectively. + """ return _gdi_.GraphicsContext_GetTextExtent(*args, **kwargs) def GetPartialTextExtents(*args, **kwargs): - """GetPartialTextExtents(self, text) -> [widths]""" + """ + GetPartialTextExtents(self, text) -> [widths] + + Returns a list of widths from the beginning of ``text`` to the + coresponding character in ``text``. + """ return _gdi_.GraphicsContext_GetPartialTextExtents(*args, **kwargs) def DrawBitmap(*args, **kwargs): - """DrawBitmap(self, Bitmap bmp, Double x, Double y, Double w, Double h)""" + """ + DrawBitmap(self, Bitmap bmp, Double x, Double y, Double w, Double h) + + Draws the bitmap. In case of a mono bitmap, this is treated as a mask + and the current brush is used for filling. + """ return _gdi_.GraphicsContext_DrawBitmap(*args, **kwargs) def DrawIcon(*args, **kwargs): - """DrawIcon(self, Icon icon, Double x, Double y, Double w, Double h)""" + """ + DrawIcon(self, Icon icon, Double x, Double y, Double w, Double h) + + Draws the icon. + """ return _gdi_.GraphicsContext_DrawIcon(*args, **kwargs) def StrokeLine(*args, **kwargs): """ StrokeLine(self, Double x1, Double y1, Double x2, Double y2) - strokes a single line + Strokes a single line. """ return _gdi_.GraphicsContext_StrokeLine(*args, **kwargs) @@ -5567,7 +5706,7 @@ class GraphicsContext(GraphicsObject): """ StrokeLines(self, List points) - stroke lines connecting each of the points + Stroke lines connecting each of the points """ return _gdi_.GraphicsContext_StrokeLines(*args, **kwargs) @@ -5575,7 +5714,7 @@ class GraphicsContext(GraphicsObject): """ StrokeLineSegements(self, PyObject beginPoints, PyObject endPoints) - stroke disconnected lines from begin to end points + Stroke disconnected lines from begin to end points """ return _gdi_.GraphicsContext_StrokeLineSegements(*args, **kwargs) @@ -5583,7 +5722,7 @@ class GraphicsContext(GraphicsObject): """ DrawLines(self, size_t points, int fillStyle=ODDEVEN_RULE) - draws a polygon + Draws a polygon. """ return _gdi_.GraphicsContext_DrawLines(*args, **kwargs) @@ -5591,7 +5730,7 @@ class GraphicsContext(GraphicsObject): """ DrawRectangle(self, Double x, Double y, Double w, Double h) - draws a rectangle + Draws a rectangle. """ return _gdi_.GraphicsContext_DrawRectangle(*args, **kwargs) @@ -5599,7 +5738,7 @@ class GraphicsContext(GraphicsObject): """ DrawEllipse(self, Double x, Double y, Double w, Double h) - draws an ellipse + Draws an ellipse. """ return _gdi_.GraphicsContext_DrawEllipse(*args, **kwargs) @@ -5607,7 +5746,7 @@ class GraphicsContext(GraphicsObject): """ DrawRoundedRectangle(self, Double x, Double y, Double w, Double h, Double radius) - draws a rounded rectangle + Draws a rounded rectangle """ return _gdi_.GraphicsContext_DrawRoundedRectangle(*args, **kwargs) @@ -5631,17 +5770,29 @@ def GraphicsContext_Create(*args): """ Create(WindowDC dc) -> GraphicsContext GraphicsContext_Create(Window window) -> GraphicsContext + + Creates a wx.GraphicsContext either from a window or a DC. """ val = _gdi_.GraphicsContext_Create(*args) val.__dc = args[0] # save a ref so the dc will not be deleted before self return val def GraphicsContext_CreateFromNative(*args, **kwargs): - """GraphicsContext_CreateFromNative(void context) -> GraphicsContext""" + """ + GraphicsContext_CreateFromNative(void context) -> GraphicsContext + + Creates a wx.GraphicsContext from a native context. This native context + must be eg a CGContextRef for Core Graphics, a Graphics pointer for + GDIPlus or a cairo_t pointer for Cairo. + """ return _gdi_.GraphicsContext_CreateFromNative(*args, **kwargs) def GraphicsContext_CreateFromNativeWindow(*args, **kwargs): - """GraphicsContext_CreateFromNativeWindow(void window) -> GraphicsContext""" + """ + GraphicsContext_CreateFromNativeWindow(void window) -> GraphicsContext + + Creates a wx.GraphicsContext from a native window. + """ return _gdi_.GraphicsContext_CreateFromNativeWindow(*args, **kwargs) class GraphicsRenderer(_core.Object): diff --git a/wxPython/src/mac/_gdi_wrap.cpp b/wxPython/src/mac/_gdi_wrap.cpp index 38e59e941e..a39fd647c4 100644 --- a/wxPython/src/mac/_gdi_wrap.cpp +++ b/wxPython/src/mac/_gdi_wrap.cpp @@ -3905,9 +3905,6 @@ public: #endif -SWIGINTERN void wxGraphicsMatrix_Copy(wxGraphicsMatrix *self,wxGraphicsMatrix const &t){ - *self = t; - } SWIGINTERN PyObject *wxGraphicsContext_GetTextExtent(wxGraphicsContext *self,wxString const &text){ wxDouble width = 0.0, height = 0.0; @@ -23899,167 +23896,6 @@ SWIGINTERN PyObject *DCClipper_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject return SWIG_Python_InitShadowInstance(args); } -SWIGINTERN PyObject *_wrap_new_MemoryDC(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { - PyObject *resultobj = 0; - wxBitmap &arg1_defvalue = wxNullBitmap ; - wxBitmap *arg1 = (wxBitmap *) &arg1_defvalue ; - wxMemoryDC *result = 0 ; - void *argp1 = 0 ; - int res1 = 0 ; - PyObject * obj0 = 0 ; - char * kwnames[] = { - (char *) "bitmap", NULL - }; - - if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:new_MemoryDC",kwnames,&obj0)) SWIG_fail; - if (obj0) { - res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_wxBitmap, 0 ); - if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_MemoryDC" "', expected argument " "1"" of type '" "wxBitmap &""'"); - } - if (!argp1) { - SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_MemoryDC" "', expected argument " "1"" of type '" "wxBitmap &""'"); - } - arg1 = reinterpret_cast< wxBitmap * >(argp1); - } - { - if (!wxPyCheckForApp()) SWIG_fail; - PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxMemoryDC *)new wxMemoryDC(*arg1); - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxMemoryDC, SWIG_POINTER_NEW | 0 ); - return resultobj; -fail: - return NULL; -} - - -SWIGINTERN PyObject *_wrap_new_MemoryDCFromDC(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { - PyObject *resultobj = 0; - wxDC *arg1 = (wxDC *) 0 ; - wxMemoryDC *result = 0 ; - void *argp1 = 0 ; - int res1 = 0 ; - PyObject * obj0 = 0 ; - char * kwnames[] = { - (char *) "oldDC", NULL - }; - - if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:new_MemoryDCFromDC",kwnames,&obj0)) SWIG_fail; - res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxDC, 0 | 0 ); - if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_MemoryDCFromDC" "', expected argument " "1"" of type '" "wxDC *""'"); - } - arg1 = reinterpret_cast< wxDC * >(argp1); - { - if (!wxPyCheckForApp()) SWIG_fail; - PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxMemoryDC *)new wxMemoryDC(arg1); - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxMemoryDC, SWIG_POINTER_OWN | 0 ); - return resultobj; -fail: - return NULL; -} - - -SWIGINTERN PyObject *_wrap_MemoryDC_SelectObject(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { - PyObject *resultobj = 0; - wxMemoryDC *arg1 = (wxMemoryDC *) 0 ; - wxBitmap *arg2 = 0 ; - void *argp1 = 0 ; - int res1 = 0 ; - void *argp2 = 0 ; - int res2 = 0 ; - PyObject * obj0 = 0 ; - PyObject * obj1 = 0 ; - char * kwnames[] = { - (char *) "self",(char *) "bitmap", NULL - }; - - if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:MemoryDC_SelectObject",kwnames,&obj0,&obj1)) SWIG_fail; - res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxMemoryDC, 0 | 0 ); - if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "MemoryDC_SelectObject" "', expected argument " "1"" of type '" "wxMemoryDC *""'"); - } - arg1 = reinterpret_cast< wxMemoryDC * >(argp1); - res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_wxBitmap, 0 ); - if (!SWIG_IsOK(res2)) { - SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "MemoryDC_SelectObject" "', expected argument " "2"" of type '" "wxBitmap &""'"); - } - if (!argp2) { - SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "MemoryDC_SelectObject" "', expected argument " "2"" of type '" "wxBitmap &""'"); - } - arg2 = reinterpret_cast< wxBitmap * >(argp2); - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->SelectObject(*arg2); - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - resultobj = SWIG_Py_Void(); - return resultobj; -fail: - return NULL; -} - - -SWIGINTERN PyObject *_wrap_MemoryDC_SelectObjectAsSource(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { - PyObject *resultobj = 0; - wxMemoryDC *arg1 = (wxMemoryDC *) 0 ; - wxBitmap *arg2 = 0 ; - void *argp1 = 0 ; - int res1 = 0 ; - void *argp2 = 0 ; - int res2 = 0 ; - PyObject * obj0 = 0 ; - PyObject * obj1 = 0 ; - char * kwnames[] = { - (char *) "self",(char *) "bmp", NULL - }; - - if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:MemoryDC_SelectObjectAsSource",kwnames,&obj0,&obj1)) SWIG_fail; - res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxMemoryDC, 0 | 0 ); - if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "MemoryDC_SelectObjectAsSource" "', expected argument " "1"" of type '" "wxMemoryDC *""'"); - } - arg1 = reinterpret_cast< wxMemoryDC * >(argp1); - res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_wxBitmap, 0 | 0); - if (!SWIG_IsOK(res2)) { - SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "MemoryDC_SelectObjectAsSource" "', expected argument " "2"" of type '" "wxBitmap const &""'"); - } - if (!argp2) { - SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "MemoryDC_SelectObjectAsSource" "', expected argument " "2"" of type '" "wxBitmap const &""'"); - } - arg2 = reinterpret_cast< wxBitmap * >(argp2); - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->SelectObjectAsSource((wxBitmap const &)*arg2); - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - resultobj = SWIG_Py_Void(); - return resultobj; -fail: - return NULL; -} - - -SWIGINTERN PyObject *MemoryDC_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { - PyObject *obj; - if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL; - SWIG_TypeNewClientData(SWIGTYPE_p_wxMemoryDC, SWIG_NewClientData(obj)); - return SWIG_Py_Void(); -} - -SWIGINTERN PyObject *MemoryDC_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { - return SWIG_Python_InitShadowInstance(args); -} - SWIGINTERN PyObject *_wrap_new_ScreenDC(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; wxScreenDC *result = 0 ; @@ -24330,6 +24166,167 @@ SWIGINTERN PyObject *PaintDC_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject * return SWIG_Python_InitShadowInstance(args); } +SWIGINTERN PyObject *_wrap_new_MemoryDC(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { + PyObject *resultobj = 0; + wxBitmap &arg1_defvalue = wxNullBitmap ; + wxBitmap *arg1 = (wxBitmap *) &arg1_defvalue ; + wxMemoryDC *result = 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject * obj0 = 0 ; + char * kwnames[] = { + (char *) "bitmap", NULL + }; + + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:new_MemoryDC",kwnames,&obj0)) SWIG_fail; + if (obj0) { + res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_wxBitmap, 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_MemoryDC" "', expected argument " "1"" of type '" "wxBitmap &""'"); + } + if (!argp1) { + SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_MemoryDC" "', expected argument " "1"" of type '" "wxBitmap &""'"); + } + arg1 = reinterpret_cast< wxBitmap * >(argp1); + } + { + if (!wxPyCheckForApp()) SWIG_fail; + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (wxMemoryDC *)new wxMemoryDC(*arg1); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxMemoryDC, SWIG_POINTER_NEW | 0 ); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_new_MemoryDCFromDC(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { + PyObject *resultobj = 0; + wxDC *arg1 = (wxDC *) 0 ; + wxMemoryDC *result = 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject * obj0 = 0 ; + char * kwnames[] = { + (char *) "oldDC", NULL + }; + + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:new_MemoryDCFromDC",kwnames,&obj0)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxDC, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_MemoryDCFromDC" "', expected argument " "1"" of type '" "wxDC *""'"); + } + arg1 = reinterpret_cast< wxDC * >(argp1); + { + if (!wxPyCheckForApp()) SWIG_fail; + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (wxMemoryDC *)new wxMemoryDC(arg1); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxMemoryDC, SWIG_POINTER_OWN | 0 ); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_MemoryDC_SelectObject(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { + PyObject *resultobj = 0; + wxMemoryDC *arg1 = (wxMemoryDC *) 0 ; + wxBitmap *arg2 = 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + void *argp2 = 0 ; + int res2 = 0 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char * kwnames[] = { + (char *) "self",(char *) "bitmap", NULL + }; + + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:MemoryDC_SelectObject",kwnames,&obj0,&obj1)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxMemoryDC, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "MemoryDC_SelectObject" "', expected argument " "1"" of type '" "wxMemoryDC *""'"); + } + arg1 = reinterpret_cast< wxMemoryDC * >(argp1); + res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_wxBitmap, 0 ); + if (!SWIG_IsOK(res2)) { + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "MemoryDC_SelectObject" "', expected argument " "2"" of type '" "wxBitmap &""'"); + } + if (!argp2) { + SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "MemoryDC_SelectObject" "', expected argument " "2"" of type '" "wxBitmap &""'"); + } + arg2 = reinterpret_cast< wxBitmap * >(argp2); + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + (arg1)->SelectObject(*arg2); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_Py_Void(); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_MemoryDC_SelectObjectAsSource(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { + PyObject *resultobj = 0; + wxMemoryDC *arg1 = (wxMemoryDC *) 0 ; + wxBitmap *arg2 = 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + void *argp2 = 0 ; + int res2 = 0 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char * kwnames[] = { + (char *) "self",(char *) "bmp", NULL + }; + + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:MemoryDC_SelectObjectAsSource",kwnames,&obj0,&obj1)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxMemoryDC, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "MemoryDC_SelectObjectAsSource" "', expected argument " "1"" of type '" "wxMemoryDC *""'"); + } + arg1 = reinterpret_cast< wxMemoryDC * >(argp1); + res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_wxBitmap, 0 | 0); + if (!SWIG_IsOK(res2)) { + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "MemoryDC_SelectObjectAsSource" "', expected argument " "2"" of type '" "wxBitmap const &""'"); + } + if (!argp2) { + SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "MemoryDC_SelectObjectAsSource" "', expected argument " "2"" of type '" "wxBitmap const &""'"); + } + arg2 = reinterpret_cast< wxBitmap * >(argp2); + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + (arg1)->SelectObjectAsSource((wxBitmap const &)*arg2); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_Py_Void(); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *MemoryDC_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *obj; + if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL; + SWIG_TypeNewClientData(SWIGTYPE_p_wxMemoryDC, SWIG_NewClientData(obj)); + return SWIG_Py_Void(); +} + +SWIGINTERN PyObject *MemoryDC_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + return SWIG_Python_InitShadowInstance(args); +} + SWIGINTERN PyObject *_wrap_new_BufferedDC__SWIG_0(PyObject *SWIGUNUSEDPARM(self), int nobjs, PyObject **swig_obj) { PyObject *resultobj = 0; wxDC *arg1 = (wxDC *) 0 ; @@ -25720,45 +25717,6 @@ fail: } -SWIGINTERN PyObject *_wrap_GraphicsMatrix_Copy(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { - PyObject *resultobj = 0; - wxGraphicsMatrix *arg1 = (wxGraphicsMatrix *) 0 ; - wxGraphicsMatrix *arg2 = 0 ; - void *argp1 = 0 ; - int res1 = 0 ; - void *argp2 = 0 ; - int res2 = 0 ; - PyObject * obj0 = 0 ; - PyObject * obj1 = 0 ; - char * kwnames[] = { - (char *) "self",(char *) "t", NULL - }; - - if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:GraphicsMatrix_Copy",kwnames,&obj0,&obj1)) SWIG_fail; - res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxGraphicsMatrix, 0 | 0 ); - if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GraphicsMatrix_Copy" "', expected argument " "1"" of type '" "wxGraphicsMatrix *""'"); - } - arg1 = reinterpret_cast< wxGraphicsMatrix * >(argp1); - res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_wxGraphicsMatrix, 0 | 0); - if (!SWIG_IsOK(res2)) { - SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "GraphicsMatrix_Copy" "', expected argument " "2"" of type '" "wxGraphicsMatrix const &""'"); - } - if (!argp2) { - SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "GraphicsMatrix_Copy" "', expected argument " "2"" of type '" "wxGraphicsMatrix const &""'"); - } - arg2 = reinterpret_cast< wxGraphicsMatrix * >(argp2); - { - wxGraphicsMatrix_Copy(arg1,(wxGraphicsMatrix const &)*arg2); - if (PyErr_Occurred()) SWIG_fail; - } - resultobj = SWIG_Py_Void(); - return resultobj; -fail: - return NULL; -} - - SWIGINTERN PyObject *_wrap_GraphicsMatrix_Set(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxGraphicsMatrix *arg1 = (wxGraphicsMatrix *) 0 ; @@ -38905,12 +38863,6 @@ static PyMethodDef SwigMethods[] = { { (char *)"delete_DCClipper", (PyCFunction)_wrap_delete_DCClipper, METH_O, NULL}, { (char *)"DCClipper_swigregister", DCClipper_swigregister, METH_VARARGS, NULL}, { (char *)"DCClipper_swiginit", DCClipper_swiginit, METH_VARARGS, NULL}, - { (char *)"new_MemoryDC", (PyCFunction) _wrap_new_MemoryDC, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"new_MemoryDCFromDC", (PyCFunction) _wrap_new_MemoryDCFromDC, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"MemoryDC_SelectObject", (PyCFunction) _wrap_MemoryDC_SelectObject, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"MemoryDC_SelectObjectAsSource", (PyCFunction) _wrap_MemoryDC_SelectObjectAsSource, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"MemoryDC_swigregister", MemoryDC_swigregister, METH_VARARGS, NULL}, - { (char *)"MemoryDC_swiginit", MemoryDC_swiginit, METH_VARARGS, NULL}, { (char *)"new_ScreenDC", (PyCFunction)_wrap_new_ScreenDC, METH_NOARGS, NULL}, { (char *)"ScreenDC_StartDrawingOnTopWin", (PyCFunction) _wrap_ScreenDC_StartDrawingOnTopWin, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"ScreenDC_StartDrawingOnTop", (PyCFunction) _wrap_ScreenDC_StartDrawingOnTop, METH_VARARGS | METH_KEYWORDS, NULL}, @@ -38926,6 +38878,12 @@ static PyMethodDef SwigMethods[] = { { (char *)"new_PaintDC", (PyCFunction) _wrap_new_PaintDC, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"PaintDC_swigregister", PaintDC_swigregister, METH_VARARGS, NULL}, { (char *)"PaintDC_swiginit", PaintDC_swiginit, METH_VARARGS, NULL}, + { (char *)"new_MemoryDC", (PyCFunction) _wrap_new_MemoryDC, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"new_MemoryDCFromDC", (PyCFunction) _wrap_new_MemoryDCFromDC, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"MemoryDC_SelectObject", (PyCFunction) _wrap_MemoryDC_SelectObject, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"MemoryDC_SelectObjectAsSource", (PyCFunction) _wrap_MemoryDC_SelectObjectAsSource, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"MemoryDC_swigregister", MemoryDC_swigregister, METH_VARARGS, NULL}, + { (char *)"MemoryDC_swiginit", MemoryDC_swiginit, METH_VARARGS, NULL}, { (char *)"new_BufferedDC", _wrap_new_BufferedDC, METH_VARARGS, NULL}, { (char *)"delete_BufferedDC", (PyCFunction)_wrap_delete_BufferedDC, METH_O, NULL}, { (char *)"BufferedDC_UnMask", (PyCFunction)_wrap_BufferedDC_UnMask, METH_O, NULL}, @@ -38987,7 +38945,6 @@ static PyMethodDef SwigMethods[] = { { (char *)"new_GraphicsMatrix", (PyCFunction)_wrap_new_GraphicsMatrix, METH_NOARGS, NULL}, { (char *)"delete_GraphicsMatrix", (PyCFunction)_wrap_delete_GraphicsMatrix, METH_O, NULL}, { (char *)"GraphicsMatrix_Concat", (PyCFunction) _wrap_GraphicsMatrix_Concat, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"GraphicsMatrix_Copy", (PyCFunction) _wrap_GraphicsMatrix_Copy, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"GraphicsMatrix_Set", (PyCFunction) _wrap_GraphicsMatrix_Set, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"GraphicsMatrix_Invert", (PyCFunction)_wrap_GraphicsMatrix_Invert, METH_O, NULL}, { (char *)"GraphicsMatrix_IsEqual", (PyCFunction) _wrap_GraphicsMatrix_IsEqual, METH_VARARGS | METH_KEYWORDS, NULL}, @@ -39301,12 +39258,21 @@ static void *_p_wxBufferedDCTo_p_wxMemoryDC(void *x) { static void *_p_wxBufferedPaintDCTo_p_wxMemoryDC(void *x) { return (void *)((wxMemoryDC *) (wxBufferedDC *) ((wxBufferedPaintDC *) x)); } +static void *_p_wxBufferedDCTo_p_wxWindowDC(void *x) { + return (void *)((wxWindowDC *) (wxMemoryDC *) ((wxBufferedDC *) x)); +} +static void *_p_wxMemoryDCTo_p_wxWindowDC(void *x) { + return (void *)((wxWindowDC *) ((wxMemoryDC *) x)); +} static void *_p_wxClientDCTo_p_wxWindowDC(void *x) { return (void *)((wxWindowDC *) ((wxClientDC *) x)); } static void *_p_wxPaintDCTo_p_wxWindowDC(void *x) { return (void *)((wxWindowDC *) (wxClientDC *) ((wxPaintDC *) x)); } +static void *_p_wxBufferedPaintDCTo_p_wxWindowDC(void *x) { + return (void *)((wxWindowDC *) (wxMemoryDC *)(wxBufferedDC *) ((wxBufferedPaintDC *) x)); +} static void *_p_wxPyLocaleTo_p_wxLocale(void *x) { return (void *)((wxLocale *) ((wxPyLocale *) x)); } @@ -39359,17 +39325,17 @@ static void *_p_wxScreenDCTo_p_wxDC(void *x) { return (void *)((wxDC *) ((wxScreenDC *) x)); } static void *_p_wxBufferedDCTo_p_wxDC(void *x) { - return (void *)((wxDC *) (wxMemoryDC *) ((wxBufferedDC *) x)); + return (void *)((wxDC *) (wxWindowDC *)(wxMemoryDC *) ((wxBufferedDC *) x)); } static void *_p_wxMirrorDCTo_p_wxDC(void *x) { return (void *)((wxDC *) ((wxMirrorDC *) x)); } -static void *_p_wxMemoryDCTo_p_wxDC(void *x) { - return (void *)((wxDC *) ((wxMemoryDC *) x)); -} static void *_p_wxWindowDCTo_p_wxDC(void *x) { return (void *)((wxDC *) ((wxWindowDC *) x)); } +static void *_p_wxMemoryDCTo_p_wxDC(void *x) { + return (void *)((wxDC *) (wxWindowDC *) ((wxMemoryDC *) x)); +} static void *_p_wxMetaFileDCTo_p_wxDC(void *x) { return (void *)((wxDC *) ((wxMetaFileDC *) x)); } @@ -39380,7 +39346,7 @@ static void *_p_wxPaintDCTo_p_wxDC(void *x) { return (void *)((wxDC *) (wxWindowDC *)(wxClientDC *) ((wxPaintDC *) x)); } static void *_p_wxBufferedPaintDCTo_p_wxDC(void *x) { - return (void *)((wxDC *) (wxMemoryDC *)(wxBufferedDC *) ((wxBufferedPaintDC *) x)); + return (void *)((wxDC *) (wxWindowDC *)(wxMemoryDC *)(wxBufferedDC *) ((wxBufferedPaintDC *) x)); } static void *_p_wxAutoBufferedPaintDCTo_p_wxDC(void *x) { return (void *)((wxDC *) ((wxAutoBufferedPaintDC *) x)); @@ -39497,7 +39463,7 @@ static void *_p_wxFSFileTo_p_wxObject(void *x) { return (void *)((wxObject *) ((wxFSFile *) x)); } static void *_p_wxMemoryDCTo_p_wxObject(void *x) { - return (void *)((wxObject *) (wxDC *) ((wxMemoryDC *) x)); + return (void *)((wxObject *) (wxDC *)(wxWindowDC *) ((wxMemoryDC *) x)); } static void *_p_wxRegionTo_p_wxObject(void *x) { return (void *)((wxObject *) (wxGDIObject *) ((wxRegion *) x)); @@ -39617,7 +39583,7 @@ static void *_p_wxPaintDCTo_p_wxObject(void *x) { return (void *)((wxObject *) (wxDC *)(wxWindowDC *)(wxClientDC *) ((wxPaintDC *) x)); } static void *_p_wxBufferedPaintDCTo_p_wxObject(void *x) { - return (void *)((wxObject *) (wxDC *)(wxMemoryDC *)(wxBufferedDC *) ((wxBufferedPaintDC *) x)); + return (void *)((wxObject *) (wxDC *)(wxWindowDC *)(wxMemoryDC *)(wxBufferedDC *) ((wxBufferedPaintDC *) x)); } static void *_p_wxAutoBufferedPaintDCTo_p_wxObject(void *x) { return (void *)((wxObject *) (wxDC *) ((wxAutoBufferedPaintDC *) x)); @@ -39650,7 +39616,7 @@ static void *_p_wxPaletteTo_p_wxObject(void *x) { return (void *)((wxObject *) (wxGDIObject *) ((wxPalette *) x)); } static void *_p_wxBufferedDCTo_p_wxObject(void *x) { - return (void *)((wxObject *) (wxDC *)(wxMemoryDC *) ((wxBufferedDC *) x)); + return (void *)((wxObject *) (wxDC *)(wxWindowDC *)(wxMemoryDC *) ((wxBufferedDC *) x)); } static void *_p_wxImageListTo_p_wxObject(void *x) { return (void *)((wxObject *) ((wxImageList *) x)); @@ -40288,7 +40254,7 @@ static swig_cast_info _swigc__p_wxSplitterRenderParams[] = { {&_swigt__p_wxSpli static swig_cast_info _swigc__p_wxStockGDI[] = { {&_swigt__p_wxStockGDI, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxString[] = { {&_swigt__p_wxString, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxWindow[] = { {&_swigt__p_wxControl, _p_wxControlTo_p_wxWindow, 0, 0}, {&_swigt__p_wxWindow, 0, 0, 0}, {&_swigt__p_wxControlWithItems, _p_wxControlWithItemsTo_p_wxWindow, 0, 0}, {&_swigt__p_wxMenuBar, _p_wxMenuBarTo_p_wxWindow, 0, 0},{0, 0, 0, 0}}; -static swig_cast_info _swigc__p_wxWindowDC[] = { {&_swigt__p_wxWindowDC, 0, 0, 0}, {&_swigt__p_wxClientDC, _p_wxClientDCTo_p_wxWindowDC, 0, 0}, {&_swigt__p_wxPaintDC, _p_wxPaintDCTo_p_wxWindowDC, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_wxWindowDC[] = { {&_swigt__p_wxBufferedDC, _p_wxBufferedDCTo_p_wxWindowDC, 0, 0}, {&_swigt__p_wxWindowDC, 0, 0, 0}, {&_swigt__p_wxMemoryDC, _p_wxMemoryDCTo_p_wxWindowDC, 0, 0}, {&_swigt__p_wxBufferedPaintDC, _p_wxBufferedPaintDCTo_p_wxWindowDC, 0, 0}, {&_swigt__p_wxClientDC, _p_wxClientDCTo_p_wxWindowDC, 0, 0}, {&_swigt__p_wxPaintDC, _p_wxPaintDCTo_p_wxWindowDC, 0, 0},{0, 0, 0, 0}}; static swig_cast_info *swig_cast_initial[] = { _swigc__p_buffer, diff --git a/wxPython/src/mac/_misc_wrap.cpp b/wxPython/src/mac/_misc_wrap.cpp index bd4a18c953..7fe94f15ee 100644 --- a/wxPython/src/mac/_misc_wrap.cpp +++ b/wxPython/src/mac/_misc_wrap.cpp @@ -4006,6 +4006,7 @@ IMP_PYCALLBACK_BOOL_INTINT(wxPyFileDropTarget, wxFileDropTarget, OnDrop); SWIGINTERN bool wxClipboardLocker___nonzero__(wxClipboardLocker *self){ return !!(*self); } #include +#include SWIGINTERN bool wxVideoMode___eq__(wxVideoMode *self,wxVideoMode const *other){ return other ? (*self == *other) : false; } SWIGINTERN bool wxVideoMode___ne__(wxVideoMode *self,wxVideoMode const *other){ return other ? (*self != *other) : true; } diff --git a/wxPython/src/mac/_windows.py b/wxPython/src/mac/_windows.py index e11829ac9a..ecf63a52bf 100644 --- a/wxPython/src/mac/_windows.py +++ b/wxPython/src/mac/_windows.py @@ -3269,6 +3269,7 @@ class PyWindow(_core.Window): """_setCallbackInfo(self, PyObject self, PyObject _class)""" return _windows_.PyWindow__setCallbackInfo(*args, **kwargs) + SetBestSize = wx.Window.SetInitialSize def DoEraseBackground(*args, **kwargs): """DoEraseBackground(self, DC dc) -> bool""" return _windows_.PyWindow_DoEraseBackground(*args, **kwargs) @@ -3445,6 +3446,7 @@ class PyPanel(Panel): """_setCallbackInfo(self, PyObject self, PyObject _class)""" return _windows_.PyPanel__setCallbackInfo(*args, **kwargs) + SetBestSize = wx.Window.SetInitialSize def DoEraseBackground(*args, **kwargs): """DoEraseBackground(self, DC dc) -> bool""" return _windows_.PyPanel_DoEraseBackground(*args, **kwargs) @@ -3621,6 +3623,7 @@ class PyScrolledWindow(ScrolledWindow): """_setCallbackInfo(self, PyObject self, PyObject _class)""" return _windows_.PyScrolledWindow__setCallbackInfo(*args, **kwargs) + SetBestSize = wx.Window.SetInitialSize def DoEraseBackground(*args, **kwargs): """DoEraseBackground(self, DC dc) -> bool""" return _windows_.PyScrolledWindow_DoEraseBackground(*args, **kwargs) diff --git a/wxPython/src/mac/aui.py b/wxPython/src/mac/aui.py index 7e489cc7f6..cac179bde2 100644 --- a/wxPython/src/mac/aui.py +++ b/wxPython/src/mac/aui.py @@ -201,6 +201,7 @@ AUI_BUTTON_MAXIMIZE_RESTORE = _aui.AUI_BUTTON_MAXIMIZE_RESTORE AUI_BUTTON_MINIMIZE = _aui.AUI_BUTTON_MINIMIZE AUI_BUTTON_PIN = _aui.AUI_BUTTON_PIN AUI_BUTTON_OPTIONS = _aui.AUI_BUTTON_OPTIONS +AUI_BUTTON_WINDOWLIST = _aui.AUI_BUTTON_WINDOWLIST AUI_BUTTON_LEFT = _aui.AUI_BUTTON_LEFT AUI_BUTTON_RIGHT = _aui.AUI_BUTTON_RIGHT AUI_BUTTON_UP = _aui.AUI_BUTTON_UP @@ -991,7 +992,7 @@ AUI_NB_BOTTOM = _aui.AUI_NB_BOTTOM AUI_NB_TAB_SPLIT = _aui.AUI_NB_TAB_SPLIT AUI_NB_TAB_MOVE = _aui.AUI_NB_TAB_MOVE AUI_NB_SCROLL_BUTTONS = _aui.AUI_NB_SCROLL_BUTTONS -AUI_NB_PAGELIST_BUTTON = _aui.AUI_NB_PAGELIST_BUTTON +AUI_NB_WINDOWLIST_BUTTON = _aui.AUI_NB_WINDOWLIST_BUTTON AUI_NB_CLOSE_BUTTON = _aui.AUI_NB_CLOSE_BUTTON AUI_NB_CLOSE_ON_ACTIVE_TAB = _aui.AUI_NB_CLOSE_ON_ACTIVE_TAB AUI_NB_CLOSE_ON_ALL_TABS = _aui.AUI_NB_CLOSE_ON_ALL_TABS @@ -1016,27 +1017,32 @@ class AuiTabArt(object): return _aui.AuiTabArt_SetMeasuringFont(*args, **kwargs) def DrawBackground(*args, **kwargs): - """DrawBackground(self, DC dc, Rect rect)""" + """DrawBackground(self, DC dc, Window wnd, Rect rect)""" return _aui.AuiTabArt_DrawBackground(*args, **kwargs) def DrawTab(*args, **kwargs): """ - DrawTab(self, DC dc, Rect in_rect, String caption, bool active, int close_button_state, - Rect out_tab_rect, Rect out_button_rect, - int x_extent) + DrawTab(self, DC dc, Window wnd, Rect in_rect, String caption, bool active, + int close_button_state, Rect out_tab_rect, + Rect out_button_rect, int x_extent) """ return _aui.AuiTabArt_DrawTab(*args, **kwargs) def DrawButton(*args, **kwargs): """ - DrawButton(self, DC dc, Rect in_rect, int bitmap_id, int button_state, - int orientation, Bitmap bitmap_override, Rect out_rect) + DrawButton(self, DC dc, Window wnd, Rect in_rect, int bitmap_id, int button_state, + int orientation, Bitmap bitmap_override, + Rect out_rect) """ return _aui.AuiTabArt_DrawButton(*args, **kwargs) + def ShowWindowList(*args, **kwargs): + """ShowWindowList(self, Window wnd, wxArrayString items, int active_idx) -> int""" + return _aui.AuiTabArt_ShowWindowList(*args, **kwargs) + def GetTabSize(*args, **kwargs): """ - GetTabSize(self, DC dc, String caption, bool active, int close_button_state, + GetTabSize(self, DC dc, Window wnd, String caption, bool active, int close_button_state, int x_extent) -> Size """ return _aui.AuiTabArt_GetTabSize(*args, **kwargs) diff --git a/wxPython/src/mac/aui_wrap.cpp b/wxPython/src/mac/aui_wrap.cpp index 6465682801..01eea472e4 100644 --- a/wxPython/src/mac/aui_wrap.cpp +++ b/wxPython/src/mac/aui_wrap.cpp @@ -2521,179 +2521,180 @@ SWIG_Python_MustGetPtr(PyObject *obj, swig_type_info *ty, int argnum, int flags) #define SWIGTYPE_p_wxANIHandler swig_types[55] #define SWIGTYPE_p_wxAcceleratorTable swig_types[56] #define SWIGTYPE_p_wxActivateEvent swig_types[57] -#define SWIGTYPE_p_wxAuiDefaultDockArt swig_types[58] -#define SWIGTYPE_p_wxAuiDefaultTabArt swig_types[59] -#define SWIGTYPE_p_wxAuiDockArt swig_types[60] -#define SWIGTYPE_p_wxAuiDockInfo swig_types[61] -#define SWIGTYPE_p_wxAuiDockUIPart swig_types[62] -#define SWIGTYPE_p_wxAuiFloatingFrame swig_types[63] -#define SWIGTYPE_p_wxAuiManager swig_types[64] -#define SWIGTYPE_p_wxAuiManagerEvent swig_types[65] -#define SWIGTYPE_p_wxAuiNotebook swig_types[66] -#define SWIGTYPE_p_wxAuiNotebookEvent swig_types[67] -#define SWIGTYPE_p_wxAuiNotebookPage swig_types[68] -#define SWIGTYPE_p_wxAuiNotebookPageArray swig_types[69] -#define SWIGTYPE_p_wxAuiPaneButton swig_types[70] -#define SWIGTYPE_p_wxAuiPaneButtonArray swig_types[71] -#define SWIGTYPE_p_wxAuiPaneInfo swig_types[72] -#define SWIGTYPE_p_wxAuiPaneInfoPtrArray swig_types[73] -#define SWIGTYPE_p_wxAuiTabArt swig_types[74] -#define SWIGTYPE_p_wxAuiTabContainer swig_types[75] -#define SWIGTYPE_p_wxAuiTabContainerButton swig_types[76] -#define SWIGTYPE_p_wxAuiTabCtrl swig_types[77] -#define SWIGTYPE_p_wxBMPHandler swig_types[78] -#define SWIGTYPE_p_wxBitmap swig_types[79] -#define SWIGTYPE_p_wxBoxSizer swig_types[80] -#define SWIGTYPE_p_wxCURHandler swig_types[81] -#define SWIGTYPE_p_wxCalculateLayoutEvent swig_types[82] -#define SWIGTYPE_p_wxChildFocusEvent swig_types[83] -#define SWIGTYPE_p_wxClipboardTextEvent swig_types[84] -#define SWIGTYPE_p_wxCloseEvent swig_types[85] -#define SWIGTYPE_p_wxColor swig_types[86] -#define SWIGTYPE_p_wxColour swig_types[87] -#define SWIGTYPE_p_wxColourData swig_types[88] -#define SWIGTYPE_p_wxColourDialog swig_types[89] -#define SWIGTYPE_p_wxCommandEvent swig_types[90] -#define SWIGTYPE_p_wxContextMenuEvent swig_types[91] -#define SWIGTYPE_p_wxControl swig_types[92] -#define SWIGTYPE_p_wxControlWithItems swig_types[93] -#define SWIGTYPE_p_wxDC swig_types[94] -#define SWIGTYPE_p_wxDateEvent swig_types[95] -#define SWIGTYPE_p_wxDialog swig_types[96] -#define SWIGTYPE_p_wxDirDialog swig_types[97] -#define SWIGTYPE_p_wxDisplayChangedEvent swig_types[98] -#define SWIGTYPE_p_wxDropFilesEvent swig_types[99] -#define SWIGTYPE_p_wxDuplexMode swig_types[100] -#define SWIGTYPE_p_wxEraseEvent swig_types[101] -#define SWIGTYPE_p_wxEvent swig_types[102] -#define SWIGTYPE_p_wxEvtHandler swig_types[103] -#define SWIGTYPE_p_wxFSFile swig_types[104] -#define SWIGTYPE_p_wxFileDialog swig_types[105] -#define SWIGTYPE_p_wxFileSystem swig_types[106] -#define SWIGTYPE_p_wxFindDialogEvent swig_types[107] -#define SWIGTYPE_p_wxFindReplaceData swig_types[108] -#define SWIGTYPE_p_wxFindReplaceDialog swig_types[109] -#define SWIGTYPE_p_wxFlexGridSizer swig_types[110] -#define SWIGTYPE_p_wxFocusEvent swig_types[111] -#define SWIGTYPE_p_wxFont swig_types[112] -#define SWIGTYPE_p_wxFontData swig_types[113] -#define SWIGTYPE_p_wxFontDialog swig_types[114] -#define SWIGTYPE_p_wxFrame swig_types[115] -#define SWIGTYPE_p_wxGBSizerItem swig_types[116] -#define SWIGTYPE_p_wxGIFHandler swig_types[117] -#define SWIGTYPE_p_wxGridBagSizer swig_types[118] -#define SWIGTYPE_p_wxGridSizer swig_types[119] -#define SWIGTYPE_p_wxICOHandler swig_types[120] -#define SWIGTYPE_p_wxIconizeEvent swig_types[121] -#define SWIGTYPE_p_wxIdleEvent swig_types[122] -#define SWIGTYPE_p_wxImage swig_types[123] -#define SWIGTYPE_p_wxImageHandler swig_types[124] -#define SWIGTYPE_p_wxIndividualLayoutConstraint swig_types[125] -#define SWIGTYPE_p_wxInitDialogEvent swig_types[126] -#define SWIGTYPE_p_wxJPEGHandler swig_types[127] -#define SWIGTYPE_p_wxKeyEvent swig_types[128] -#define SWIGTYPE_p_wxLayoutAlgorithm swig_types[129] -#define SWIGTYPE_p_wxLayoutConstraints swig_types[130] -#define SWIGTYPE_p_wxMDIChildFrame swig_types[131] -#define SWIGTYPE_p_wxMDIClientWindow swig_types[132] -#define SWIGTYPE_p_wxMDIParentFrame swig_types[133] -#define SWIGTYPE_p_wxMaximizeEvent swig_types[134] -#define SWIGTYPE_p_wxMenu swig_types[135] -#define SWIGTYPE_p_wxMenuBar swig_types[136] -#define SWIGTYPE_p_wxMenuEvent swig_types[137] -#define SWIGTYPE_p_wxMenuItem swig_types[138] -#define SWIGTYPE_p_wxMessageDialog swig_types[139] -#define SWIGTYPE_p_wxMiniFrame swig_types[140] -#define SWIGTYPE_p_wxMouseCaptureChangedEvent swig_types[141] -#define SWIGTYPE_p_wxMouseCaptureLostEvent swig_types[142] -#define SWIGTYPE_p_wxMouseEvent swig_types[143] -#define SWIGTYPE_p_wxMoveEvent swig_types[144] -#define SWIGTYPE_p_wxMultiChoiceDialog swig_types[145] -#define SWIGTYPE_p_wxNavigationKeyEvent swig_types[146] -#define SWIGTYPE_p_wxNcPaintEvent swig_types[147] -#define SWIGTYPE_p_wxNotifyEvent swig_types[148] -#define SWIGTYPE_p_wxNumberEntryDialog swig_types[149] -#define SWIGTYPE_p_wxObject swig_types[150] -#define SWIGTYPE_p_wxPCXHandler swig_types[151] -#define SWIGTYPE_p_wxPNGHandler swig_types[152] -#define SWIGTYPE_p_wxPNMHandler swig_types[153] -#define SWIGTYPE_p_wxPageSetupDialog swig_types[154] -#define SWIGTYPE_p_wxPageSetupDialogData swig_types[155] -#define SWIGTYPE_p_wxPaintEvent swig_types[156] -#define SWIGTYPE_p_wxPaletteChangedEvent swig_types[157] -#define SWIGTYPE_p_wxPanel swig_types[158] -#define SWIGTYPE_p_wxPaperSize swig_types[159] -#define SWIGTYPE_p_wxPasswordEntryDialog swig_types[160] -#define SWIGTYPE_p_wxPoint swig_types[161] -#define SWIGTYPE_p_wxPopupWindow swig_types[162] -#define SWIGTYPE_p_wxPreviewCanvas swig_types[163] -#define SWIGTYPE_p_wxPreviewControlBar swig_types[164] -#define SWIGTYPE_p_wxPreviewFrame swig_types[165] -#define SWIGTYPE_p_wxPrintData swig_types[166] -#define SWIGTYPE_p_wxPrintDialog swig_types[167] -#define SWIGTYPE_p_wxPrintDialogData swig_types[168] -#define SWIGTYPE_p_wxPrintPreview swig_types[169] -#define SWIGTYPE_p_wxPrinter swig_types[170] -#define SWIGTYPE_p_wxProgressDialog swig_types[171] -#define SWIGTYPE_p_wxPyApp swig_types[172] -#define SWIGTYPE_p_wxPyAuiDockArt swig_types[173] -#define SWIGTYPE_p_wxPyAuiTabArt swig_types[174] -#define SWIGTYPE_p_wxPyCommandEvent swig_types[175] -#define SWIGTYPE_p_wxPyEvent swig_types[176] -#define SWIGTYPE_p_wxPyHtmlListBox swig_types[177] -#define SWIGTYPE_p_wxPyImageHandler swig_types[178] -#define SWIGTYPE_p_wxPyPanel swig_types[179] -#define SWIGTYPE_p_wxPyPopupTransientWindow swig_types[180] -#define SWIGTYPE_p_wxPyPreviewControlBar swig_types[181] -#define SWIGTYPE_p_wxPyPreviewFrame swig_types[182] -#define SWIGTYPE_p_wxPyPrintPreview swig_types[183] -#define SWIGTYPE_p_wxPyPrintout swig_types[184] -#define SWIGTYPE_p_wxPyScrolledWindow swig_types[185] -#define SWIGTYPE_p_wxPySizer swig_types[186] -#define SWIGTYPE_p_wxPyTaskBarIcon swig_types[187] -#define SWIGTYPE_p_wxPyVListBox swig_types[188] -#define SWIGTYPE_p_wxPyVScrolledWindow swig_types[189] -#define SWIGTYPE_p_wxPyValidator swig_types[190] -#define SWIGTYPE_p_wxPyWindow swig_types[191] -#define SWIGTYPE_p_wxQueryLayoutInfoEvent swig_types[192] -#define SWIGTYPE_p_wxQueryNewPaletteEvent swig_types[193] -#define SWIGTYPE_p_wxRect swig_types[194] -#define SWIGTYPE_p_wxSashEvent swig_types[195] -#define SWIGTYPE_p_wxSashLayoutWindow swig_types[196] -#define SWIGTYPE_p_wxSashWindow swig_types[197] -#define SWIGTYPE_p_wxScrollEvent swig_types[198] -#define SWIGTYPE_p_wxScrollWinEvent swig_types[199] -#define SWIGTYPE_p_wxScrolledWindow swig_types[200] -#define SWIGTYPE_p_wxSetCursorEvent swig_types[201] -#define SWIGTYPE_p_wxShowEvent swig_types[202] -#define SWIGTYPE_p_wxSingleChoiceDialog swig_types[203] -#define SWIGTYPE_p_wxSize swig_types[204] -#define SWIGTYPE_p_wxSizeEvent swig_types[205] -#define SWIGTYPE_p_wxSizer swig_types[206] -#define SWIGTYPE_p_wxSizerItem swig_types[207] -#define SWIGTYPE_p_wxSplashScreen swig_types[208] -#define SWIGTYPE_p_wxSplashScreenWindow swig_types[209] -#define SWIGTYPE_p_wxSplitterEvent swig_types[210] -#define SWIGTYPE_p_wxSplitterWindow swig_types[211] -#define SWIGTYPE_p_wxStaticBoxSizer swig_types[212] -#define SWIGTYPE_p_wxStatusBar swig_types[213] -#define SWIGTYPE_p_wxStdDialogButtonSizer swig_types[214] -#define SWIGTYPE_p_wxString swig_types[215] -#define SWIGTYPE_p_wxSysColourChangedEvent swig_types[216] -#define SWIGTYPE_p_wxTGAHandler swig_types[217] -#define SWIGTYPE_p_wxTIFFHandler swig_types[218] -#define SWIGTYPE_p_wxTaskBarIconEvent swig_types[219] -#define SWIGTYPE_p_wxTextEntryDialog swig_types[220] -#define SWIGTYPE_p_wxTipWindow swig_types[221] -#define SWIGTYPE_p_wxTopLevelWindow swig_types[222] -#define SWIGTYPE_p_wxUpdateUIEvent swig_types[223] -#define SWIGTYPE_p_wxValidator swig_types[224] -#define SWIGTYPE_p_wxWindow swig_types[225] -#define SWIGTYPE_p_wxWindowCreateEvent swig_types[226] -#define SWIGTYPE_p_wxWindowDestroyEvent swig_types[227] -#define SWIGTYPE_p_wxXPMHandler swig_types[228] -static swig_type_info *swig_types[230]; -static swig_module_info swig_module = {swig_types, 229, 0, 0, 0, 0}; +#define SWIGTYPE_p_wxArrayString swig_types[58] +#define SWIGTYPE_p_wxAuiDefaultDockArt swig_types[59] +#define SWIGTYPE_p_wxAuiDefaultTabArt swig_types[60] +#define SWIGTYPE_p_wxAuiDockArt swig_types[61] +#define SWIGTYPE_p_wxAuiDockInfo swig_types[62] +#define SWIGTYPE_p_wxAuiDockUIPart swig_types[63] +#define SWIGTYPE_p_wxAuiFloatingFrame swig_types[64] +#define SWIGTYPE_p_wxAuiManager swig_types[65] +#define SWIGTYPE_p_wxAuiManagerEvent swig_types[66] +#define SWIGTYPE_p_wxAuiNotebook swig_types[67] +#define SWIGTYPE_p_wxAuiNotebookEvent swig_types[68] +#define SWIGTYPE_p_wxAuiNotebookPage swig_types[69] +#define SWIGTYPE_p_wxAuiNotebookPageArray swig_types[70] +#define SWIGTYPE_p_wxAuiPaneButton swig_types[71] +#define SWIGTYPE_p_wxAuiPaneButtonArray swig_types[72] +#define SWIGTYPE_p_wxAuiPaneInfo swig_types[73] +#define SWIGTYPE_p_wxAuiPaneInfoPtrArray swig_types[74] +#define SWIGTYPE_p_wxAuiTabArt swig_types[75] +#define SWIGTYPE_p_wxAuiTabContainer swig_types[76] +#define SWIGTYPE_p_wxAuiTabContainerButton swig_types[77] +#define SWIGTYPE_p_wxAuiTabCtrl swig_types[78] +#define SWIGTYPE_p_wxBMPHandler swig_types[79] +#define SWIGTYPE_p_wxBitmap swig_types[80] +#define SWIGTYPE_p_wxBoxSizer swig_types[81] +#define SWIGTYPE_p_wxCURHandler swig_types[82] +#define SWIGTYPE_p_wxCalculateLayoutEvent swig_types[83] +#define SWIGTYPE_p_wxChildFocusEvent swig_types[84] +#define SWIGTYPE_p_wxClipboardTextEvent swig_types[85] +#define SWIGTYPE_p_wxCloseEvent swig_types[86] +#define SWIGTYPE_p_wxColor swig_types[87] +#define SWIGTYPE_p_wxColour swig_types[88] +#define SWIGTYPE_p_wxColourData swig_types[89] +#define SWIGTYPE_p_wxColourDialog swig_types[90] +#define SWIGTYPE_p_wxCommandEvent swig_types[91] +#define SWIGTYPE_p_wxContextMenuEvent swig_types[92] +#define SWIGTYPE_p_wxControl swig_types[93] +#define SWIGTYPE_p_wxControlWithItems swig_types[94] +#define SWIGTYPE_p_wxDC swig_types[95] +#define SWIGTYPE_p_wxDateEvent swig_types[96] +#define SWIGTYPE_p_wxDialog swig_types[97] +#define SWIGTYPE_p_wxDirDialog swig_types[98] +#define SWIGTYPE_p_wxDisplayChangedEvent swig_types[99] +#define SWIGTYPE_p_wxDropFilesEvent swig_types[100] +#define SWIGTYPE_p_wxDuplexMode swig_types[101] +#define SWIGTYPE_p_wxEraseEvent swig_types[102] +#define SWIGTYPE_p_wxEvent swig_types[103] +#define SWIGTYPE_p_wxEvtHandler swig_types[104] +#define SWIGTYPE_p_wxFSFile swig_types[105] +#define SWIGTYPE_p_wxFileDialog swig_types[106] +#define SWIGTYPE_p_wxFileSystem swig_types[107] +#define SWIGTYPE_p_wxFindDialogEvent swig_types[108] +#define SWIGTYPE_p_wxFindReplaceData swig_types[109] +#define SWIGTYPE_p_wxFindReplaceDialog swig_types[110] +#define SWIGTYPE_p_wxFlexGridSizer swig_types[111] +#define SWIGTYPE_p_wxFocusEvent swig_types[112] +#define SWIGTYPE_p_wxFont swig_types[113] +#define SWIGTYPE_p_wxFontData swig_types[114] +#define SWIGTYPE_p_wxFontDialog swig_types[115] +#define SWIGTYPE_p_wxFrame swig_types[116] +#define SWIGTYPE_p_wxGBSizerItem swig_types[117] +#define SWIGTYPE_p_wxGIFHandler swig_types[118] +#define SWIGTYPE_p_wxGridBagSizer swig_types[119] +#define SWIGTYPE_p_wxGridSizer swig_types[120] +#define SWIGTYPE_p_wxICOHandler swig_types[121] +#define SWIGTYPE_p_wxIconizeEvent swig_types[122] +#define SWIGTYPE_p_wxIdleEvent swig_types[123] +#define SWIGTYPE_p_wxImage swig_types[124] +#define SWIGTYPE_p_wxImageHandler swig_types[125] +#define SWIGTYPE_p_wxIndividualLayoutConstraint swig_types[126] +#define SWIGTYPE_p_wxInitDialogEvent swig_types[127] +#define SWIGTYPE_p_wxJPEGHandler swig_types[128] +#define SWIGTYPE_p_wxKeyEvent swig_types[129] +#define SWIGTYPE_p_wxLayoutAlgorithm swig_types[130] +#define SWIGTYPE_p_wxLayoutConstraints swig_types[131] +#define SWIGTYPE_p_wxMDIChildFrame swig_types[132] +#define SWIGTYPE_p_wxMDIClientWindow swig_types[133] +#define SWIGTYPE_p_wxMDIParentFrame swig_types[134] +#define SWIGTYPE_p_wxMaximizeEvent swig_types[135] +#define SWIGTYPE_p_wxMenu swig_types[136] +#define SWIGTYPE_p_wxMenuBar swig_types[137] +#define SWIGTYPE_p_wxMenuEvent swig_types[138] +#define SWIGTYPE_p_wxMenuItem swig_types[139] +#define SWIGTYPE_p_wxMessageDialog swig_types[140] +#define SWIGTYPE_p_wxMiniFrame swig_types[141] +#define SWIGTYPE_p_wxMouseCaptureChangedEvent swig_types[142] +#define SWIGTYPE_p_wxMouseCaptureLostEvent swig_types[143] +#define SWIGTYPE_p_wxMouseEvent swig_types[144] +#define SWIGTYPE_p_wxMoveEvent swig_types[145] +#define SWIGTYPE_p_wxMultiChoiceDialog swig_types[146] +#define SWIGTYPE_p_wxNavigationKeyEvent swig_types[147] +#define SWIGTYPE_p_wxNcPaintEvent swig_types[148] +#define SWIGTYPE_p_wxNotifyEvent swig_types[149] +#define SWIGTYPE_p_wxNumberEntryDialog swig_types[150] +#define SWIGTYPE_p_wxObject swig_types[151] +#define SWIGTYPE_p_wxPCXHandler swig_types[152] +#define SWIGTYPE_p_wxPNGHandler swig_types[153] +#define SWIGTYPE_p_wxPNMHandler swig_types[154] +#define SWIGTYPE_p_wxPageSetupDialog swig_types[155] +#define SWIGTYPE_p_wxPageSetupDialogData swig_types[156] +#define SWIGTYPE_p_wxPaintEvent swig_types[157] +#define SWIGTYPE_p_wxPaletteChangedEvent swig_types[158] +#define SWIGTYPE_p_wxPanel swig_types[159] +#define SWIGTYPE_p_wxPaperSize swig_types[160] +#define SWIGTYPE_p_wxPasswordEntryDialog swig_types[161] +#define SWIGTYPE_p_wxPoint swig_types[162] +#define SWIGTYPE_p_wxPopupWindow swig_types[163] +#define SWIGTYPE_p_wxPreviewCanvas swig_types[164] +#define SWIGTYPE_p_wxPreviewControlBar swig_types[165] +#define SWIGTYPE_p_wxPreviewFrame swig_types[166] +#define SWIGTYPE_p_wxPrintData swig_types[167] +#define SWIGTYPE_p_wxPrintDialog swig_types[168] +#define SWIGTYPE_p_wxPrintDialogData swig_types[169] +#define SWIGTYPE_p_wxPrintPreview swig_types[170] +#define SWIGTYPE_p_wxPrinter swig_types[171] +#define SWIGTYPE_p_wxProgressDialog swig_types[172] +#define SWIGTYPE_p_wxPyApp swig_types[173] +#define SWIGTYPE_p_wxPyAuiDockArt swig_types[174] +#define SWIGTYPE_p_wxPyAuiTabArt swig_types[175] +#define SWIGTYPE_p_wxPyCommandEvent swig_types[176] +#define SWIGTYPE_p_wxPyEvent swig_types[177] +#define SWIGTYPE_p_wxPyHtmlListBox swig_types[178] +#define SWIGTYPE_p_wxPyImageHandler swig_types[179] +#define SWIGTYPE_p_wxPyPanel swig_types[180] +#define SWIGTYPE_p_wxPyPopupTransientWindow swig_types[181] +#define SWIGTYPE_p_wxPyPreviewControlBar swig_types[182] +#define SWIGTYPE_p_wxPyPreviewFrame swig_types[183] +#define SWIGTYPE_p_wxPyPrintPreview swig_types[184] +#define SWIGTYPE_p_wxPyPrintout swig_types[185] +#define SWIGTYPE_p_wxPyScrolledWindow swig_types[186] +#define SWIGTYPE_p_wxPySizer swig_types[187] +#define SWIGTYPE_p_wxPyTaskBarIcon swig_types[188] +#define SWIGTYPE_p_wxPyVListBox swig_types[189] +#define SWIGTYPE_p_wxPyVScrolledWindow swig_types[190] +#define SWIGTYPE_p_wxPyValidator swig_types[191] +#define SWIGTYPE_p_wxPyWindow swig_types[192] +#define SWIGTYPE_p_wxQueryLayoutInfoEvent swig_types[193] +#define SWIGTYPE_p_wxQueryNewPaletteEvent swig_types[194] +#define SWIGTYPE_p_wxRect swig_types[195] +#define SWIGTYPE_p_wxSashEvent swig_types[196] +#define SWIGTYPE_p_wxSashLayoutWindow swig_types[197] +#define SWIGTYPE_p_wxSashWindow swig_types[198] +#define SWIGTYPE_p_wxScrollEvent swig_types[199] +#define SWIGTYPE_p_wxScrollWinEvent swig_types[200] +#define SWIGTYPE_p_wxScrolledWindow swig_types[201] +#define SWIGTYPE_p_wxSetCursorEvent swig_types[202] +#define SWIGTYPE_p_wxShowEvent swig_types[203] +#define SWIGTYPE_p_wxSingleChoiceDialog swig_types[204] +#define SWIGTYPE_p_wxSize swig_types[205] +#define SWIGTYPE_p_wxSizeEvent swig_types[206] +#define SWIGTYPE_p_wxSizer swig_types[207] +#define SWIGTYPE_p_wxSizerItem swig_types[208] +#define SWIGTYPE_p_wxSplashScreen swig_types[209] +#define SWIGTYPE_p_wxSplashScreenWindow swig_types[210] +#define SWIGTYPE_p_wxSplitterEvent swig_types[211] +#define SWIGTYPE_p_wxSplitterWindow swig_types[212] +#define SWIGTYPE_p_wxStaticBoxSizer swig_types[213] +#define SWIGTYPE_p_wxStatusBar swig_types[214] +#define SWIGTYPE_p_wxStdDialogButtonSizer swig_types[215] +#define SWIGTYPE_p_wxString swig_types[216] +#define SWIGTYPE_p_wxSysColourChangedEvent swig_types[217] +#define SWIGTYPE_p_wxTGAHandler swig_types[218] +#define SWIGTYPE_p_wxTIFFHandler swig_types[219] +#define SWIGTYPE_p_wxTaskBarIconEvent swig_types[220] +#define SWIGTYPE_p_wxTextEntryDialog swig_types[221] +#define SWIGTYPE_p_wxTipWindow swig_types[222] +#define SWIGTYPE_p_wxTopLevelWindow swig_types[223] +#define SWIGTYPE_p_wxUpdateUIEvent swig_types[224] +#define SWIGTYPE_p_wxValidator swig_types[225] +#define SWIGTYPE_p_wxWindow swig_types[226] +#define SWIGTYPE_p_wxWindowCreateEvent swig_types[227] +#define SWIGTYPE_p_wxWindowDestroyEvent swig_types[228] +#define SWIGTYPE_p_wxXPMHandler swig_types[229] +static swig_type_info *swig_types[231]; +static swig_module_info swig_module = {swig_types, 230, 0, 0, 0, 0}; #define SWIG_TypeQuery(name) SWIG_TypeQueryModule(&swig_module, &swig_module, name) #define SWIG_MangledTypeQuery(name) SWIG_MangledTypeQueryModule(&swig_module, &swig_module, name) @@ -3079,23 +3080,27 @@ class wxPyAuiTabArt : public wxAuiDefaultTabArt virtual void DrawBackground( wxDC* dc, + wxWindow* wnd, const wxRect& rect ) { bool found; wxPyBlock_t blocked = wxPyBeginBlockThreads(); if ((found = wxPyCBH_findCallback(m_myInst, "DrawBackground"))) { PyObject* odc = wxPyMake_wxObject(dc, false); + PyObject* ownd = wxPyMake_wxObject(wnd, false); PyObject* orect = wxPyConstructObject((void*)&rect, wxT("wxRect"), 0); - wxPyCBH_callCallback(m_myInst, Py_BuildValue("(OO)", odc, orect)); + wxPyCBH_callCallback(m_myInst, Py_BuildValue("(OOO)", odc, ownd, orect)); Py_DECREF(odc); + Py_DECREF(ownd); Py_DECREF(orect); } wxPyEndBlockThreads(blocked); if (!found) - wxAuiDefaultTabArt::DrawBackground(dc, rect); + wxAuiDefaultTabArt::DrawBackground(dc, wnd, rect); } virtual void DrawTab( wxDC* dc, + wxWindow* wnd, const wxRect& in_rect, const wxString& caption, bool active, @@ -3109,12 +3114,13 @@ class wxPyAuiTabArt : public wxAuiDefaultTabArt wxPyBlock_t blocked = wxPyBeginBlockThreads(); if ((found = wxPyCBH_findCallback(m_myInst, "DrawTab"))) { PyObject* odc = wxPyMake_wxObject(dc, false); + PyObject* ownd = wxPyMake_wxObject(wnd, false); PyObject* orect = wxPyConstructObject((void*)&in_rect, wxT("wxRect"), 0); PyObject* otext = wx2PyString(caption); PyObject* ro; ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue( - "(OOOii)", - odc, orect, otext, + "(OOOOii)", + odc, ownd, orect, otext, (int)active, close_button_state)); if (ro) { if (PySequence_Check(ro) && PyObject_Length(ro) == 3) { @@ -3141,16 +3147,18 @@ class wxPyAuiTabArt : public wxAuiDefaultTabArt } Py_DECREF(odc); + Py_DECREF(ownd); Py_DECREF(orect); Py_DECREF(otext); } wxPyEndBlockThreads(blocked); if (!found) - wxAuiDefaultTabArt::DrawTab(dc, in_rect, caption, active, close_button_state, out_tab_rect, out_button_rect, x_extent); + wxAuiDefaultTabArt::DrawTab(dc, wnd, in_rect, caption, active, close_button_state, out_tab_rect, out_button_rect, x_extent); } virtual void DrawButton( wxDC* dc, + wxWindow* wnd, const wxRect& in_rect, int bitmap_id, int button_state, @@ -3163,10 +3171,11 @@ class wxPyAuiTabArt : public wxAuiDefaultTabArt wxPyBlock_t blocked = wxPyBeginBlockThreads(); if ((found = wxPyCBH_findCallback(m_myInst, "DrawButton"))) { PyObject* odc = wxPyMake_wxObject(dc, false); + PyObject* ownd = wxPyMake_wxObject(wnd, false); PyObject* orect = wxPyConstructObject((void*)&in_rect, wxT("wxRect"), 0); PyObject* obmp = wxPyConstructObject((void*)&bitmap_override, wxT("wxBitmap"), 0); PyObject* ro; - ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("(OOiiiO)", odc, orect, + ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("(OOOiiiO)", odc, ownd, orect, bitmap_id, button_state, orientation, obmp)); if (ro) { @@ -3176,16 +3185,24 @@ class wxPyAuiTabArt : public wxAuiDefaultTabArt } Py_DECREF(odc); + Py_DECREF(ownd); Py_DECREF(orect); Py_DECREF(obmp); } wxPyEndBlockThreads(blocked); if (!found) - wxAuiDefaultTabArt::DrawButton(dc, in_rect, bitmap_id, button_state, orientation, bitmap_override, out_rect); + wxAuiDefaultTabArt::DrawButton(dc, wnd, in_rect, bitmap_id, button_state, orientation, bitmap_override, out_rect); } + +// TODO +// virtual int ShowWindowList( +// wxWindow* wnd, +// const wxArrayString& items, +// int active_idx); virtual wxSize GetTabSize( wxDC* dc, + wxWindow* wnd, const wxString& caption, bool active, int close_button_state, @@ -3197,10 +3214,11 @@ class wxPyAuiTabArt : public wxAuiDefaultTabArt wxPyBlock_t blocked = wxPyBeginBlockThreads(); if ((found = wxPyCBH_findCallback(m_myInst, "GetTabSize"))) { PyObject* odc = wxPyMake_wxObject(dc, false); + PyObject* ownd = wxPyMake_wxObject(wnd, false); PyObject* otext = wx2PyString(caption); PyObject* ro; ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue( - "(OOi)", odc, otext, (int)active, close_button_state)); + "(OOOi)", odc, ownd, otext, (int)active, close_button_state)); if (ro) { if (PySequence_Check(ro) && PyObject_Length(ro) == 2) { PyObject* o1 = PySequence_GetItem(ro, 0); @@ -3222,15 +3240,18 @@ class wxPyAuiTabArt : public wxAuiDefaultTabArt } Py_DECREF(odc); + Py_DECREF(ownd); Py_DECREF(otext); } wxPyEndBlockThreads(blocked); if (!found) - rv = wxAuiDefaultTabArt::GetTabSize(dc, caption, active, close_button_state, x_extent); + rv = wxAuiDefaultTabArt::GetTabSize(dc, wnd, caption, active, close_button_state, x_extent); return rv; } - - + +// TODO +// virtual int GetBestTabCtrlSize(wxWindow* wnd); + DEC_PYCALLBACK__FONT(SetNormalFont); DEC_PYCALLBACK__FONT(SetSelectedFont); @@ -11510,20 +11531,24 @@ SWIGINTERN PyObject *_wrap_AuiTabArt_DrawBackground(PyObject *SWIGUNUSEDPARM(sel PyObject *resultobj = 0; wxAuiTabArt *arg1 = (wxAuiTabArt *) 0 ; wxDC *arg2 = (wxDC *) 0 ; - wxRect *arg3 = 0 ; + wxWindow *arg3 = (wxWindow *) 0 ; + wxRect *arg4 = 0 ; void *argp1 = 0 ; int res1 = 0 ; void *argp2 = 0 ; int res2 = 0 ; - wxRect temp3 ; + void *argp3 = 0 ; + int res3 = 0 ; + wxRect temp4 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char * kwnames[] = { - (char *) "self",(char *) "dc",(char *) "rect", NULL + (char *) "self",(char *) "dc",(char *) "wnd",(char *) "rect", NULL }; - if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:AuiTabArt_DrawBackground",kwnames,&obj0,&obj1,&obj2)) SWIG_fail; + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:AuiTabArt_DrawBackground",kwnames,&obj0,&obj1,&obj2,&obj3)) SWIG_fail; res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxAuiTabArt, 0 | 0 ); if (!SWIG_IsOK(res1)) { SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AuiTabArt_DrawBackground" "', expected argument " "1"" of type '" "wxAuiTabArt *""'"); @@ -11534,13 +11559,18 @@ SWIGINTERN PyObject *_wrap_AuiTabArt_DrawBackground(PyObject *SWIGUNUSEDPARM(sel SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "AuiTabArt_DrawBackground" "', expected argument " "2"" of type '" "wxDC *""'"); } arg2 = reinterpret_cast< wxDC * >(argp2); + res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_p_wxWindow, 0 | 0 ); + if (!SWIG_IsOK(res3)) { + SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "AuiTabArt_DrawBackground" "', expected argument " "3"" of type '" "wxWindow *""'"); + } + arg3 = reinterpret_cast< wxWindow * >(argp3); { - arg3 = &temp3; - if ( ! wxRect_helper(obj2, &arg3)) SWIG_fail; + arg4 = &temp4; + if ( ! wxRect_helper(obj3, &arg4)) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->DrawBackground(arg2,(wxRect const &)*arg3); + (arg1)->DrawBackground(arg2,arg3,(wxRect const &)*arg4); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } @@ -11555,29 +11585,32 @@ SWIGINTERN PyObject *_wrap_AuiTabArt_DrawTab(PyObject *SWIGUNUSEDPARM(self), PyO PyObject *resultobj = 0; wxAuiTabArt *arg1 = (wxAuiTabArt *) 0 ; wxDC *arg2 = (wxDC *) 0 ; - wxRect *arg3 = 0 ; - wxString *arg4 = 0 ; - bool arg5 ; - int arg6 ; - wxRect *arg7 = (wxRect *) 0 ; + wxWindow *arg3 = (wxWindow *) 0 ; + wxRect *arg4 = 0 ; + wxString *arg5 = 0 ; + bool arg6 ; + int arg7 ; wxRect *arg8 = (wxRect *) 0 ; - int *arg9 = (int *) 0 ; + wxRect *arg9 = (wxRect *) 0 ; + int *arg10 = (int *) 0 ; void *argp1 = 0 ; int res1 = 0 ; void *argp2 = 0 ; int res2 = 0 ; - wxRect temp3 ; - bool temp4 = false ; - bool val5 ; - int ecode5 = 0 ; - int val6 ; + void *argp3 = 0 ; + int res3 = 0 ; + wxRect temp4 ; + bool temp5 = false ; + bool val6 ; int ecode6 = 0 ; - void *argp7 = 0 ; - int res7 = 0 ; + int val7 ; + int ecode7 = 0 ; void *argp8 = 0 ; int res8 = 0 ; void *argp9 = 0 ; int res9 = 0 ; + void *argp10 = 0 ; + int res10 = 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; @@ -11587,11 +11620,12 @@ SWIGINTERN PyObject *_wrap_AuiTabArt_DrawTab(PyObject *SWIGUNUSEDPARM(self), PyO PyObject * obj6 = 0 ; PyObject * obj7 = 0 ; PyObject * obj8 = 0 ; + PyObject * obj9 = 0 ; char * kwnames[] = { - (char *) "self",(char *) "dc",(char *) "in_rect",(char *) "caption",(char *) "active",(char *) "close_button_state",(char *) "out_tab_rect",(char *) "out_button_rect",(char *) "x_extent", NULL + (char *) "self",(char *) "dc",(char *) "wnd",(char *) "in_rect",(char *) "caption",(char *) "active",(char *) "close_button_state",(char *) "out_tab_rect",(char *) "out_button_rect",(char *) "x_extent", NULL }; - if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOOOOO:AuiTabArt_DrawTab",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8)) SWIG_fail; + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOOOOOO:AuiTabArt_DrawTab",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9)) SWIG_fail; res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxAuiTabArt, 0 | 0 ); if (!SWIG_IsOK(res1)) { SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AuiTabArt_DrawTab" "', expected argument " "1"" of type '" "wxAuiTabArt *""'"); @@ -11602,56 +11636,61 @@ SWIGINTERN PyObject *_wrap_AuiTabArt_DrawTab(PyObject *SWIGUNUSEDPARM(self), PyO SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "AuiTabArt_DrawTab" "', expected argument " "2"" of type '" "wxDC *""'"); } arg2 = reinterpret_cast< wxDC * >(argp2); + res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_p_wxWindow, 0 | 0 ); + if (!SWIG_IsOK(res3)) { + SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "AuiTabArt_DrawTab" "', expected argument " "3"" of type '" "wxWindow *""'"); + } + arg3 = reinterpret_cast< wxWindow * >(argp3); { - arg3 = &temp3; - if ( ! wxRect_helper(obj2, &arg3)) SWIG_fail; + arg4 = &temp4; + if ( ! wxRect_helper(obj3, &arg4)) SWIG_fail; } { - arg4 = wxString_in_helper(obj3); - if (arg4 == NULL) SWIG_fail; - temp4 = true; + arg5 = wxString_in_helper(obj4); + if (arg5 == NULL) SWIG_fail; + temp5 = true; } - ecode5 = SWIG_AsVal_bool(obj4, &val5); - if (!SWIG_IsOK(ecode5)) { - SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "AuiTabArt_DrawTab" "', expected argument " "5"" of type '" "bool""'"); - } - arg5 = static_cast< bool >(val5); - ecode6 = SWIG_AsVal_int(obj5, &val6); + ecode6 = SWIG_AsVal_bool(obj5, &val6); if (!SWIG_IsOK(ecode6)) { - SWIG_exception_fail(SWIG_ArgError(ecode6), "in method '" "AuiTabArt_DrawTab" "', expected argument " "6"" of type '" "int""'"); + SWIG_exception_fail(SWIG_ArgError(ecode6), "in method '" "AuiTabArt_DrawTab" "', expected argument " "6"" of type '" "bool""'"); } - arg6 = static_cast< int >(val6); - res7 = SWIG_ConvertPtr(obj6, &argp7,SWIGTYPE_p_wxRect, 0 | 0 ); - if (!SWIG_IsOK(res7)) { - SWIG_exception_fail(SWIG_ArgError(res7), "in method '" "AuiTabArt_DrawTab" "', expected argument " "7"" of type '" "wxRect *""'"); - } - arg7 = reinterpret_cast< wxRect * >(argp7); + arg6 = static_cast< bool >(val6); + ecode7 = SWIG_AsVal_int(obj6, &val7); + if (!SWIG_IsOK(ecode7)) { + SWIG_exception_fail(SWIG_ArgError(ecode7), "in method '" "AuiTabArt_DrawTab" "', expected argument " "7"" of type '" "int""'"); + } + arg7 = static_cast< int >(val7); res8 = SWIG_ConvertPtr(obj7, &argp8,SWIGTYPE_p_wxRect, 0 | 0 ); if (!SWIG_IsOK(res8)) { SWIG_exception_fail(SWIG_ArgError(res8), "in method '" "AuiTabArt_DrawTab" "', expected argument " "8"" of type '" "wxRect *""'"); } arg8 = reinterpret_cast< wxRect * >(argp8); - res9 = SWIG_ConvertPtr(obj8, &argp9,SWIGTYPE_p_int, 0 | 0 ); + res9 = SWIG_ConvertPtr(obj8, &argp9,SWIGTYPE_p_wxRect, 0 | 0 ); if (!SWIG_IsOK(res9)) { - SWIG_exception_fail(SWIG_ArgError(res9), "in method '" "AuiTabArt_DrawTab" "', expected argument " "9"" of type '" "int *""'"); + SWIG_exception_fail(SWIG_ArgError(res9), "in method '" "AuiTabArt_DrawTab" "', expected argument " "9"" of type '" "wxRect *""'"); } - arg9 = reinterpret_cast< int * >(argp9); + arg9 = reinterpret_cast< wxRect * >(argp9); + res10 = SWIG_ConvertPtr(obj9, &argp10,SWIGTYPE_p_int, 0 | 0 ); + if (!SWIG_IsOK(res10)) { + SWIG_exception_fail(SWIG_ArgError(res10), "in method '" "AuiTabArt_DrawTab" "', expected argument " "10"" of type '" "int *""'"); + } + arg10 = reinterpret_cast< int * >(argp10); { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->DrawTab(arg2,(wxRect const &)*arg3,(wxString const &)*arg4,arg5,arg6,arg7,arg8,arg9); + (arg1)->DrawTab(arg2,arg3,(wxRect const &)*arg4,(wxString const &)*arg5,arg6,arg7,arg8,arg9,arg10); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } resultobj = SWIG_Py_Void(); { - if (temp4) - delete arg4; + if (temp5) + delete arg5; } return resultobj; fail: { - if (temp4) - delete arg4; + if (temp5) + delete arg5; } return NULL; } @@ -11661,27 +11700,30 @@ SWIGINTERN PyObject *_wrap_AuiTabArt_DrawButton(PyObject *SWIGUNUSEDPARM(self), PyObject *resultobj = 0; wxAuiTabArt *arg1 = (wxAuiTabArt *) 0 ; wxDC *arg2 = (wxDC *) 0 ; - wxRect *arg3 = 0 ; - int arg4 ; + wxWindow *arg3 = (wxWindow *) 0 ; + wxRect *arg4 = 0 ; int arg5 ; int arg6 ; - wxBitmap *arg7 = 0 ; - wxRect *arg8 = (wxRect *) 0 ; + int arg7 ; + wxBitmap *arg8 = 0 ; + wxRect *arg9 = (wxRect *) 0 ; void *argp1 = 0 ; int res1 = 0 ; void *argp2 = 0 ; int res2 = 0 ; - wxRect temp3 ; - int val4 ; - int ecode4 = 0 ; + void *argp3 = 0 ; + int res3 = 0 ; + wxRect temp4 ; int val5 ; int ecode5 = 0 ; int val6 ; int ecode6 = 0 ; - void *argp7 = 0 ; - int res7 = 0 ; + int val7 ; + int ecode7 = 0 ; void *argp8 = 0 ; int res8 = 0 ; + void *argp9 = 0 ; + int res9 = 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; @@ -11690,11 +11732,12 @@ SWIGINTERN PyObject *_wrap_AuiTabArt_DrawButton(PyObject *SWIGUNUSEDPARM(self), PyObject * obj5 = 0 ; PyObject * obj6 = 0 ; PyObject * obj7 = 0 ; + PyObject * obj8 = 0 ; char * kwnames[] = { - (char *) "self",(char *) "dc",(char *) "in_rect",(char *) "bitmap_id",(char *) "button_state",(char *) "orientation",(char *) "bitmap_override",(char *) "out_rect", NULL + (char *) "self",(char *) "dc",(char *) "wnd",(char *) "in_rect",(char *) "bitmap_id",(char *) "button_state",(char *) "orientation",(char *) "bitmap_override",(char *) "out_rect", NULL }; - if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOOOO:AuiTabArt_DrawButton",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) SWIG_fail; + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOOOOO:AuiTabArt_DrawButton",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8)) SWIG_fail; res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxAuiTabArt, 0 | 0 ); if (!SWIG_IsOK(res1)) { SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AuiTabArt_DrawButton" "', expected argument " "1"" of type '" "wxAuiTabArt *""'"); @@ -11705,15 +11748,15 @@ SWIGINTERN PyObject *_wrap_AuiTabArt_DrawButton(PyObject *SWIGUNUSEDPARM(self), SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "AuiTabArt_DrawButton" "', expected argument " "2"" of type '" "wxDC *""'"); } arg2 = reinterpret_cast< wxDC * >(argp2); + res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_p_wxWindow, 0 | 0 ); + if (!SWIG_IsOK(res3)) { + SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "AuiTabArt_DrawButton" "', expected argument " "3"" of type '" "wxWindow *""'"); + } + arg3 = reinterpret_cast< wxWindow * >(argp3); { - arg3 = &temp3; - if ( ! wxRect_helper(obj2, &arg3)) SWIG_fail; + arg4 = &temp4; + if ( ! wxRect_helper(obj3, &arg4)) SWIG_fail; } - ecode4 = SWIG_AsVal_int(obj3, &val4); - if (!SWIG_IsOK(ecode4)) { - SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "AuiTabArt_DrawButton" "', expected argument " "4"" of type '" "int""'"); - } - arg4 = static_cast< int >(val4); ecode5 = SWIG_AsVal_int(obj4, &val5); if (!SWIG_IsOK(ecode5)) { SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "AuiTabArt_DrawButton" "', expected argument " "5"" of type '" "int""'"); @@ -11724,22 +11767,27 @@ SWIGINTERN PyObject *_wrap_AuiTabArt_DrawButton(PyObject *SWIGUNUSEDPARM(self), SWIG_exception_fail(SWIG_ArgError(ecode6), "in method '" "AuiTabArt_DrawButton" "', expected argument " "6"" of type '" "int""'"); } arg6 = static_cast< int >(val6); - res7 = SWIG_ConvertPtr(obj6, &argp7, SWIGTYPE_p_wxBitmap, 0 | 0); - if (!SWIG_IsOK(res7)) { - SWIG_exception_fail(SWIG_ArgError(res7), "in method '" "AuiTabArt_DrawButton" "', expected argument " "7"" of type '" "wxBitmap const &""'"); + ecode7 = SWIG_AsVal_int(obj6, &val7); + if (!SWIG_IsOK(ecode7)) { + SWIG_exception_fail(SWIG_ArgError(ecode7), "in method '" "AuiTabArt_DrawButton" "', expected argument " "7"" of type '" "int""'"); + } + arg7 = static_cast< int >(val7); + res8 = SWIG_ConvertPtr(obj7, &argp8, SWIGTYPE_p_wxBitmap, 0 | 0); + if (!SWIG_IsOK(res8)) { + SWIG_exception_fail(SWIG_ArgError(res8), "in method '" "AuiTabArt_DrawButton" "', expected argument " "8"" of type '" "wxBitmap const &""'"); } - if (!argp7) { - SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "AuiTabArt_DrawButton" "', expected argument " "7"" of type '" "wxBitmap const &""'"); + if (!argp8) { + SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "AuiTabArt_DrawButton" "', expected argument " "8"" of type '" "wxBitmap const &""'"); } - arg7 = reinterpret_cast< wxBitmap * >(argp7); - res8 = SWIG_ConvertPtr(obj7, &argp8,SWIGTYPE_p_wxRect, 0 | 0 ); - if (!SWIG_IsOK(res8)) { - SWIG_exception_fail(SWIG_ArgError(res8), "in method '" "AuiTabArt_DrawButton" "', expected argument " "8"" of type '" "wxRect *""'"); + arg8 = reinterpret_cast< wxBitmap * >(argp8); + res9 = SWIG_ConvertPtr(obj8, &argp9,SWIGTYPE_p_wxRect, 0 | 0 ); + if (!SWIG_IsOK(res9)) { + SWIG_exception_fail(SWIG_ArgError(res9), "in method '" "AuiTabArt_DrawButton" "', expected argument " "9"" of type '" "wxRect *""'"); } - arg8 = reinterpret_cast< wxRect * >(argp8); + arg9 = reinterpret_cast< wxRect * >(argp9); { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->DrawButton(arg2,(wxRect const &)*arg3,arg4,arg5,arg6,(wxBitmap const &)*arg7,arg8); + (arg1)->DrawButton(arg2,arg3,(wxRect const &)*arg4,arg5,arg6,arg7,(wxBitmap const &)*arg8,arg9); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } @@ -11750,37 +11798,115 @@ fail: } +SWIGINTERN PyObject *_wrap_AuiTabArt_ShowWindowList(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { + PyObject *resultobj = 0; + wxAuiTabArt *arg1 = (wxAuiTabArt *) 0 ; + wxWindow *arg2 = (wxWindow *) 0 ; + wxArrayString *arg3 = 0 ; + int arg4 ; + int result; + void *argp1 = 0 ; + int res1 = 0 ; + void *argp2 = 0 ; + int res2 = 0 ; + bool temp3 = false ; + int val4 ; + int ecode4 = 0 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + char * kwnames[] = { + (char *) "self",(char *) "wnd",(char *) "items",(char *) "active_idx", NULL + }; + + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:AuiTabArt_ShowWindowList",kwnames,&obj0,&obj1,&obj2,&obj3)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxAuiTabArt, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AuiTabArt_ShowWindowList" "', expected argument " "1"" of type '" "wxAuiTabArt *""'"); + } + arg1 = reinterpret_cast< wxAuiTabArt * >(argp1); + res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_wxWindow, 0 | 0 ); + if (!SWIG_IsOK(res2)) { + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "AuiTabArt_ShowWindowList" "', expected argument " "2"" of type '" "wxWindow *""'"); + } + arg2 = reinterpret_cast< wxWindow * >(argp2); + { + if (! PySequence_Check(obj2)) { + PyErr_SetString(PyExc_TypeError, "Sequence of strings expected."); + SWIG_fail; + } + arg3 = new wxArrayString; + temp3 = true; + int i, len=PySequence_Length(obj2); + for (i=0; iAdd(*s); + delete s; + Py_DECREF(item); + } + } + ecode4 = SWIG_AsVal_int(obj3, &val4); + if (!SWIG_IsOK(ecode4)) { + SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "AuiTabArt_ShowWindowList" "', expected argument " "4"" of type '" "int""'"); + } + arg4 = static_cast< int >(val4); + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (int)(arg1)->ShowWindowList(arg2,(wxArrayString const &)*arg3,arg4); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_From_int(static_cast< int >(result)); + { + if (temp3) delete arg3; + } + return resultobj; +fail: + { + if (temp3) delete arg3; + } + return NULL; +} + + SWIGINTERN PyObject *_wrap_AuiTabArt_GetTabSize(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxAuiTabArt *arg1 = (wxAuiTabArt *) 0 ; wxDC *arg2 = (wxDC *) 0 ; - wxString *arg3 = 0 ; - bool arg4 ; - int arg5 ; - int *arg6 = (int *) 0 ; + wxWindow *arg3 = (wxWindow *) 0 ; + wxString *arg4 = 0 ; + bool arg5 ; + int arg6 ; + int *arg7 = (int *) 0 ; wxSize result; void *argp1 = 0 ; int res1 = 0 ; void *argp2 = 0 ; int res2 = 0 ; - bool temp3 = false ; - bool val4 ; - int ecode4 = 0 ; - int val5 ; + void *argp3 = 0 ; + int res3 = 0 ; + bool temp4 = false ; + bool val5 ; int ecode5 = 0 ; - void *argp6 = 0 ; - int res6 = 0 ; + int val6 ; + int ecode6 = 0 ; + void *argp7 = 0 ; + int res7 = 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; PyObject * obj4 = 0 ; PyObject * obj5 = 0 ; + PyObject * obj6 = 0 ; char * kwnames[] = { - (char *) "self",(char *) "dc",(char *) "caption",(char *) "active",(char *) "close_button_state",(char *) "x_extent", NULL + (char *) "self",(char *) "dc",(char *) "wnd",(char *) "caption",(char *) "active",(char *) "close_button_state",(char *) "x_extent", NULL }; - if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO:AuiTabArt_GetTabSize",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail; + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOOO:AuiTabArt_GetTabSize",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) SWIG_fail; res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxAuiTabArt, 0 | 0 ); if (!SWIG_IsOK(res1)) { SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AuiTabArt_GetTabSize" "', expected argument " "1"" of type '" "wxAuiTabArt *""'"); @@ -11791,42 +11917,47 @@ SWIGINTERN PyObject *_wrap_AuiTabArt_GetTabSize(PyObject *SWIGUNUSEDPARM(self), SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "AuiTabArt_GetTabSize" "', expected argument " "2"" of type '" "wxDC *""'"); } arg2 = reinterpret_cast< wxDC * >(argp2); + res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_p_wxWindow, 0 | 0 ); + if (!SWIG_IsOK(res3)) { + SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "AuiTabArt_GetTabSize" "', expected argument " "3"" of type '" "wxWindow *""'"); + } + arg3 = reinterpret_cast< wxWindow * >(argp3); { - arg3 = wxString_in_helper(obj2); - if (arg3 == NULL) SWIG_fail; - temp3 = true; + arg4 = wxString_in_helper(obj3); + if (arg4 == NULL) SWIG_fail; + temp4 = true; } - ecode4 = SWIG_AsVal_bool(obj3, &val4); - if (!SWIG_IsOK(ecode4)) { - SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "AuiTabArt_GetTabSize" "', expected argument " "4"" of type '" "bool""'"); - } - arg4 = static_cast< bool >(val4); - ecode5 = SWIG_AsVal_int(obj4, &val5); + ecode5 = SWIG_AsVal_bool(obj4, &val5); if (!SWIG_IsOK(ecode5)) { - SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "AuiTabArt_GetTabSize" "', expected argument " "5"" of type '" "int""'"); + SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "AuiTabArt_GetTabSize" "', expected argument " "5"" of type '" "bool""'"); } - arg5 = static_cast< int >(val5); - res6 = SWIG_ConvertPtr(obj5, &argp6,SWIGTYPE_p_int, 0 | 0 ); - if (!SWIG_IsOK(res6)) { - SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "AuiTabArt_GetTabSize" "', expected argument " "6"" of type '" "int *""'"); + arg5 = static_cast< bool >(val5); + ecode6 = SWIG_AsVal_int(obj5, &val6); + if (!SWIG_IsOK(ecode6)) { + SWIG_exception_fail(SWIG_ArgError(ecode6), "in method '" "AuiTabArt_GetTabSize" "', expected argument " "6"" of type '" "int""'"); + } + arg6 = static_cast< int >(val6); + res7 = SWIG_ConvertPtr(obj6, &argp7,SWIGTYPE_p_int, 0 | 0 ); + if (!SWIG_IsOK(res7)) { + SWIG_exception_fail(SWIG_ArgError(res7), "in method '" "AuiTabArt_GetTabSize" "', expected argument " "7"" of type '" "int *""'"); } - arg6 = reinterpret_cast< int * >(argp6); + arg7 = reinterpret_cast< int * >(argp7); { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (arg1)->GetTabSize(arg2,(wxString const &)*arg3,arg4,arg5,arg6); + result = (arg1)->GetTabSize(arg2,arg3,(wxString const &)*arg4,arg5,arg6,arg7); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } resultobj = SWIG_NewPointerObj((new wxSize(static_cast< const wxSize& >(result))), SWIGTYPE_p_wxSize, SWIG_POINTER_OWN | 0 ); { - if (temp3) - delete arg3; + if (temp4) + delete arg4; } return resultobj; fail: { - if (temp3) - delete arg3; + if (temp4) + delete arg4; } return NULL; } @@ -15161,6 +15292,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"AuiTabArt_DrawBackground", (PyCFunction) _wrap_AuiTabArt_DrawBackground, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"AuiTabArt_DrawTab", (PyCFunction) _wrap_AuiTabArt_DrawTab, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"AuiTabArt_DrawButton", (PyCFunction) _wrap_AuiTabArt_DrawButton, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"AuiTabArt_ShowWindowList", (PyCFunction) _wrap_AuiTabArt_ShowWindowList, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"AuiTabArt_GetTabSize", (PyCFunction) _wrap_AuiTabArt_GetTabSize, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"AuiTabArt_GetBestTabCtrlSize", (PyCFunction) _wrap_AuiTabArt_GetBestTabCtrlSize, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"AuiTabArt_swigregister", AuiTabArt_swigregister, METH_VARARGS, NULL}, @@ -16536,6 +16668,7 @@ static swig_type_info _swigt__p_p_wxMDIParentFrame = {"_p_p_wxMDIParentFrame", 0 static swig_type_info _swigt__p_unsigned_char = {"_p_unsigned_char", "unsigned char *|byte *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_unsigned_int = {"_p_unsigned_int", "unsigned int *|time_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_unsigned_long = {"_p_unsigned_long", "unsigned long *|wxUIntPtr *", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_wxArrayString = {"_p_wxArrayString", "wxArrayString *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_wxAuiDefaultDockArt = {"_p_wxAuiDefaultDockArt", "wxAuiDefaultDockArt *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_wxAuiDefaultTabArt = {"_p_wxAuiDefaultTabArt", "wxAuiDefaultTabArt *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_wxAuiDockArt = {"_p_wxAuiDockArt", "wxAuiDockArt *", 0, 0, (void*)0, 0}; @@ -16770,6 +16903,7 @@ static swig_type_info *swig_type_initial[] = { &_swigt__p_wxANIHandler, &_swigt__p_wxAcceleratorTable, &_swigt__p_wxActivateEvent, + &_swigt__p_wxArrayString, &_swigt__p_wxAuiDefaultDockArt, &_swigt__p_wxAuiDefaultTabArt, &_swigt__p_wxAuiDockArt, @@ -16998,6 +17132,7 @@ static swig_cast_info _swigc__p_p_wxWindow[] = { {&_swigt__p_p_wxSplashScreen, static swig_cast_info _swigc__p_unsigned_char[] = { {&_swigt__p_unsigned_char, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_unsigned_int[] = { {&_swigt__p_unsigned_int, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_unsigned_long[] = { {&_swigt__p_unsigned_long, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_wxArrayString[] = { {&_swigt__p_wxArrayString, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxAuiDefaultDockArt[] = { {&_swigt__p_wxAuiDefaultDockArt, 0, 0, 0}, {&_swigt__p_wxPyAuiDockArt, _p_wxPyAuiDockArtTo_p_wxAuiDefaultDockArt, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxAuiDefaultTabArt[] = { {&_swigt__p_wxAuiDefaultTabArt, 0, 0, 0}, {&_swigt__p_wxPyAuiTabArt, _p_wxPyAuiTabArtTo_p_wxAuiDefaultTabArt, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxAuiDockArt[] = { {&_swigt__p_wxAuiDockArt, 0, 0, 0}, {&_swigt__p_wxAuiDefaultDockArt, _p_wxAuiDefaultDockArtTo_p_wxAuiDockArt, 0, 0}, {&_swigt__p_wxPyAuiDockArt, _p_wxPyAuiDockArtTo_p_wxAuiDockArt, 0, 0},{0, 0, 0, 0}}; @@ -17232,6 +17367,7 @@ static swig_cast_info *swig_cast_initial[] = { _swigc__p_wxANIHandler, _swigc__p_wxAcceleratorTable, _swigc__p_wxActivateEvent, + _swigc__p_wxArrayString, _swigc__p_wxAuiDefaultDockArt, _swigc__p_wxAuiDefaultTabArt, _swigc__p_wxAuiDockArt, @@ -17953,6 +18089,7 @@ SWIGEXPORT void SWIG_init(void) { SWIG_Python_SetConstant(d, "AUI_BUTTON_MINIMIZE",SWIG_From_int(static_cast< int >(wxAUI_BUTTON_MINIMIZE))); SWIG_Python_SetConstant(d, "AUI_BUTTON_PIN",SWIG_From_int(static_cast< int >(wxAUI_BUTTON_PIN))); SWIG_Python_SetConstant(d, "AUI_BUTTON_OPTIONS",SWIG_From_int(static_cast< int >(wxAUI_BUTTON_OPTIONS))); + SWIG_Python_SetConstant(d, "AUI_BUTTON_WINDOWLIST",SWIG_From_int(static_cast< int >(wxAUI_BUTTON_WINDOWLIST))); SWIG_Python_SetConstant(d, "AUI_BUTTON_LEFT",SWIG_From_int(static_cast< int >(wxAUI_BUTTON_LEFT))); SWIG_Python_SetConstant(d, "AUI_BUTTON_RIGHT",SWIG_From_int(static_cast< int >(wxAUI_BUTTON_RIGHT))); SWIG_Python_SetConstant(d, "AUI_BUTTON_UP",SWIG_From_int(static_cast< int >(wxAUI_BUTTON_UP))); @@ -18013,7 +18150,7 @@ SWIGEXPORT void SWIG_init(void) { SWIG_Python_SetConstant(d, "AUI_NB_TAB_SPLIT",SWIG_From_int(static_cast< int >(wxAUI_NB_TAB_SPLIT))); SWIG_Python_SetConstant(d, "AUI_NB_TAB_MOVE",SWIG_From_int(static_cast< int >(wxAUI_NB_TAB_MOVE))); SWIG_Python_SetConstant(d, "AUI_NB_SCROLL_BUTTONS",SWIG_From_int(static_cast< int >(wxAUI_NB_SCROLL_BUTTONS))); - SWIG_Python_SetConstant(d, "AUI_NB_PAGELIST_BUTTON",SWIG_From_int(static_cast< int >(wxAUI_NB_PAGELIST_BUTTON))); + SWIG_Python_SetConstant(d, "AUI_NB_WINDOWLIST_BUTTON",SWIG_From_int(static_cast< int >(wxAUI_NB_WINDOWLIST_BUTTON))); SWIG_Python_SetConstant(d, "AUI_NB_CLOSE_BUTTON",SWIG_From_int(static_cast< int >(wxAUI_NB_CLOSE_BUTTON))); SWIG_Python_SetConstant(d, "AUI_NB_CLOSE_ON_ACTIVE_TAB",SWIG_From_int(static_cast< int >(wxAUI_NB_CLOSE_ON_ACTIVE_TAB))); SWIG_Python_SetConstant(d, "AUI_NB_CLOSE_ON_ALL_TABS",SWIG_From_int(static_cast< int >(wxAUI_NB_CLOSE_ON_ALL_TABS))); diff --git a/wxPython/src/msw/_controls.py b/wxPython/src/msw/_controls.py index b9168da03a..3179e88913 100644 --- a/wxPython/src/msw/_controls.py +++ b/wxPython/src/msw/_controls.py @@ -5765,6 +5765,7 @@ class PyControl(_core.Control): """_setCallbackInfo(self, PyObject self, PyObject _class)""" return _controls_.PyControl__setCallbackInfo(*args, **kwargs) + SetBestSize = wx.Window.SetInitialSize def DoEraseBackground(*args, **kwargs): """DoEraseBackground(self, DC dc) -> bool""" return _controls_.PyControl_DoEraseBackground(*args, **kwargs) diff --git a/wxPython/src/msw/_gdi.py b/wxPython/src/msw/_gdi.py index ec4122bace..9e0e22fa41 100644 --- a/wxPython/src/msw/_gdi.py +++ b/wxPython/src/msw/_gdi.py @@ -4580,69 +4580,6 @@ _gdi_.DCClipper_swigregister(DCClipper) #--------------------------------------------------------------------------- -class MemoryDC(DC): - """ - A memory device context provides a means to draw graphics onto a - bitmap. A bitmap must be selected into the new memory DC before it may - be used for anything. Typical usage is as follows:: - - dc = wx.MemoryDC() - dc.SelectObject(bitmap) - # draw on the dc using any of the Draw methods - dc.SelectObject(wx.NullBitmap) - # the bitmap now contains wahtever was drawn upon it - - Note that the memory DC *must* be deleted (or the bitmap selected out - of it) before a bitmap can be reselected into another memory DC. - - """ - thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag') - __repr__ = _swig_repr - def __init__(self, *args, **kwargs): - """ - __init__(self, Bitmap bitmap=NullBitmap) -> MemoryDC - - Constructs a new memory device context. - - Use the Ok member to test whether the constructor was successful in - creating a usable device context. If a bitmap is not given to this - constructor then don't forget to select a bitmap into the DC before - drawing on it. - """ - _gdi_.MemoryDC_swiginit(self,_gdi_.new_MemoryDC(*args, **kwargs)) - def SelectObject(*args, **kwargs): - """ - SelectObject(self, Bitmap bitmap) - - Selects the bitmap into the device context, to use as the memory - bitmap. Selecting the bitmap into a memory DC allows you to draw into - the DC, and therefore the bitmap, and also to use Blit to copy the - bitmap to a window. - - If the argument is wx.NullBitmap (or some other uninitialised - `wx.Bitmap`) the current bitmap is selected out of the device context, - and the original bitmap restored, allowing the current bitmap to be - destroyed safely. - """ - return _gdi_.MemoryDC_SelectObject(*args, **kwargs) - - def SelectObjectAsSource(*args, **kwargs): - """SelectObjectAsSource(self, Bitmap bmp)""" - return _gdi_.MemoryDC_SelectObjectAsSource(*args, **kwargs) - -_gdi_.MemoryDC_swigregister(MemoryDC) - -def MemoryDCFromDC(*args, **kwargs): - """ - MemoryDCFromDC(DC oldDC) -> MemoryDC - - Creates a DC that is compatible with the oldDC. - """ - val = _gdi_.new_MemoryDCFromDC(*args, **kwargs) - return val - -#--------------------------------------------------------------------------- - class ScreenDC(DC): """ A wxScreenDC can be used to paint anywhere on the screen. This should @@ -4784,6 +4721,69 @@ _gdi_.PaintDC_swigregister(PaintDC) #--------------------------------------------------------------------------- +class MemoryDC(WindowDC): + """ + A memory device context provides a means to draw graphics onto a + bitmap. A bitmap must be selected into the new memory DC before it may + be used for anything. Typical usage is as follows:: + + dc = wx.MemoryDC() + dc.SelectObject(bitmap) + # draw on the dc using any of the Draw methods + dc.SelectObject(wx.NullBitmap) + # the bitmap now contains wahtever was drawn upon it + + Note that the memory DC *must* be deleted (or the bitmap selected out + of it) before a bitmap can be reselected into another memory DC. + + """ + thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag') + __repr__ = _swig_repr + def __init__(self, *args, **kwargs): + """ + __init__(self, Bitmap bitmap=NullBitmap) -> MemoryDC + + Constructs a new memory device context. + + Use the Ok member to test whether the constructor was successful in + creating a usable device context. If a bitmap is not given to this + constructor then don't forget to select a bitmap into the DC before + drawing on it. + """ + _gdi_.MemoryDC_swiginit(self,_gdi_.new_MemoryDC(*args, **kwargs)) + def SelectObject(*args, **kwargs): + """ + SelectObject(self, Bitmap bitmap) + + Selects the bitmap into the device context, to use as the memory + bitmap. Selecting the bitmap into a memory DC allows you to draw into + the DC, and therefore the bitmap, and also to use Blit to copy the + bitmap to a window. + + If the argument is wx.NullBitmap (or some other uninitialised + `wx.Bitmap`) the current bitmap is selected out of the device context, + and the original bitmap restored, allowing the current bitmap to be + destroyed safely. + """ + return _gdi_.MemoryDC_SelectObject(*args, **kwargs) + + def SelectObjectAsSource(*args, **kwargs): + """SelectObjectAsSource(self, Bitmap bmp)""" + return _gdi_.MemoryDC_SelectObjectAsSource(*args, **kwargs) + +_gdi_.MemoryDC_swigregister(MemoryDC) + +def MemoryDCFromDC(*args, **kwargs): + """ + MemoryDCFromDC(DC oldDC) -> MemoryDC + + Creates a DC that is compatible with the oldDC. + """ + val = _gdi_.new_MemoryDCFromDC(*args, **kwargs) + return val + +#--------------------------------------------------------------------------- + BUFFER_VIRTUAL_AREA = _gdi_.BUFFER_VIRTUAL_AREA BUFFER_CLIENT_AREA = _gdi_.BUFFER_CLIENT_AREA class BufferedDC(MemoryDC): @@ -5071,63 +5071,134 @@ _gdi_.PrinterDC_swigregister(PrinterDC) #--------------------------------------------------------------------------- class GraphicsObject(_core.Object): - """Proxy of C++ GraphicsObject class""" + """ + This class is the superclass of native graphics objects like pens + etc. It provides the internal reference counting. It is not to be + instantiated by user code. + """ thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag') __repr__ = _swig_repr def __init__(self, *args, **kwargs): - """__init__(self, GraphicsRenderer renderer=None) -> GraphicsObject""" + """ + __init__(self, GraphicsRenderer renderer=None) -> GraphicsObject + + This class is the superclass of native graphics objects like pens + etc. It provides the internal reference counting. It is not to be + instantiated by user code. + """ _gdi_.GraphicsObject_swiginit(self,_gdi_.new_GraphicsObject(*args, **kwargs)) __swig_destroy__ = _gdi_.delete_GraphicsObject __del__ = lambda self : None; def IsNull(*args, **kwargs): - """IsNull(self) -> bool""" + """ + IsNull(self) -> bool + + Is this object valid (false) or still empty (true)? + """ return _gdi_.GraphicsObject_IsNull(*args, **kwargs) def GetRenderer(*args, **kwargs): - """GetRenderer(self) -> GraphicsRenderer""" + """ + GetRenderer(self) -> GraphicsRenderer + + Returns the renderer that was used to create this instance, or + ``None`` if it has not been initialized yet. + """ return _gdi_.GraphicsObject_GetRenderer(*args, **kwargs) _gdi_.GraphicsObject_swigregister(GraphicsObject) class GraphicsPen(GraphicsObject): - """Proxy of C++ GraphicsPen class""" + """ + A wx.GraphicsPen is a native representation of a pen. It is used for + stroking a path on a `wx.GraphicsContext`. The contents are specific and + private to the respective renderer. The only way to get a valid instance + is via a CreatePen call on the graphics context or the renderer + instance. + """ thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag') __repr__ = _swig_repr def __init__(self, *args, **kwargs): - """__init__(self) -> GraphicsPen""" + """ + __init__(self) -> GraphicsPen + + A wx.GraphicsPen is a native representation of a pen. It is used for + stroking a path on a `wx.GraphicsContext`. The contents are specific and + private to the respective renderer. The only way to get a valid instance + is via a CreatePen call on the graphics context or the renderer + instance. + """ _gdi_.GraphicsPen_swiginit(self,_gdi_.new_GraphicsPen(*args, **kwargs)) __swig_destroy__ = _gdi_.delete_GraphicsPen __del__ = lambda self : None; _gdi_.GraphicsPen_swigregister(GraphicsPen) class GraphicsBrush(GraphicsObject): - """Proxy of C++ GraphicsBrush class""" + """ + A wx.GraphicsBrush is a native representation of a brush. It is used + for filling a path on a `wx.GraphicsContext`. The contents are + specific and private to the respective renderer. The only way to get a + valid instance is via a Create...Brush call on the graphics context or + the renderer instance. + """ thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag') __repr__ = _swig_repr def __init__(self, *args, **kwargs): - """__init__(self) -> GraphicsBrush""" + """ + __init__(self) -> GraphicsBrush + + A wx.GraphicsBrush is a native representation of a brush. It is used + for filling a path on a `wx.GraphicsContext`. The contents are + specific and private to the respective renderer. The only way to get a + valid instance is via a Create...Brush call on the graphics context or + the renderer instance. + """ _gdi_.GraphicsBrush_swiginit(self,_gdi_.new_GraphicsBrush(*args, **kwargs)) __swig_destroy__ = _gdi_.delete_GraphicsBrush __del__ = lambda self : None; _gdi_.GraphicsBrush_swigregister(GraphicsBrush) class GraphicsFont(GraphicsObject): - """Proxy of C++ GraphicsFont class""" + """ + A `wx.GraphicsFont` is a native representation of a font (including + text colour). The contents are specific an private to the respective + renderer. The only way to get a valid instance is via a CreateFont + call on the graphics context or the renderer instance. + """ thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag') __repr__ = _swig_repr def __init__(self, *args, **kwargs): - """__init__(self) -> GraphicsFont""" + """ + __init__(self) -> GraphicsFont + + A `wx.GraphicsFont` is a native representation of a font (including + text colour). The contents are specific an private to the respective + renderer. The only way to get a valid instance is via a CreateFont + call on the graphics context or the renderer instance. + """ _gdi_.GraphicsFont_swiginit(self,_gdi_.new_GraphicsFont(*args, **kwargs)) __swig_destroy__ = _gdi_.delete_GraphicsFont __del__ = lambda self : None; _gdi_.GraphicsFont_swigregister(GraphicsFont) class GraphicsMatrix(GraphicsObject): - """Proxy of C++ GraphicsMatrix class""" + """ + A wx.GraphicsMatrix is a native representation of an affine + matrix. The contents are specific an private to the respective + renderer. The only way to get a valid instance is via a CreateMatrix + call on the graphics context or the renderer instance. + """ thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag') __repr__ = _swig_repr def __init__(self, *args, **kwargs): - """__init__(self) -> GraphicsMatrix""" + """ + __init__(self) -> GraphicsMatrix + + A wx.GraphicsMatrix is a native representation of an affine + matrix. The contents are specific an private to the respective + renderer. The only way to get a valid instance is via a CreateMatrix + call on the graphics context or the renderer instance. + """ _gdi_.GraphicsMatrix_swiginit(self,_gdi_.new_GraphicsMatrix(*args, **kwargs)) __swig_destroy__ = _gdi_.delete_GraphicsMatrix __del__ = lambda self : None; @@ -5135,24 +5206,17 @@ class GraphicsMatrix(GraphicsObject): """ Concat(self, GraphicsMatrix t) - concatenates the matrix + Concatenates the passed in matrix to the current matrix. """ return _gdi_.GraphicsMatrix_Concat(*args, **kwargs) - def Copy(*args, **kwargs): - """ - Copy(self, GraphicsMatrix t) - - Copy the passed in matrix to this one. - """ - return _gdi_.GraphicsMatrix_Copy(*args, **kwargs) - def Set(*args, **kwargs): """ Set(self, Double a=1.0, Double b=0.0, Double c=0.0, Double d=1.0, Double tx=0.0, Double ty=0.0) - sets the matrix to the respective values + Sets the matrix to the specified values (default values are the + identity matrix.) """ return _gdi_.GraphicsMatrix_Set(*args, **kwargs) @@ -5160,7 +5224,7 @@ class GraphicsMatrix(GraphicsObject): """ Invert(self) - makes this the inverse matrix + Inverts the matrix. """ return _gdi_.GraphicsMatrix_Invert(*args, **kwargs) @@ -5168,7 +5232,7 @@ class GraphicsMatrix(GraphicsObject): """ IsEqual(self, GraphicsMatrix t) -> bool - returns true if the elements of the transformation matrix are equal + Returns ``True`` if the elements of the transformation matrix are equal """ return _gdi_.GraphicsMatrix_IsEqual(*args, **kwargs) @@ -5176,7 +5240,7 @@ class GraphicsMatrix(GraphicsObject): """ IsIdentity(self) -> bool - return true if this is the identity matrix + Returns ``True`` if this is the identity matrix """ return _gdi_.GraphicsMatrix_IsIdentity(*args, **kwargs) @@ -5184,7 +5248,7 @@ class GraphicsMatrix(GraphicsObject): """ Translate(self, Double dx, Double dy) - add the translation to this matrix + Add a translation to this matrix. """ return _gdi_.GraphicsMatrix_Translate(*args, **kwargs) @@ -5192,7 +5256,7 @@ class GraphicsMatrix(GraphicsObject): """ Scale(self, Double xScale, Double yScale) - add the scale to this matrix + Scales this matrix. """ return _gdi_.GraphicsMatrix_Scale(*args, **kwargs) @@ -5200,7 +5264,7 @@ class GraphicsMatrix(GraphicsObject): """ Rotate(self, Double angle) - add the rotation to this matrix (radians) + Rotates this matrix. The angle should be specified in radians. """ return _gdi_.GraphicsMatrix_Rotate(*args, **kwargs) @@ -5208,7 +5272,7 @@ class GraphicsMatrix(GraphicsObject): """ TransformPoint(self, x, y) --> (x, y) - applies that matrix to the point + Applies this matrix to a point, returns the resulting point values """ return _gdi_.GraphicsMatrix_TransformPoint(*args, **kwargs) @@ -5216,7 +5280,8 @@ class GraphicsMatrix(GraphicsObject): """ TransformDistance(self, dx, dy) --> (dx, dy) - applies the matrix except for translations + Applies this matrix to a distance (ie. performs all transforms except + translations) """ return _gdi_.GraphicsMatrix_TransformDistance(*args, **kwargs) @@ -5224,7 +5289,10 @@ class GraphicsMatrix(GraphicsObject): """ GetNativeMatrix(self) -> void - returns the native representation + Returns the native representation of the matrix. For CoreGraphics this + is a CFAffineMatrix pointer. For GDIPlus a Matrix Pointer and for + Cairo a cairo_matrix_t pointer. NOTE: For wxPython we still need a + way to make this value usable. """ return _gdi_.GraphicsMatrix_GetNativeMatrix(*args, **kwargs) @@ -5244,7 +5312,7 @@ class GraphicsPath(GraphicsObject): MoveToPoint(self, Double x, Double y) MoveToPoint(self, Point2D p) - Begins a new subpath at (x,y) + Begins a new subpath at the specified point. """ return _gdi_.GraphicsPath_MoveToPoint(*args) @@ -5253,7 +5321,7 @@ class GraphicsPath(GraphicsObject): AddLineToPoint(self, Double x, Double y) AddLineToPoint(self, Point2D p) - Adds a straight line from the current point to (x,y) + Adds a straight line from the current point to the specified point. """ return _gdi_.GraphicsPath_AddLineToPoint(*args) @@ -5272,7 +5340,7 @@ class GraphicsPath(GraphicsObject): """ AddPath(self, GraphicsPath path) - adds another path + Adds another path """ return _gdi_.GraphicsPath_AddPath(*args, **kwargs) @@ -5280,7 +5348,7 @@ class GraphicsPath(GraphicsObject): """ CloseSubpath(self) - closes the current sub-path + Closes the current sub-path. """ return _gdi_.GraphicsPath_CloseSubpath(*args, **kwargs) @@ -5317,7 +5385,7 @@ class GraphicsPath(GraphicsObject): """ AddRectangle(self, Double x, Double y, Double w, Double h) - Appends a rectangle as a new closed subpath + Appends a rectangle as a new closed subpath. """ return _gdi_.GraphicsPath_AddRectangle(*args, **kwargs) @@ -5325,7 +5393,7 @@ class GraphicsPath(GraphicsObject): """ AddCircle(self, Double x, Double y, Double r) - Appends a circle as a new closed subpath with the given radius. + Appends a circle around (x,y) with radius r as a new closed subpath. """ return _gdi_.GraphicsPath_AddCircle(*args, **kwargs) @@ -5333,7 +5401,7 @@ class GraphicsPath(GraphicsObject): """ AddArcToPoint(self, Double x1, Double y1, Double x2, Double y2, Double r) - Draws a an arc to two tangents connecting (current) to (x1,y1) and (x1,y1) + Appends an arc to two tangents connecting (current) to (x1,y1) and (x1,y1) to (x2,y2), also a straight line from (current) to (x1,y1) """ return _gdi_.GraphicsPath_AddArcToPoint(*args, **kwargs) @@ -5342,7 +5410,7 @@ class GraphicsPath(GraphicsObject): """ AddEllipse(self, Double x, Double y, Double w, Double h) - appends an ellipse + Appends an ellipse fitting into the passed in rectangle. """ return _gdi_.GraphicsPath_AddEllipse(*args, **kwargs) @@ -5350,7 +5418,7 @@ class GraphicsPath(GraphicsObject): """ AddRoundedRectangle(self, Double x, Double y, Double w, Double h, Double radius) - appends a rounded rectangle + Appends a rounded rectangle. """ return _gdi_.GraphicsPath_AddRoundedRectangle(*args, **kwargs) @@ -5358,7 +5426,9 @@ class GraphicsPath(GraphicsObject): """ GetNativePath(self) -> void - returns the native path + Returns the native path (CGPathRef for Core Graphics, Path pointer for + GDIPlus and a cairo_path_t pointer for cairo). NOTE: For wxPython we + still need a way to make this value usable. """ return _gdi_.GraphicsPath_GetNativePath(*args, **kwargs) @@ -5366,8 +5436,9 @@ class GraphicsPath(GraphicsObject): """ UnGetNativePath(self, void p) - give the native path returned by GetNativePath() back (there might be some - deallocations necessary) + Gives back the native path returned by GetNativePath() because there + might be some deallocations necessary (eg on cairo the native path + returned by GetNativePath is newly allocated each time). """ return _gdi_.GraphicsPath_UnGetNativePath(*args, **kwargs) @@ -5375,7 +5446,7 @@ class GraphicsPath(GraphicsObject): """ Transform(self, GraphicsMatrix matrix) - transforms each point of this path by the matrix + Transforms each point of this path by the matrix """ return _gdi_.GraphicsPath_Transform(*args, **kwargs) @@ -5383,7 +5454,7 @@ class GraphicsPath(GraphicsObject): """ GetBox(self) -> wxRect2DDouble - gets the bounding box enclosing all points (possibly including control points) + Gets the bounding box enclosing all points (possibly including control points) """ return _gdi_.GraphicsPath_GetBox(*args, **kwargs) @@ -5391,13 +5462,21 @@ class GraphicsPath(GraphicsObject): """ Contains(self, Double x, Double y, int fillStyle=ODDEVEN_RULE) -> bool Contains(self, wxPoint2DDouble c, int fillStyle=ODDEVEN_RULE) -> bool + + Returns ``True`` if the point is within the path. """ return _gdi_.GraphicsPath_Contains(*args) _gdi_.GraphicsPath_swigregister(GraphicsPath) class GraphicsContext(GraphicsObject): - """Proxy of C++ GraphicsContext class""" + """ + A `wx.GraphicsContext` instance is the object that is drawn upon. It is + created by a renderer using the CreateContext calls, this can be done + either directly using a renderer instance, or indirectly using the + static convenience CreateXXX functions of wx.GraphicsContext that + always delegate the task to the default renderer. + """ thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag') def __init__(self): raise AttributeError, "No constructor defined" __repr__ = _swig_repr @@ -5407,6 +5486,8 @@ class GraphicsContext(GraphicsObject): """ Create(WindowDC dc) -> GraphicsContext Create(Window window) -> GraphicsContext + + Creates a wx.GraphicsContext either from a window or a DC. """ val = _gdi_.GraphicsContext_Create(*args) val.__dc = args[0] # save a ref so the dc will not be deleted before self @@ -5414,12 +5495,22 @@ class GraphicsContext(GraphicsObject): Create = staticmethod(Create) def CreateFromNative(*args, **kwargs): - """CreateFromNative(void context) -> GraphicsContext""" + """ + CreateFromNative(void context) -> GraphicsContext + + Creates a wx.GraphicsContext from a native context. This native context + must be eg a CGContextRef for Core Graphics, a Graphics pointer for + GDIPlus or a cairo_t pointer for Cairo. + """ return _gdi_.GraphicsContext_CreateFromNative(*args, **kwargs) CreateFromNative = staticmethod(CreateFromNative) def CreateFromNativeWindow(*args, **kwargs): - """CreateFromNativeWindow(void window) -> GraphicsContext""" + """ + CreateFromNativeWindow(void window) -> GraphicsContext + + Creates a wx.GraphicsContext from a native window. + """ return _gdi_.GraphicsContext_CreateFromNativeWindow(*args, **kwargs) CreateFromNativeWindow = staticmethod(CreateFromNativeWindow) @@ -5427,16 +5518,24 @@ class GraphicsContext(GraphicsObject): """ CreatePath(self) -> GraphicsPath - creates a path instance that corresponds to the type of graphics context, ie GDIPlus, Cairo, CoreGraphics ... + Creates a native graphics path which is initially empty. """ return _gdi_.GraphicsContext_CreatePath(*args, **kwargs) def CreatePen(*args, **kwargs): - """CreatePen(self, Pen pen) -> GraphicsPen""" + """ + CreatePen(self, Pen pen) -> GraphicsPen + + Creates a native pen from a `wx.Pen`. + """ return _gdi_.GraphicsContext_CreatePen(*args, **kwargs) def CreateBrush(*args, **kwargs): - """CreateBrush(self, Brush brush) -> GraphicsBrush""" + """ + CreateBrush(self, Brush brush) -> GraphicsBrush + + Creates a native brush from a `wx.Brush`. + """ return _gdi_.GraphicsContext_CreateBrush(*args, **kwargs) def CreateLinearGradientBrush(*args, **kwargs): @@ -5444,8 +5543,8 @@ class GraphicsContext(GraphicsObject): CreateLinearGradientBrush(self, Double x1, Double y1, Double x2, Double y2, Colour c1, Colour c2) -> GraphicsBrush - sets the brush to a linear gradient, starting at (x1,y1) with color c1 - to (x2,y2) with color c2 + Creates a native brush, having a linear gradient, starting at (x1,y1) + with color c1 to (x2,y2) with color c2. """ return _gdi_.GraphicsContext_CreateLinearGradientBrush(*args, **kwargs) @@ -5454,10 +5553,9 @@ class GraphicsContext(GraphicsObject): CreateRadialGradientBrush(self, Double xo, Double yo, Double xc, Double yc, Double radius, Colour oColor, Colour cColor) -> GraphicsBrush - sets the brush to a radial gradient originating at (xo,yc) with color - oColor and ends on a circle around (xc,yc) with radius r and color - cColor - + Creates a native brush, having a radial gradient originating at + point (xo,yc) with color oColour and ends on a circle around (xc,yc) with + radius r and color cColour. """ return _gdi_.GraphicsContext_CreateRadialGradientBrush(*args, **kwargs) @@ -5465,7 +5563,7 @@ class GraphicsContext(GraphicsObject): """ CreateFont(self, Font font, Colour col=*wxBLACK) -> GraphicsFont - sets the font + Creates a native graphics font from a `wx.Font` and a text colour. """ return _gdi_.GraphicsContext_CreateFont(*args, **kwargs) @@ -5474,7 +5572,8 @@ class GraphicsContext(GraphicsObject): CreateMatrix(self, Double a=1.0, Double b=0.0, Double c=0.0, Double d=1.0, Double tx=0.0, Double ty=0.0) -> GraphicsMatrix - create a 'native' matrix corresponding to these values + Creates a native affine transformation matrix from the passed in + values. The defaults result in an identity matrix. """ return _gdi_.GraphicsContext_CreateMatrix(*args, **kwargs) @@ -5498,7 +5597,7 @@ class GraphicsContext(GraphicsObject): """ ClipRegion(self, Region region) - clips drawings to the region + Clips drawings to the region, combined to current clipping region. """ return _gdi_.GraphicsContext_ClipRegion(*args, **kwargs) @@ -5506,7 +5605,7 @@ class GraphicsContext(GraphicsObject): """ Clip(self, Double x, Double y, Double w, Double h) - clips drawings to the rect + Clips drawings to the rectangle. """ return _gdi_.GraphicsContext_Clip(*args, **kwargs) @@ -5514,7 +5613,7 @@ class GraphicsContext(GraphicsObject): """ ResetClip(self) - resets the clipping to original extent + Resets the clipping to original shape. """ return _gdi_.GraphicsContext_ResetClip(*args, **kwargs) @@ -5522,7 +5621,8 @@ class GraphicsContext(GraphicsObject): """ GetNativeContext(self) -> void - returns the native context + Returns the native context (CGContextRef for Core Graphics, Graphics + pointer for GDIPlus and cairo_t pointer for cairo). """ return _gdi_.GraphicsContext_GetNativeContext(*args, **kwargs) @@ -5530,7 +5630,7 @@ class GraphicsContext(GraphicsObject): """ Translate(self, Double dx, Double dy) - translate the current transformation matrix CTM of the context + Translates the current transformation matrix. """ return _gdi_.GraphicsContext_Translate(*args, **kwargs) @@ -5538,7 +5638,7 @@ class GraphicsContext(GraphicsObject): """ Scale(self, Double xScale, Double yScale) - scale the current transformation matrix CTM of the context + Scale the current transformation matrix of the context. """ return _gdi_.GraphicsContext_Scale(*args, **kwargs) @@ -5546,7 +5646,8 @@ class GraphicsContext(GraphicsObject): """ Rotate(self, Double angle) - rotate (radians) the current transformation matrix CTM of the context + Rotate the current transformation matrix of the context. ``angle`` is + specified in radians. """ return _gdi_.GraphicsContext_Rotate(*args, **kwargs) @@ -5554,7 +5655,8 @@ class GraphicsContext(GraphicsObject): """ ConcatTransform(self, GraphicsMatrix matrix) - concatenates this transform with the current transform of this context + Concatenates the passed in transform with the current transform of + this context. """ return _gdi_.GraphicsContext_ConcatTransform(*args, **kwargs) @@ -5562,7 +5664,7 @@ class GraphicsContext(GraphicsObject): """ SetTransform(self, GraphicsMatrix matrix) - sets the transform of this context + Sets the current transform of this context. """ return _gdi_.GraphicsContext_SetTransform(*args, **kwargs) @@ -5570,7 +5672,7 @@ class GraphicsContext(GraphicsObject): """ GetTransform(self) -> GraphicsMatrix - gets the matrix of this context + Gets the current transformation matrix of this context. """ return _gdi_.GraphicsContext_GetTransform(*args, **kwargs) @@ -5579,7 +5681,7 @@ class GraphicsContext(GraphicsObject): SetPen(self, GraphicsPen pen) SetPen(self, Pen pen) - sets the stroke pen + Sets the stroke pen """ return _gdi_.GraphicsContext_SetPen(*args) @@ -5588,7 +5690,7 @@ class GraphicsContext(GraphicsObject): SetBrush(self, GraphicsBrush brush) SetBrush(self, Brush brush) - sets the brush for filling + Sets the brush for filling """ return _gdi_.GraphicsContext_SetBrush(*args) @@ -5597,7 +5699,7 @@ class GraphicsContext(GraphicsObject): SetFont(self, GraphicsFont font) SetFont(self, Font font, Colour colour=*wxBLACK) - sets the font + Sets the font """ return _gdi_.GraphicsContext_SetFont(*args) @@ -5605,7 +5707,7 @@ class GraphicsContext(GraphicsObject): """ StrokePath(self, GraphicsPath path) - strokes along a path with the current pen + Strokes along a path with the current pen. """ return _gdi_.GraphicsContext_StrokePath(*args, **kwargs) @@ -5613,7 +5715,7 @@ class GraphicsContext(GraphicsObject): """ FillPath(self, GraphicsPath path, int fillStyle=ODDEVEN_RULE) - fills a path with the current brush + Fills a path with the current brush. """ return _gdi_.GraphicsContext_FillPath(*args, **kwargs) @@ -5621,43 +5723,80 @@ class GraphicsContext(GraphicsObject): """ DrawPath(self, GraphicsPath path, int fillStyle=ODDEVEN_RULE) - draws a path by first filling and then stroking + Draws the path by first filling and then stroking. """ return _gdi_.GraphicsContext_DrawPath(*args, **kwargs) def DrawText(*args, **kwargs): - """DrawText(self, String str, Double x, Double y)""" + """ + DrawText(self, String str, Double x, Double y) + + Draws a text at the defined position. + """ return _gdi_.GraphicsContext_DrawText(*args, **kwargs) def DrawRotatedText(*args, **kwargs): - """DrawRotatedText(self, String str, Double x, Double y, Double angle)""" + """ + DrawRotatedText(self, String str, Double x, Double y, Double angle) + + Draws a text at the defined position, at the given angle. + """ return _gdi_.GraphicsContext_DrawRotatedText(*args, **kwargs) def GetFullTextExtent(*args, **kwargs): - """GetFullTextExtent(self, text) --> (width, height, descent, externalLeading)""" + """ + GetFullTextExtent(self, text) --> (width, height, descent, externalLeading) + + Gets the dimensions of the string using the currently selected + font. ``text`` is the string to measure, ``w`` and ``h`` are the total + width and height respectively, ``descent`` is the dimension from the + baseline of the font to the bottom of the descender, and + ``externalLeading`` is any extra vertical space added to the font by + the font designer (usually is zero). + """ return _gdi_.GraphicsContext_GetFullTextExtent(*args, **kwargs) def GetTextExtent(*args, **kwargs): - """GetTextExtent(self, text) --> (width, height)""" + """ + GetTextExtent(self, text) --> (width, height) + + Gets the dimensions of the string using the currently selected + font. ``text`` is the string to measure, ``w`` and ``h`` are the total + width and height respectively. + """ return _gdi_.GraphicsContext_GetTextExtent(*args, **kwargs) def GetPartialTextExtents(*args, **kwargs): - """GetPartialTextExtents(self, text) -> [widths]""" + """ + GetPartialTextExtents(self, text) -> [widths] + + Returns a list of widths from the beginning of ``text`` to the + coresponding character in ``text``. + """ return _gdi_.GraphicsContext_GetPartialTextExtents(*args, **kwargs) def DrawBitmap(*args, **kwargs): - """DrawBitmap(self, Bitmap bmp, Double x, Double y, Double w, Double h)""" + """ + DrawBitmap(self, Bitmap bmp, Double x, Double y, Double w, Double h) + + Draws the bitmap. In case of a mono bitmap, this is treated as a mask + and the current brush is used for filling. + """ return _gdi_.GraphicsContext_DrawBitmap(*args, **kwargs) def DrawIcon(*args, **kwargs): - """DrawIcon(self, Icon icon, Double x, Double y, Double w, Double h)""" + """ + DrawIcon(self, Icon icon, Double x, Double y, Double w, Double h) + + Draws the icon. + """ return _gdi_.GraphicsContext_DrawIcon(*args, **kwargs) def StrokeLine(*args, **kwargs): """ StrokeLine(self, Double x1, Double y1, Double x2, Double y2) - strokes a single line + Strokes a single line. """ return _gdi_.GraphicsContext_StrokeLine(*args, **kwargs) @@ -5665,7 +5804,7 @@ class GraphicsContext(GraphicsObject): """ StrokeLines(self, List points) - stroke lines connecting each of the points + Stroke lines connecting each of the points """ return _gdi_.GraphicsContext_StrokeLines(*args, **kwargs) @@ -5673,7 +5812,7 @@ class GraphicsContext(GraphicsObject): """ StrokeLineSegements(self, PyObject beginPoints, PyObject endPoints) - stroke disconnected lines from begin to end points + Stroke disconnected lines from begin to end points """ return _gdi_.GraphicsContext_StrokeLineSegements(*args, **kwargs) @@ -5681,7 +5820,7 @@ class GraphicsContext(GraphicsObject): """ DrawLines(self, size_t points, int fillStyle=ODDEVEN_RULE) - draws a polygon + Draws a polygon. """ return _gdi_.GraphicsContext_DrawLines(*args, **kwargs) @@ -5689,7 +5828,7 @@ class GraphicsContext(GraphicsObject): """ DrawRectangle(self, Double x, Double y, Double w, Double h) - draws a rectangle + Draws a rectangle. """ return _gdi_.GraphicsContext_DrawRectangle(*args, **kwargs) @@ -5697,7 +5836,7 @@ class GraphicsContext(GraphicsObject): """ DrawEllipse(self, Double x, Double y, Double w, Double h) - draws an ellipse + Draws an ellipse. """ return _gdi_.GraphicsContext_DrawEllipse(*args, **kwargs) @@ -5705,7 +5844,7 @@ class GraphicsContext(GraphicsObject): """ DrawRoundedRectangle(self, Double x, Double y, Double w, Double h, Double radius) - draws a rounded rectangle + Draws a rounded rectangle """ return _gdi_.GraphicsContext_DrawRoundedRectangle(*args, **kwargs) @@ -5729,17 +5868,29 @@ def GraphicsContext_Create(*args): """ Create(WindowDC dc) -> GraphicsContext GraphicsContext_Create(Window window) -> GraphicsContext + + Creates a wx.GraphicsContext either from a window or a DC. """ val = _gdi_.GraphicsContext_Create(*args) val.__dc = args[0] # save a ref so the dc will not be deleted before self return val def GraphicsContext_CreateFromNative(*args, **kwargs): - """GraphicsContext_CreateFromNative(void context) -> GraphicsContext""" + """ + GraphicsContext_CreateFromNative(void context) -> GraphicsContext + + Creates a wx.GraphicsContext from a native context. This native context + must be eg a CGContextRef for Core Graphics, a Graphics pointer for + GDIPlus or a cairo_t pointer for Cairo. + """ return _gdi_.GraphicsContext_CreateFromNative(*args, **kwargs) def GraphicsContext_CreateFromNativeWindow(*args, **kwargs): - """GraphicsContext_CreateFromNativeWindow(void window) -> GraphicsContext""" + """ + GraphicsContext_CreateFromNativeWindow(void window) -> GraphicsContext + + Creates a wx.GraphicsContext from a native window. + """ return _gdi_.GraphicsContext_CreateFromNativeWindow(*args, **kwargs) class GraphicsRenderer(_core.Object): diff --git a/wxPython/src/msw/_gdi_wrap.cpp b/wxPython/src/msw/_gdi_wrap.cpp index b953e13723..e68eb41762 100644 --- a/wxPython/src/msw/_gdi_wrap.cpp +++ b/wxPython/src/msw/_gdi_wrap.cpp @@ -3883,9 +3883,6 @@ public: #endif -SWIGINTERN void wxGraphicsMatrix_Copy(wxGraphicsMatrix *self,wxGraphicsMatrix const &t){ - *self = t; - } SWIGINTERN PyObject *wxGraphicsContext_GetTextExtent(wxGraphicsContext *self,wxString const &text){ wxDouble width = 0.0, height = 0.0; @@ -24602,167 +24599,6 @@ SWIGINTERN PyObject *DCClipper_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject return SWIG_Python_InitShadowInstance(args); } -SWIGINTERN PyObject *_wrap_new_MemoryDC(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { - PyObject *resultobj = 0; - wxBitmap &arg1_defvalue = wxNullBitmap ; - wxBitmap *arg1 = (wxBitmap *) &arg1_defvalue ; - wxMemoryDC *result = 0 ; - void *argp1 = 0 ; - int res1 = 0 ; - PyObject * obj0 = 0 ; - char * kwnames[] = { - (char *) "bitmap", NULL - }; - - if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:new_MemoryDC",kwnames,&obj0)) SWIG_fail; - if (obj0) { - res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_wxBitmap, 0 ); - if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_MemoryDC" "', expected argument " "1"" of type '" "wxBitmap &""'"); - } - if (!argp1) { - SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_MemoryDC" "', expected argument " "1"" of type '" "wxBitmap &""'"); - } - arg1 = reinterpret_cast< wxBitmap * >(argp1); - } - { - if (!wxPyCheckForApp()) SWIG_fail; - PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxMemoryDC *)new wxMemoryDC(*arg1); - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxMemoryDC, SWIG_POINTER_NEW | 0 ); - return resultobj; -fail: - return NULL; -} - - -SWIGINTERN PyObject *_wrap_new_MemoryDCFromDC(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { - PyObject *resultobj = 0; - wxDC *arg1 = (wxDC *) 0 ; - wxMemoryDC *result = 0 ; - void *argp1 = 0 ; - int res1 = 0 ; - PyObject * obj0 = 0 ; - char * kwnames[] = { - (char *) "oldDC", NULL - }; - - if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:new_MemoryDCFromDC",kwnames,&obj0)) SWIG_fail; - res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxDC, 0 | 0 ); - if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_MemoryDCFromDC" "', expected argument " "1"" of type '" "wxDC *""'"); - } - arg1 = reinterpret_cast< wxDC * >(argp1); - { - if (!wxPyCheckForApp()) SWIG_fail; - PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxMemoryDC *)new wxMemoryDC(arg1); - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxMemoryDC, SWIG_POINTER_OWN | 0 ); - return resultobj; -fail: - return NULL; -} - - -SWIGINTERN PyObject *_wrap_MemoryDC_SelectObject(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { - PyObject *resultobj = 0; - wxMemoryDC *arg1 = (wxMemoryDC *) 0 ; - wxBitmap *arg2 = 0 ; - void *argp1 = 0 ; - int res1 = 0 ; - void *argp2 = 0 ; - int res2 = 0 ; - PyObject * obj0 = 0 ; - PyObject * obj1 = 0 ; - char * kwnames[] = { - (char *) "self",(char *) "bitmap", NULL - }; - - if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:MemoryDC_SelectObject",kwnames,&obj0,&obj1)) SWIG_fail; - res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxMemoryDC, 0 | 0 ); - if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "MemoryDC_SelectObject" "', expected argument " "1"" of type '" "wxMemoryDC *""'"); - } - arg1 = reinterpret_cast< wxMemoryDC * >(argp1); - res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_wxBitmap, 0 ); - if (!SWIG_IsOK(res2)) { - SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "MemoryDC_SelectObject" "', expected argument " "2"" of type '" "wxBitmap &""'"); - } - if (!argp2) { - SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "MemoryDC_SelectObject" "', expected argument " "2"" of type '" "wxBitmap &""'"); - } - arg2 = reinterpret_cast< wxBitmap * >(argp2); - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->SelectObject(*arg2); - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - resultobj = SWIG_Py_Void(); - return resultobj; -fail: - return NULL; -} - - -SWIGINTERN PyObject *_wrap_MemoryDC_SelectObjectAsSource(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { - PyObject *resultobj = 0; - wxMemoryDC *arg1 = (wxMemoryDC *) 0 ; - wxBitmap *arg2 = 0 ; - void *argp1 = 0 ; - int res1 = 0 ; - void *argp2 = 0 ; - int res2 = 0 ; - PyObject * obj0 = 0 ; - PyObject * obj1 = 0 ; - char * kwnames[] = { - (char *) "self",(char *) "bmp", NULL - }; - - if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:MemoryDC_SelectObjectAsSource",kwnames,&obj0,&obj1)) SWIG_fail; - res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxMemoryDC, 0 | 0 ); - if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "MemoryDC_SelectObjectAsSource" "', expected argument " "1"" of type '" "wxMemoryDC *""'"); - } - arg1 = reinterpret_cast< wxMemoryDC * >(argp1); - res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_wxBitmap, 0 | 0); - if (!SWIG_IsOK(res2)) { - SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "MemoryDC_SelectObjectAsSource" "', expected argument " "2"" of type '" "wxBitmap const &""'"); - } - if (!argp2) { - SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "MemoryDC_SelectObjectAsSource" "', expected argument " "2"" of type '" "wxBitmap const &""'"); - } - arg2 = reinterpret_cast< wxBitmap * >(argp2); - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->SelectObjectAsSource((wxBitmap const &)*arg2); - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - resultobj = SWIG_Py_Void(); - return resultobj; -fail: - return NULL; -} - - -SWIGINTERN PyObject *MemoryDC_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { - PyObject *obj; - if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL; - SWIG_TypeNewClientData(SWIGTYPE_p_wxMemoryDC, SWIG_NewClientData(obj)); - return SWIG_Py_Void(); -} - -SWIGINTERN PyObject *MemoryDC_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { - return SWIG_Python_InitShadowInstance(args); -} - SWIGINTERN PyObject *_wrap_new_ScreenDC(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; wxScreenDC *result = 0 ; @@ -25033,6 +24869,167 @@ SWIGINTERN PyObject *PaintDC_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject * return SWIG_Python_InitShadowInstance(args); } +SWIGINTERN PyObject *_wrap_new_MemoryDC(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { + PyObject *resultobj = 0; + wxBitmap &arg1_defvalue = wxNullBitmap ; + wxBitmap *arg1 = (wxBitmap *) &arg1_defvalue ; + wxMemoryDC *result = 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject * obj0 = 0 ; + char * kwnames[] = { + (char *) "bitmap", NULL + }; + + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:new_MemoryDC",kwnames,&obj0)) SWIG_fail; + if (obj0) { + res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_wxBitmap, 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_MemoryDC" "', expected argument " "1"" of type '" "wxBitmap &""'"); + } + if (!argp1) { + SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_MemoryDC" "', expected argument " "1"" of type '" "wxBitmap &""'"); + } + arg1 = reinterpret_cast< wxBitmap * >(argp1); + } + { + if (!wxPyCheckForApp()) SWIG_fail; + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (wxMemoryDC *)new wxMemoryDC(*arg1); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxMemoryDC, SWIG_POINTER_NEW | 0 ); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_new_MemoryDCFromDC(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { + PyObject *resultobj = 0; + wxDC *arg1 = (wxDC *) 0 ; + wxMemoryDC *result = 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject * obj0 = 0 ; + char * kwnames[] = { + (char *) "oldDC", NULL + }; + + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:new_MemoryDCFromDC",kwnames,&obj0)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxDC, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_MemoryDCFromDC" "', expected argument " "1"" of type '" "wxDC *""'"); + } + arg1 = reinterpret_cast< wxDC * >(argp1); + { + if (!wxPyCheckForApp()) SWIG_fail; + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (wxMemoryDC *)new wxMemoryDC(arg1); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxMemoryDC, SWIG_POINTER_OWN | 0 ); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_MemoryDC_SelectObject(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { + PyObject *resultobj = 0; + wxMemoryDC *arg1 = (wxMemoryDC *) 0 ; + wxBitmap *arg2 = 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + void *argp2 = 0 ; + int res2 = 0 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char * kwnames[] = { + (char *) "self",(char *) "bitmap", NULL + }; + + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:MemoryDC_SelectObject",kwnames,&obj0,&obj1)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxMemoryDC, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "MemoryDC_SelectObject" "', expected argument " "1"" of type '" "wxMemoryDC *""'"); + } + arg1 = reinterpret_cast< wxMemoryDC * >(argp1); + res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_wxBitmap, 0 ); + if (!SWIG_IsOK(res2)) { + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "MemoryDC_SelectObject" "', expected argument " "2"" of type '" "wxBitmap &""'"); + } + if (!argp2) { + SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "MemoryDC_SelectObject" "', expected argument " "2"" of type '" "wxBitmap &""'"); + } + arg2 = reinterpret_cast< wxBitmap * >(argp2); + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + (arg1)->SelectObject(*arg2); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_Py_Void(); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_MemoryDC_SelectObjectAsSource(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { + PyObject *resultobj = 0; + wxMemoryDC *arg1 = (wxMemoryDC *) 0 ; + wxBitmap *arg2 = 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + void *argp2 = 0 ; + int res2 = 0 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char * kwnames[] = { + (char *) "self",(char *) "bmp", NULL + }; + + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:MemoryDC_SelectObjectAsSource",kwnames,&obj0,&obj1)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxMemoryDC, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "MemoryDC_SelectObjectAsSource" "', expected argument " "1"" of type '" "wxMemoryDC *""'"); + } + arg1 = reinterpret_cast< wxMemoryDC * >(argp1); + res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_wxBitmap, 0 | 0); + if (!SWIG_IsOK(res2)) { + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "MemoryDC_SelectObjectAsSource" "', expected argument " "2"" of type '" "wxBitmap const &""'"); + } + if (!argp2) { + SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "MemoryDC_SelectObjectAsSource" "', expected argument " "2"" of type '" "wxBitmap const &""'"); + } + arg2 = reinterpret_cast< wxBitmap * >(argp2); + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + (arg1)->SelectObjectAsSource((wxBitmap const &)*arg2); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_Py_Void(); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *MemoryDC_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *obj; + if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL; + SWIG_TypeNewClientData(SWIGTYPE_p_wxMemoryDC, SWIG_NewClientData(obj)); + return SWIG_Py_Void(); +} + +SWIGINTERN PyObject *MemoryDC_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + return SWIG_Python_InitShadowInstance(args); +} + SWIGINTERN PyObject *_wrap_new_BufferedDC__SWIG_0(PyObject *SWIGUNUSEDPARM(self), int nobjs, PyObject **swig_obj) { PyObject *resultobj = 0; wxDC *arg1 = (wxDC *) 0 ; @@ -26460,45 +26457,6 @@ fail: } -SWIGINTERN PyObject *_wrap_GraphicsMatrix_Copy(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { - PyObject *resultobj = 0; - wxGraphicsMatrix *arg1 = (wxGraphicsMatrix *) 0 ; - wxGraphicsMatrix *arg2 = 0 ; - void *argp1 = 0 ; - int res1 = 0 ; - void *argp2 = 0 ; - int res2 = 0 ; - PyObject * obj0 = 0 ; - PyObject * obj1 = 0 ; - char * kwnames[] = { - (char *) "self",(char *) "t", NULL - }; - - if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:GraphicsMatrix_Copy",kwnames,&obj0,&obj1)) SWIG_fail; - res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxGraphicsMatrix, 0 | 0 ); - if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GraphicsMatrix_Copy" "', expected argument " "1"" of type '" "wxGraphicsMatrix *""'"); - } - arg1 = reinterpret_cast< wxGraphicsMatrix * >(argp1); - res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_wxGraphicsMatrix, 0 | 0); - if (!SWIG_IsOK(res2)) { - SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "GraphicsMatrix_Copy" "', expected argument " "2"" of type '" "wxGraphicsMatrix const &""'"); - } - if (!argp2) { - SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "GraphicsMatrix_Copy" "', expected argument " "2"" of type '" "wxGraphicsMatrix const &""'"); - } - arg2 = reinterpret_cast< wxGraphicsMatrix * >(argp2); - { - wxGraphicsMatrix_Copy(arg1,(wxGraphicsMatrix const &)*arg2); - if (PyErr_Occurred()) SWIG_fail; - } - resultobj = SWIG_Py_Void(); - return resultobj; -fail: - return NULL; -} - - SWIGINTERN PyObject *_wrap_GraphicsMatrix_Set(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxGraphicsMatrix *arg1 = (wxGraphicsMatrix *) 0 ; @@ -39666,12 +39624,6 @@ static PyMethodDef SwigMethods[] = { { (char *)"delete_DCClipper", (PyCFunction)_wrap_delete_DCClipper, METH_O, NULL}, { (char *)"DCClipper_swigregister", DCClipper_swigregister, METH_VARARGS, NULL}, { (char *)"DCClipper_swiginit", DCClipper_swiginit, METH_VARARGS, NULL}, - { (char *)"new_MemoryDC", (PyCFunction) _wrap_new_MemoryDC, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"new_MemoryDCFromDC", (PyCFunction) _wrap_new_MemoryDCFromDC, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"MemoryDC_SelectObject", (PyCFunction) _wrap_MemoryDC_SelectObject, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"MemoryDC_SelectObjectAsSource", (PyCFunction) _wrap_MemoryDC_SelectObjectAsSource, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"MemoryDC_swigregister", MemoryDC_swigregister, METH_VARARGS, NULL}, - { (char *)"MemoryDC_swiginit", MemoryDC_swiginit, METH_VARARGS, NULL}, { (char *)"new_ScreenDC", (PyCFunction)_wrap_new_ScreenDC, METH_NOARGS, NULL}, { (char *)"ScreenDC_StartDrawingOnTopWin", (PyCFunction) _wrap_ScreenDC_StartDrawingOnTopWin, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"ScreenDC_StartDrawingOnTop", (PyCFunction) _wrap_ScreenDC_StartDrawingOnTop, METH_VARARGS | METH_KEYWORDS, NULL}, @@ -39687,6 +39639,12 @@ static PyMethodDef SwigMethods[] = { { (char *)"new_PaintDC", (PyCFunction) _wrap_new_PaintDC, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"PaintDC_swigregister", PaintDC_swigregister, METH_VARARGS, NULL}, { (char *)"PaintDC_swiginit", PaintDC_swiginit, METH_VARARGS, NULL}, + { (char *)"new_MemoryDC", (PyCFunction) _wrap_new_MemoryDC, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"new_MemoryDCFromDC", (PyCFunction) _wrap_new_MemoryDCFromDC, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"MemoryDC_SelectObject", (PyCFunction) _wrap_MemoryDC_SelectObject, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"MemoryDC_SelectObjectAsSource", (PyCFunction) _wrap_MemoryDC_SelectObjectAsSource, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"MemoryDC_swigregister", MemoryDC_swigregister, METH_VARARGS, NULL}, + { (char *)"MemoryDC_swiginit", MemoryDC_swiginit, METH_VARARGS, NULL}, { (char *)"new_BufferedDC", _wrap_new_BufferedDC, METH_VARARGS, NULL}, { (char *)"delete_BufferedDC", (PyCFunction)_wrap_delete_BufferedDC, METH_O, NULL}, { (char *)"BufferedDC_UnMask", (PyCFunction)_wrap_BufferedDC_UnMask, METH_O, NULL}, @@ -39749,7 +39707,6 @@ static PyMethodDef SwigMethods[] = { { (char *)"new_GraphicsMatrix", (PyCFunction)_wrap_new_GraphicsMatrix, METH_NOARGS, NULL}, { (char *)"delete_GraphicsMatrix", (PyCFunction)_wrap_delete_GraphicsMatrix, METH_O, NULL}, { (char *)"GraphicsMatrix_Concat", (PyCFunction) _wrap_GraphicsMatrix_Concat, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"GraphicsMatrix_Copy", (PyCFunction) _wrap_GraphicsMatrix_Copy, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"GraphicsMatrix_Set", (PyCFunction) _wrap_GraphicsMatrix_Set, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"GraphicsMatrix_Invert", (PyCFunction)_wrap_GraphicsMatrix_Invert, METH_O, NULL}, { (char *)"GraphicsMatrix_IsEqual", (PyCFunction) _wrap_GraphicsMatrix_IsEqual, METH_VARARGS | METH_KEYWORDS, NULL}, @@ -40063,12 +40020,21 @@ static void *_p_wxBufferedDCTo_p_wxMemoryDC(void *x) { static void *_p_wxBufferedPaintDCTo_p_wxMemoryDC(void *x) { return (void *)((wxMemoryDC *) (wxBufferedDC *) ((wxBufferedPaintDC *) x)); } +static void *_p_wxBufferedDCTo_p_wxWindowDC(void *x) { + return (void *)((wxWindowDC *) (wxMemoryDC *) ((wxBufferedDC *) x)); +} +static void *_p_wxMemoryDCTo_p_wxWindowDC(void *x) { + return (void *)((wxWindowDC *) ((wxMemoryDC *) x)); +} static void *_p_wxClientDCTo_p_wxWindowDC(void *x) { return (void *)((wxWindowDC *) ((wxClientDC *) x)); } static void *_p_wxPaintDCTo_p_wxWindowDC(void *x) { return (void *)((wxWindowDC *) (wxClientDC *) ((wxPaintDC *) x)); } +static void *_p_wxBufferedPaintDCTo_p_wxWindowDC(void *x) { + return (void *)((wxWindowDC *) (wxMemoryDC *)(wxBufferedDC *) ((wxBufferedPaintDC *) x)); +} static void *_p_wxPyLocaleTo_p_wxLocale(void *x) { return (void *)((wxLocale *) ((wxPyLocale *) x)); } @@ -40121,17 +40087,17 @@ static void *_p_wxScreenDCTo_p_wxDC(void *x) { return (void *)((wxDC *) ((wxScreenDC *) x)); } static void *_p_wxBufferedDCTo_p_wxDC(void *x) { - return (void *)((wxDC *) (wxMemoryDC *) ((wxBufferedDC *) x)); + return (void *)((wxDC *) (wxWindowDC *)(wxMemoryDC *) ((wxBufferedDC *) x)); } static void *_p_wxMirrorDCTo_p_wxDC(void *x) { return (void *)((wxDC *) ((wxMirrorDC *) x)); } -static void *_p_wxMemoryDCTo_p_wxDC(void *x) { - return (void *)((wxDC *) ((wxMemoryDC *) x)); -} static void *_p_wxWindowDCTo_p_wxDC(void *x) { return (void *)((wxDC *) ((wxWindowDC *) x)); } +static void *_p_wxMemoryDCTo_p_wxDC(void *x) { + return (void *)((wxDC *) (wxWindowDC *) ((wxMemoryDC *) x)); +} static void *_p_wxMetaFileDCTo_p_wxDC(void *x) { return (void *)((wxDC *) ((wxMetaFileDC *) x)); } @@ -40142,7 +40108,7 @@ static void *_p_wxPaintDCTo_p_wxDC(void *x) { return (void *)((wxDC *) (wxWindowDC *)(wxClientDC *) ((wxPaintDC *) x)); } static void *_p_wxBufferedPaintDCTo_p_wxDC(void *x) { - return (void *)((wxDC *) (wxMemoryDC *)(wxBufferedDC *) ((wxBufferedPaintDC *) x)); + return (void *)((wxDC *) (wxWindowDC *)(wxMemoryDC *)(wxBufferedDC *) ((wxBufferedPaintDC *) x)); } static void *_p_wxAutoBufferedPaintDCTo_p_wxDC(void *x) { return (void *)((wxDC *) ((wxAutoBufferedPaintDC *) x)); @@ -40259,7 +40225,7 @@ static void *_p_wxFSFileTo_p_wxObject(void *x) { return (void *)((wxObject *) ((wxFSFile *) x)); } static void *_p_wxMemoryDCTo_p_wxObject(void *x) { - return (void *)((wxObject *) (wxDC *) ((wxMemoryDC *) x)); + return (void *)((wxObject *) (wxDC *)(wxWindowDC *) ((wxMemoryDC *) x)); } static void *_p_wxRegionTo_p_wxObject(void *x) { return (void *)((wxObject *) (wxGDIObject *) ((wxRegion *) x)); @@ -40379,7 +40345,7 @@ static void *_p_wxPaintDCTo_p_wxObject(void *x) { return (void *)((wxObject *) (wxDC *)(wxWindowDC *)(wxClientDC *) ((wxPaintDC *) x)); } static void *_p_wxBufferedPaintDCTo_p_wxObject(void *x) { - return (void *)((wxObject *) (wxDC *)(wxMemoryDC *)(wxBufferedDC *) ((wxBufferedPaintDC *) x)); + return (void *)((wxObject *) (wxDC *)(wxWindowDC *)(wxMemoryDC *)(wxBufferedDC *) ((wxBufferedPaintDC *) x)); } static void *_p_wxAutoBufferedPaintDCTo_p_wxObject(void *x) { return (void *)((wxObject *) (wxDC *) ((wxAutoBufferedPaintDC *) x)); @@ -40412,7 +40378,7 @@ static void *_p_wxPaletteTo_p_wxObject(void *x) { return (void *)((wxObject *) (wxGDIObject *) ((wxPalette *) x)); } static void *_p_wxBufferedDCTo_p_wxObject(void *x) { - return (void *)((wxObject *) (wxDC *)(wxMemoryDC *) ((wxBufferedDC *) x)); + return (void *)((wxObject *) (wxDC *)(wxWindowDC *)(wxMemoryDC *) ((wxBufferedDC *) x)); } static void *_p_wxImageListTo_p_wxObject(void *x) { return (void *)((wxObject *) ((wxImageList *) x)); @@ -41050,7 +41016,7 @@ static swig_cast_info _swigc__p_wxSplitterRenderParams[] = { {&_swigt__p_wxSpli static swig_cast_info _swigc__p_wxStockGDI[] = { {&_swigt__p_wxStockGDI, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxString[] = { {&_swigt__p_wxString, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxWindow[] = { {&_swigt__p_wxControl, _p_wxControlTo_p_wxWindow, 0, 0}, {&_swigt__p_wxWindow, 0, 0, 0}, {&_swigt__p_wxControlWithItems, _p_wxControlWithItemsTo_p_wxWindow, 0, 0}, {&_swigt__p_wxMenuBar, _p_wxMenuBarTo_p_wxWindow, 0, 0},{0, 0, 0, 0}}; -static swig_cast_info _swigc__p_wxWindowDC[] = { {&_swigt__p_wxWindowDC, 0, 0, 0}, {&_swigt__p_wxClientDC, _p_wxClientDCTo_p_wxWindowDC, 0, 0}, {&_swigt__p_wxPaintDC, _p_wxPaintDCTo_p_wxWindowDC, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_wxWindowDC[] = { {&_swigt__p_wxBufferedDC, _p_wxBufferedDCTo_p_wxWindowDC, 0, 0}, {&_swigt__p_wxWindowDC, 0, 0, 0}, {&_swigt__p_wxMemoryDC, _p_wxMemoryDCTo_p_wxWindowDC, 0, 0}, {&_swigt__p_wxBufferedPaintDC, _p_wxBufferedPaintDCTo_p_wxWindowDC, 0, 0}, {&_swigt__p_wxClientDC, _p_wxClientDCTo_p_wxWindowDC, 0, 0}, {&_swigt__p_wxPaintDC, _p_wxPaintDCTo_p_wxWindowDC, 0, 0},{0, 0, 0, 0}}; static swig_cast_info *swig_cast_initial[] = { _swigc__p_buffer, diff --git a/wxPython/src/msw/_misc_wrap.cpp b/wxPython/src/msw/_misc_wrap.cpp index b39ddf547d..89e6b09c79 100644 --- a/wxPython/src/msw/_misc_wrap.cpp +++ b/wxPython/src/msw/_misc_wrap.cpp @@ -4006,6 +4006,7 @@ IMP_PYCALLBACK_BOOL_INTINT(wxPyFileDropTarget, wxFileDropTarget, OnDrop); SWIGINTERN bool wxClipboardLocker___nonzero__(wxClipboardLocker *self){ return !!(*self); } #include +#include SWIGINTERN bool wxVideoMode___eq__(wxVideoMode *self,wxVideoMode const *other){ return other ? (*self == *other) : false; } SWIGINTERN bool wxVideoMode___ne__(wxVideoMode *self,wxVideoMode const *other){ return other ? (*self != *other) : true; } diff --git a/wxPython/src/msw/_windows.py b/wxPython/src/msw/_windows.py index 8179d661ef..fc557c4d12 100644 --- a/wxPython/src/msw/_windows.py +++ b/wxPython/src/msw/_windows.py @@ -3305,6 +3305,7 @@ class PyWindow(_core.Window): """_setCallbackInfo(self, PyObject self, PyObject _class)""" return _windows_.PyWindow__setCallbackInfo(*args, **kwargs) + SetBestSize = wx.Window.SetInitialSize def DoEraseBackground(*args, **kwargs): """DoEraseBackground(self, DC dc) -> bool""" return _windows_.PyWindow_DoEraseBackground(*args, **kwargs) @@ -3481,6 +3482,7 @@ class PyPanel(Panel): """_setCallbackInfo(self, PyObject self, PyObject _class)""" return _windows_.PyPanel__setCallbackInfo(*args, **kwargs) + SetBestSize = wx.Window.SetInitialSize def DoEraseBackground(*args, **kwargs): """DoEraseBackground(self, DC dc) -> bool""" return _windows_.PyPanel_DoEraseBackground(*args, **kwargs) @@ -3657,6 +3659,7 @@ class PyScrolledWindow(ScrolledWindow): """_setCallbackInfo(self, PyObject self, PyObject _class)""" return _windows_.PyScrolledWindow__setCallbackInfo(*args, **kwargs) + SetBestSize = wx.Window.SetInitialSize def DoEraseBackground(*args, **kwargs): """DoEraseBackground(self, DC dc) -> bool""" return _windows_.PyScrolledWindow_DoEraseBackground(*args, **kwargs) diff --git a/wxPython/src/msw/aui.py b/wxPython/src/msw/aui.py index 7e489cc7f6..cac179bde2 100644 --- a/wxPython/src/msw/aui.py +++ b/wxPython/src/msw/aui.py @@ -201,6 +201,7 @@ AUI_BUTTON_MAXIMIZE_RESTORE = _aui.AUI_BUTTON_MAXIMIZE_RESTORE AUI_BUTTON_MINIMIZE = _aui.AUI_BUTTON_MINIMIZE AUI_BUTTON_PIN = _aui.AUI_BUTTON_PIN AUI_BUTTON_OPTIONS = _aui.AUI_BUTTON_OPTIONS +AUI_BUTTON_WINDOWLIST = _aui.AUI_BUTTON_WINDOWLIST AUI_BUTTON_LEFT = _aui.AUI_BUTTON_LEFT AUI_BUTTON_RIGHT = _aui.AUI_BUTTON_RIGHT AUI_BUTTON_UP = _aui.AUI_BUTTON_UP @@ -991,7 +992,7 @@ AUI_NB_BOTTOM = _aui.AUI_NB_BOTTOM AUI_NB_TAB_SPLIT = _aui.AUI_NB_TAB_SPLIT AUI_NB_TAB_MOVE = _aui.AUI_NB_TAB_MOVE AUI_NB_SCROLL_BUTTONS = _aui.AUI_NB_SCROLL_BUTTONS -AUI_NB_PAGELIST_BUTTON = _aui.AUI_NB_PAGELIST_BUTTON +AUI_NB_WINDOWLIST_BUTTON = _aui.AUI_NB_WINDOWLIST_BUTTON AUI_NB_CLOSE_BUTTON = _aui.AUI_NB_CLOSE_BUTTON AUI_NB_CLOSE_ON_ACTIVE_TAB = _aui.AUI_NB_CLOSE_ON_ACTIVE_TAB AUI_NB_CLOSE_ON_ALL_TABS = _aui.AUI_NB_CLOSE_ON_ALL_TABS @@ -1016,27 +1017,32 @@ class AuiTabArt(object): return _aui.AuiTabArt_SetMeasuringFont(*args, **kwargs) def DrawBackground(*args, **kwargs): - """DrawBackground(self, DC dc, Rect rect)""" + """DrawBackground(self, DC dc, Window wnd, Rect rect)""" return _aui.AuiTabArt_DrawBackground(*args, **kwargs) def DrawTab(*args, **kwargs): """ - DrawTab(self, DC dc, Rect in_rect, String caption, bool active, int close_button_state, - Rect out_tab_rect, Rect out_button_rect, - int x_extent) + DrawTab(self, DC dc, Window wnd, Rect in_rect, String caption, bool active, + int close_button_state, Rect out_tab_rect, + Rect out_button_rect, int x_extent) """ return _aui.AuiTabArt_DrawTab(*args, **kwargs) def DrawButton(*args, **kwargs): """ - DrawButton(self, DC dc, Rect in_rect, int bitmap_id, int button_state, - int orientation, Bitmap bitmap_override, Rect out_rect) + DrawButton(self, DC dc, Window wnd, Rect in_rect, int bitmap_id, int button_state, + int orientation, Bitmap bitmap_override, + Rect out_rect) """ return _aui.AuiTabArt_DrawButton(*args, **kwargs) + def ShowWindowList(*args, **kwargs): + """ShowWindowList(self, Window wnd, wxArrayString items, int active_idx) -> int""" + return _aui.AuiTabArt_ShowWindowList(*args, **kwargs) + def GetTabSize(*args, **kwargs): """ - GetTabSize(self, DC dc, String caption, bool active, int close_button_state, + GetTabSize(self, DC dc, Window wnd, String caption, bool active, int close_button_state, int x_extent) -> Size """ return _aui.AuiTabArt_GetTabSize(*args, **kwargs) diff --git a/wxPython/src/msw/aui_wrap.cpp b/wxPython/src/msw/aui_wrap.cpp index ec224a2724..6c39705e76 100644 --- a/wxPython/src/msw/aui_wrap.cpp +++ b/wxPython/src/msw/aui_wrap.cpp @@ -2521,179 +2521,180 @@ SWIG_Python_MustGetPtr(PyObject *obj, swig_type_info *ty, int argnum, int flags) #define SWIGTYPE_p_wxANIHandler swig_types[55] #define SWIGTYPE_p_wxAcceleratorTable swig_types[56] #define SWIGTYPE_p_wxActivateEvent swig_types[57] -#define SWIGTYPE_p_wxAuiDefaultDockArt swig_types[58] -#define SWIGTYPE_p_wxAuiDefaultTabArt swig_types[59] -#define SWIGTYPE_p_wxAuiDockArt swig_types[60] -#define SWIGTYPE_p_wxAuiDockInfo swig_types[61] -#define SWIGTYPE_p_wxAuiDockUIPart swig_types[62] -#define SWIGTYPE_p_wxAuiFloatingFrame swig_types[63] -#define SWIGTYPE_p_wxAuiManager swig_types[64] -#define SWIGTYPE_p_wxAuiManagerEvent swig_types[65] -#define SWIGTYPE_p_wxAuiNotebook swig_types[66] -#define SWIGTYPE_p_wxAuiNotebookEvent swig_types[67] -#define SWIGTYPE_p_wxAuiNotebookPage swig_types[68] -#define SWIGTYPE_p_wxAuiNotebookPageArray swig_types[69] -#define SWIGTYPE_p_wxAuiPaneButton swig_types[70] -#define SWIGTYPE_p_wxAuiPaneButtonArray swig_types[71] -#define SWIGTYPE_p_wxAuiPaneInfo swig_types[72] -#define SWIGTYPE_p_wxAuiPaneInfoPtrArray swig_types[73] -#define SWIGTYPE_p_wxAuiTabArt swig_types[74] -#define SWIGTYPE_p_wxAuiTabContainer swig_types[75] -#define SWIGTYPE_p_wxAuiTabContainerButton swig_types[76] -#define SWIGTYPE_p_wxAuiTabCtrl swig_types[77] -#define SWIGTYPE_p_wxBMPHandler swig_types[78] -#define SWIGTYPE_p_wxBitmap swig_types[79] -#define SWIGTYPE_p_wxBoxSizer swig_types[80] -#define SWIGTYPE_p_wxCURHandler swig_types[81] -#define SWIGTYPE_p_wxCalculateLayoutEvent swig_types[82] -#define SWIGTYPE_p_wxChildFocusEvent swig_types[83] -#define SWIGTYPE_p_wxClipboardTextEvent swig_types[84] -#define SWIGTYPE_p_wxCloseEvent swig_types[85] -#define SWIGTYPE_p_wxColor swig_types[86] -#define SWIGTYPE_p_wxColour swig_types[87] -#define SWIGTYPE_p_wxColourData swig_types[88] -#define SWIGTYPE_p_wxColourDialog swig_types[89] -#define SWIGTYPE_p_wxCommandEvent swig_types[90] -#define SWIGTYPE_p_wxContextMenuEvent swig_types[91] -#define SWIGTYPE_p_wxControl swig_types[92] -#define SWIGTYPE_p_wxControlWithItems swig_types[93] -#define SWIGTYPE_p_wxDC swig_types[94] -#define SWIGTYPE_p_wxDateEvent swig_types[95] -#define SWIGTYPE_p_wxDialog swig_types[96] -#define SWIGTYPE_p_wxDirDialog swig_types[97] -#define SWIGTYPE_p_wxDisplayChangedEvent swig_types[98] -#define SWIGTYPE_p_wxDropFilesEvent swig_types[99] -#define SWIGTYPE_p_wxDuplexMode swig_types[100] -#define SWIGTYPE_p_wxEraseEvent swig_types[101] -#define SWIGTYPE_p_wxEvent swig_types[102] -#define SWIGTYPE_p_wxEvtHandler swig_types[103] -#define SWIGTYPE_p_wxFSFile swig_types[104] -#define SWIGTYPE_p_wxFileDialog swig_types[105] -#define SWIGTYPE_p_wxFileSystem swig_types[106] -#define SWIGTYPE_p_wxFindDialogEvent swig_types[107] -#define SWIGTYPE_p_wxFindReplaceData swig_types[108] -#define SWIGTYPE_p_wxFindReplaceDialog swig_types[109] -#define SWIGTYPE_p_wxFlexGridSizer swig_types[110] -#define SWIGTYPE_p_wxFocusEvent swig_types[111] -#define SWIGTYPE_p_wxFont swig_types[112] -#define SWIGTYPE_p_wxFontData swig_types[113] -#define SWIGTYPE_p_wxFontDialog swig_types[114] -#define SWIGTYPE_p_wxFrame swig_types[115] -#define SWIGTYPE_p_wxGBSizerItem swig_types[116] -#define SWIGTYPE_p_wxGIFHandler swig_types[117] -#define SWIGTYPE_p_wxGridBagSizer swig_types[118] -#define SWIGTYPE_p_wxGridSizer swig_types[119] -#define SWIGTYPE_p_wxICOHandler swig_types[120] -#define SWIGTYPE_p_wxIconizeEvent swig_types[121] -#define SWIGTYPE_p_wxIdleEvent swig_types[122] -#define SWIGTYPE_p_wxImage swig_types[123] -#define SWIGTYPE_p_wxImageHandler swig_types[124] -#define SWIGTYPE_p_wxIndividualLayoutConstraint swig_types[125] -#define SWIGTYPE_p_wxInitDialogEvent swig_types[126] -#define SWIGTYPE_p_wxJPEGHandler swig_types[127] -#define SWIGTYPE_p_wxKeyEvent swig_types[128] -#define SWIGTYPE_p_wxLayoutAlgorithm swig_types[129] -#define SWIGTYPE_p_wxLayoutConstraints swig_types[130] -#define SWIGTYPE_p_wxMDIChildFrame swig_types[131] -#define SWIGTYPE_p_wxMDIClientWindow swig_types[132] -#define SWIGTYPE_p_wxMDIParentFrame swig_types[133] -#define SWIGTYPE_p_wxMaximizeEvent swig_types[134] -#define SWIGTYPE_p_wxMenu swig_types[135] -#define SWIGTYPE_p_wxMenuBar swig_types[136] -#define SWIGTYPE_p_wxMenuEvent swig_types[137] -#define SWIGTYPE_p_wxMenuItem swig_types[138] -#define SWIGTYPE_p_wxMessageDialog swig_types[139] -#define SWIGTYPE_p_wxMiniFrame swig_types[140] -#define SWIGTYPE_p_wxMouseCaptureChangedEvent swig_types[141] -#define SWIGTYPE_p_wxMouseCaptureLostEvent swig_types[142] -#define SWIGTYPE_p_wxMouseEvent swig_types[143] -#define SWIGTYPE_p_wxMoveEvent swig_types[144] -#define SWIGTYPE_p_wxMultiChoiceDialog swig_types[145] -#define SWIGTYPE_p_wxNavigationKeyEvent swig_types[146] -#define SWIGTYPE_p_wxNcPaintEvent swig_types[147] -#define SWIGTYPE_p_wxNotifyEvent swig_types[148] -#define SWIGTYPE_p_wxNumberEntryDialog swig_types[149] -#define SWIGTYPE_p_wxObject swig_types[150] -#define SWIGTYPE_p_wxPCXHandler swig_types[151] -#define SWIGTYPE_p_wxPNGHandler swig_types[152] -#define SWIGTYPE_p_wxPNMHandler swig_types[153] -#define SWIGTYPE_p_wxPageSetupDialog swig_types[154] -#define SWIGTYPE_p_wxPageSetupDialogData swig_types[155] -#define SWIGTYPE_p_wxPaintEvent swig_types[156] -#define SWIGTYPE_p_wxPaletteChangedEvent swig_types[157] -#define SWIGTYPE_p_wxPanel swig_types[158] -#define SWIGTYPE_p_wxPaperSize swig_types[159] -#define SWIGTYPE_p_wxPasswordEntryDialog swig_types[160] -#define SWIGTYPE_p_wxPoint swig_types[161] -#define SWIGTYPE_p_wxPopupWindow swig_types[162] -#define SWIGTYPE_p_wxPreviewCanvas swig_types[163] -#define SWIGTYPE_p_wxPreviewControlBar swig_types[164] -#define SWIGTYPE_p_wxPreviewFrame swig_types[165] -#define SWIGTYPE_p_wxPrintData swig_types[166] -#define SWIGTYPE_p_wxPrintDialog swig_types[167] -#define SWIGTYPE_p_wxPrintDialogData swig_types[168] -#define SWIGTYPE_p_wxPrintPreview swig_types[169] -#define SWIGTYPE_p_wxPrinter swig_types[170] -#define SWIGTYPE_p_wxProgressDialog swig_types[171] -#define SWIGTYPE_p_wxPyApp swig_types[172] -#define SWIGTYPE_p_wxPyAuiDockArt swig_types[173] -#define SWIGTYPE_p_wxPyAuiTabArt swig_types[174] -#define SWIGTYPE_p_wxPyCommandEvent swig_types[175] -#define SWIGTYPE_p_wxPyEvent swig_types[176] -#define SWIGTYPE_p_wxPyHtmlListBox swig_types[177] -#define SWIGTYPE_p_wxPyImageHandler swig_types[178] -#define SWIGTYPE_p_wxPyPanel swig_types[179] -#define SWIGTYPE_p_wxPyPopupTransientWindow swig_types[180] -#define SWIGTYPE_p_wxPyPreviewControlBar swig_types[181] -#define SWIGTYPE_p_wxPyPreviewFrame swig_types[182] -#define SWIGTYPE_p_wxPyPrintPreview swig_types[183] -#define SWIGTYPE_p_wxPyPrintout swig_types[184] -#define SWIGTYPE_p_wxPyScrolledWindow swig_types[185] -#define SWIGTYPE_p_wxPySizer swig_types[186] -#define SWIGTYPE_p_wxPyTaskBarIcon swig_types[187] -#define SWIGTYPE_p_wxPyVListBox swig_types[188] -#define SWIGTYPE_p_wxPyVScrolledWindow swig_types[189] -#define SWIGTYPE_p_wxPyValidator swig_types[190] -#define SWIGTYPE_p_wxPyWindow swig_types[191] -#define SWIGTYPE_p_wxQueryLayoutInfoEvent swig_types[192] -#define SWIGTYPE_p_wxQueryNewPaletteEvent swig_types[193] -#define SWIGTYPE_p_wxRect swig_types[194] -#define SWIGTYPE_p_wxSashEvent swig_types[195] -#define SWIGTYPE_p_wxSashLayoutWindow swig_types[196] -#define SWIGTYPE_p_wxSashWindow swig_types[197] -#define SWIGTYPE_p_wxScrollEvent swig_types[198] -#define SWIGTYPE_p_wxScrollWinEvent swig_types[199] -#define SWIGTYPE_p_wxScrolledWindow swig_types[200] -#define SWIGTYPE_p_wxSetCursorEvent swig_types[201] -#define SWIGTYPE_p_wxShowEvent swig_types[202] -#define SWIGTYPE_p_wxSingleChoiceDialog swig_types[203] -#define SWIGTYPE_p_wxSize swig_types[204] -#define SWIGTYPE_p_wxSizeEvent swig_types[205] -#define SWIGTYPE_p_wxSizer swig_types[206] -#define SWIGTYPE_p_wxSizerItem swig_types[207] -#define SWIGTYPE_p_wxSplashScreen swig_types[208] -#define SWIGTYPE_p_wxSplashScreenWindow swig_types[209] -#define SWIGTYPE_p_wxSplitterEvent swig_types[210] -#define SWIGTYPE_p_wxSplitterWindow swig_types[211] -#define SWIGTYPE_p_wxStaticBoxSizer swig_types[212] -#define SWIGTYPE_p_wxStatusBar swig_types[213] -#define SWIGTYPE_p_wxStdDialogButtonSizer swig_types[214] -#define SWIGTYPE_p_wxString swig_types[215] -#define SWIGTYPE_p_wxSysColourChangedEvent swig_types[216] -#define SWIGTYPE_p_wxTGAHandler swig_types[217] -#define SWIGTYPE_p_wxTIFFHandler swig_types[218] -#define SWIGTYPE_p_wxTaskBarIconEvent swig_types[219] -#define SWIGTYPE_p_wxTextEntryDialog swig_types[220] -#define SWIGTYPE_p_wxTipWindow swig_types[221] -#define SWIGTYPE_p_wxTopLevelWindow swig_types[222] -#define SWIGTYPE_p_wxUpdateUIEvent swig_types[223] -#define SWIGTYPE_p_wxValidator swig_types[224] -#define SWIGTYPE_p_wxWindow swig_types[225] -#define SWIGTYPE_p_wxWindowCreateEvent swig_types[226] -#define SWIGTYPE_p_wxWindowDestroyEvent swig_types[227] -#define SWIGTYPE_p_wxXPMHandler swig_types[228] -static swig_type_info *swig_types[230]; -static swig_module_info swig_module = {swig_types, 229, 0, 0, 0, 0}; +#define SWIGTYPE_p_wxArrayString swig_types[58] +#define SWIGTYPE_p_wxAuiDefaultDockArt swig_types[59] +#define SWIGTYPE_p_wxAuiDefaultTabArt swig_types[60] +#define SWIGTYPE_p_wxAuiDockArt swig_types[61] +#define SWIGTYPE_p_wxAuiDockInfo swig_types[62] +#define SWIGTYPE_p_wxAuiDockUIPart swig_types[63] +#define SWIGTYPE_p_wxAuiFloatingFrame swig_types[64] +#define SWIGTYPE_p_wxAuiManager swig_types[65] +#define SWIGTYPE_p_wxAuiManagerEvent swig_types[66] +#define SWIGTYPE_p_wxAuiNotebook swig_types[67] +#define SWIGTYPE_p_wxAuiNotebookEvent swig_types[68] +#define SWIGTYPE_p_wxAuiNotebookPage swig_types[69] +#define SWIGTYPE_p_wxAuiNotebookPageArray swig_types[70] +#define SWIGTYPE_p_wxAuiPaneButton swig_types[71] +#define SWIGTYPE_p_wxAuiPaneButtonArray swig_types[72] +#define SWIGTYPE_p_wxAuiPaneInfo swig_types[73] +#define SWIGTYPE_p_wxAuiPaneInfoPtrArray swig_types[74] +#define SWIGTYPE_p_wxAuiTabArt swig_types[75] +#define SWIGTYPE_p_wxAuiTabContainer swig_types[76] +#define SWIGTYPE_p_wxAuiTabContainerButton swig_types[77] +#define SWIGTYPE_p_wxAuiTabCtrl swig_types[78] +#define SWIGTYPE_p_wxBMPHandler swig_types[79] +#define SWIGTYPE_p_wxBitmap swig_types[80] +#define SWIGTYPE_p_wxBoxSizer swig_types[81] +#define SWIGTYPE_p_wxCURHandler swig_types[82] +#define SWIGTYPE_p_wxCalculateLayoutEvent swig_types[83] +#define SWIGTYPE_p_wxChildFocusEvent swig_types[84] +#define SWIGTYPE_p_wxClipboardTextEvent swig_types[85] +#define SWIGTYPE_p_wxCloseEvent swig_types[86] +#define SWIGTYPE_p_wxColor swig_types[87] +#define SWIGTYPE_p_wxColour swig_types[88] +#define SWIGTYPE_p_wxColourData swig_types[89] +#define SWIGTYPE_p_wxColourDialog swig_types[90] +#define SWIGTYPE_p_wxCommandEvent swig_types[91] +#define SWIGTYPE_p_wxContextMenuEvent swig_types[92] +#define SWIGTYPE_p_wxControl swig_types[93] +#define SWIGTYPE_p_wxControlWithItems swig_types[94] +#define SWIGTYPE_p_wxDC swig_types[95] +#define SWIGTYPE_p_wxDateEvent swig_types[96] +#define SWIGTYPE_p_wxDialog swig_types[97] +#define SWIGTYPE_p_wxDirDialog swig_types[98] +#define SWIGTYPE_p_wxDisplayChangedEvent swig_types[99] +#define SWIGTYPE_p_wxDropFilesEvent swig_types[100] +#define SWIGTYPE_p_wxDuplexMode swig_types[101] +#define SWIGTYPE_p_wxEraseEvent swig_types[102] +#define SWIGTYPE_p_wxEvent swig_types[103] +#define SWIGTYPE_p_wxEvtHandler swig_types[104] +#define SWIGTYPE_p_wxFSFile swig_types[105] +#define SWIGTYPE_p_wxFileDialog swig_types[106] +#define SWIGTYPE_p_wxFileSystem swig_types[107] +#define SWIGTYPE_p_wxFindDialogEvent swig_types[108] +#define SWIGTYPE_p_wxFindReplaceData swig_types[109] +#define SWIGTYPE_p_wxFindReplaceDialog swig_types[110] +#define SWIGTYPE_p_wxFlexGridSizer swig_types[111] +#define SWIGTYPE_p_wxFocusEvent swig_types[112] +#define SWIGTYPE_p_wxFont swig_types[113] +#define SWIGTYPE_p_wxFontData swig_types[114] +#define SWIGTYPE_p_wxFontDialog swig_types[115] +#define SWIGTYPE_p_wxFrame swig_types[116] +#define SWIGTYPE_p_wxGBSizerItem swig_types[117] +#define SWIGTYPE_p_wxGIFHandler swig_types[118] +#define SWIGTYPE_p_wxGridBagSizer swig_types[119] +#define SWIGTYPE_p_wxGridSizer swig_types[120] +#define SWIGTYPE_p_wxICOHandler swig_types[121] +#define SWIGTYPE_p_wxIconizeEvent swig_types[122] +#define SWIGTYPE_p_wxIdleEvent swig_types[123] +#define SWIGTYPE_p_wxImage swig_types[124] +#define SWIGTYPE_p_wxImageHandler swig_types[125] +#define SWIGTYPE_p_wxIndividualLayoutConstraint swig_types[126] +#define SWIGTYPE_p_wxInitDialogEvent swig_types[127] +#define SWIGTYPE_p_wxJPEGHandler swig_types[128] +#define SWIGTYPE_p_wxKeyEvent swig_types[129] +#define SWIGTYPE_p_wxLayoutAlgorithm swig_types[130] +#define SWIGTYPE_p_wxLayoutConstraints swig_types[131] +#define SWIGTYPE_p_wxMDIChildFrame swig_types[132] +#define SWIGTYPE_p_wxMDIClientWindow swig_types[133] +#define SWIGTYPE_p_wxMDIParentFrame swig_types[134] +#define SWIGTYPE_p_wxMaximizeEvent swig_types[135] +#define SWIGTYPE_p_wxMenu swig_types[136] +#define SWIGTYPE_p_wxMenuBar swig_types[137] +#define SWIGTYPE_p_wxMenuEvent swig_types[138] +#define SWIGTYPE_p_wxMenuItem swig_types[139] +#define SWIGTYPE_p_wxMessageDialog swig_types[140] +#define SWIGTYPE_p_wxMiniFrame swig_types[141] +#define SWIGTYPE_p_wxMouseCaptureChangedEvent swig_types[142] +#define SWIGTYPE_p_wxMouseCaptureLostEvent swig_types[143] +#define SWIGTYPE_p_wxMouseEvent swig_types[144] +#define SWIGTYPE_p_wxMoveEvent swig_types[145] +#define SWIGTYPE_p_wxMultiChoiceDialog swig_types[146] +#define SWIGTYPE_p_wxNavigationKeyEvent swig_types[147] +#define SWIGTYPE_p_wxNcPaintEvent swig_types[148] +#define SWIGTYPE_p_wxNotifyEvent swig_types[149] +#define SWIGTYPE_p_wxNumberEntryDialog swig_types[150] +#define SWIGTYPE_p_wxObject swig_types[151] +#define SWIGTYPE_p_wxPCXHandler swig_types[152] +#define SWIGTYPE_p_wxPNGHandler swig_types[153] +#define SWIGTYPE_p_wxPNMHandler swig_types[154] +#define SWIGTYPE_p_wxPageSetupDialog swig_types[155] +#define SWIGTYPE_p_wxPageSetupDialogData swig_types[156] +#define SWIGTYPE_p_wxPaintEvent swig_types[157] +#define SWIGTYPE_p_wxPaletteChangedEvent swig_types[158] +#define SWIGTYPE_p_wxPanel swig_types[159] +#define SWIGTYPE_p_wxPaperSize swig_types[160] +#define SWIGTYPE_p_wxPasswordEntryDialog swig_types[161] +#define SWIGTYPE_p_wxPoint swig_types[162] +#define SWIGTYPE_p_wxPopupWindow swig_types[163] +#define SWIGTYPE_p_wxPreviewCanvas swig_types[164] +#define SWIGTYPE_p_wxPreviewControlBar swig_types[165] +#define SWIGTYPE_p_wxPreviewFrame swig_types[166] +#define SWIGTYPE_p_wxPrintData swig_types[167] +#define SWIGTYPE_p_wxPrintDialog swig_types[168] +#define SWIGTYPE_p_wxPrintDialogData swig_types[169] +#define SWIGTYPE_p_wxPrintPreview swig_types[170] +#define SWIGTYPE_p_wxPrinter swig_types[171] +#define SWIGTYPE_p_wxProgressDialog swig_types[172] +#define SWIGTYPE_p_wxPyApp swig_types[173] +#define SWIGTYPE_p_wxPyAuiDockArt swig_types[174] +#define SWIGTYPE_p_wxPyAuiTabArt swig_types[175] +#define SWIGTYPE_p_wxPyCommandEvent swig_types[176] +#define SWIGTYPE_p_wxPyEvent swig_types[177] +#define SWIGTYPE_p_wxPyHtmlListBox swig_types[178] +#define SWIGTYPE_p_wxPyImageHandler swig_types[179] +#define SWIGTYPE_p_wxPyPanel swig_types[180] +#define SWIGTYPE_p_wxPyPopupTransientWindow swig_types[181] +#define SWIGTYPE_p_wxPyPreviewControlBar swig_types[182] +#define SWIGTYPE_p_wxPyPreviewFrame swig_types[183] +#define SWIGTYPE_p_wxPyPrintPreview swig_types[184] +#define SWIGTYPE_p_wxPyPrintout swig_types[185] +#define SWIGTYPE_p_wxPyScrolledWindow swig_types[186] +#define SWIGTYPE_p_wxPySizer swig_types[187] +#define SWIGTYPE_p_wxPyTaskBarIcon swig_types[188] +#define SWIGTYPE_p_wxPyVListBox swig_types[189] +#define SWIGTYPE_p_wxPyVScrolledWindow swig_types[190] +#define SWIGTYPE_p_wxPyValidator swig_types[191] +#define SWIGTYPE_p_wxPyWindow swig_types[192] +#define SWIGTYPE_p_wxQueryLayoutInfoEvent swig_types[193] +#define SWIGTYPE_p_wxQueryNewPaletteEvent swig_types[194] +#define SWIGTYPE_p_wxRect swig_types[195] +#define SWIGTYPE_p_wxSashEvent swig_types[196] +#define SWIGTYPE_p_wxSashLayoutWindow swig_types[197] +#define SWIGTYPE_p_wxSashWindow swig_types[198] +#define SWIGTYPE_p_wxScrollEvent swig_types[199] +#define SWIGTYPE_p_wxScrollWinEvent swig_types[200] +#define SWIGTYPE_p_wxScrolledWindow swig_types[201] +#define SWIGTYPE_p_wxSetCursorEvent swig_types[202] +#define SWIGTYPE_p_wxShowEvent swig_types[203] +#define SWIGTYPE_p_wxSingleChoiceDialog swig_types[204] +#define SWIGTYPE_p_wxSize swig_types[205] +#define SWIGTYPE_p_wxSizeEvent swig_types[206] +#define SWIGTYPE_p_wxSizer swig_types[207] +#define SWIGTYPE_p_wxSizerItem swig_types[208] +#define SWIGTYPE_p_wxSplashScreen swig_types[209] +#define SWIGTYPE_p_wxSplashScreenWindow swig_types[210] +#define SWIGTYPE_p_wxSplitterEvent swig_types[211] +#define SWIGTYPE_p_wxSplitterWindow swig_types[212] +#define SWIGTYPE_p_wxStaticBoxSizer swig_types[213] +#define SWIGTYPE_p_wxStatusBar swig_types[214] +#define SWIGTYPE_p_wxStdDialogButtonSizer swig_types[215] +#define SWIGTYPE_p_wxString swig_types[216] +#define SWIGTYPE_p_wxSysColourChangedEvent swig_types[217] +#define SWIGTYPE_p_wxTGAHandler swig_types[218] +#define SWIGTYPE_p_wxTIFFHandler swig_types[219] +#define SWIGTYPE_p_wxTaskBarIconEvent swig_types[220] +#define SWIGTYPE_p_wxTextEntryDialog swig_types[221] +#define SWIGTYPE_p_wxTipWindow swig_types[222] +#define SWIGTYPE_p_wxTopLevelWindow swig_types[223] +#define SWIGTYPE_p_wxUpdateUIEvent swig_types[224] +#define SWIGTYPE_p_wxValidator swig_types[225] +#define SWIGTYPE_p_wxWindow swig_types[226] +#define SWIGTYPE_p_wxWindowCreateEvent swig_types[227] +#define SWIGTYPE_p_wxWindowDestroyEvent swig_types[228] +#define SWIGTYPE_p_wxXPMHandler swig_types[229] +static swig_type_info *swig_types[231]; +static swig_module_info swig_module = {swig_types, 230, 0, 0, 0, 0}; #define SWIG_TypeQuery(name) SWIG_TypeQueryModule(&swig_module, &swig_module, name) #define SWIG_MangledTypeQuery(name) SWIG_MangledTypeQueryModule(&swig_module, &swig_module, name) @@ -3079,23 +3080,27 @@ class wxPyAuiTabArt : public wxAuiDefaultTabArt virtual void DrawBackground( wxDC* dc, + wxWindow* wnd, const wxRect& rect ) { bool found; wxPyBlock_t blocked = wxPyBeginBlockThreads(); if ((found = wxPyCBH_findCallback(m_myInst, "DrawBackground"))) { PyObject* odc = wxPyMake_wxObject(dc, false); + PyObject* ownd = wxPyMake_wxObject(wnd, false); PyObject* orect = wxPyConstructObject((void*)&rect, wxT("wxRect"), 0); - wxPyCBH_callCallback(m_myInst, Py_BuildValue("(OO)", odc, orect)); + wxPyCBH_callCallback(m_myInst, Py_BuildValue("(OOO)", odc, ownd, orect)); Py_DECREF(odc); + Py_DECREF(ownd); Py_DECREF(orect); } wxPyEndBlockThreads(blocked); if (!found) - wxAuiDefaultTabArt::DrawBackground(dc, rect); + wxAuiDefaultTabArt::DrawBackground(dc, wnd, rect); } virtual void DrawTab( wxDC* dc, + wxWindow* wnd, const wxRect& in_rect, const wxString& caption, bool active, @@ -3109,12 +3114,13 @@ class wxPyAuiTabArt : public wxAuiDefaultTabArt wxPyBlock_t blocked = wxPyBeginBlockThreads(); if ((found = wxPyCBH_findCallback(m_myInst, "DrawTab"))) { PyObject* odc = wxPyMake_wxObject(dc, false); + PyObject* ownd = wxPyMake_wxObject(wnd, false); PyObject* orect = wxPyConstructObject((void*)&in_rect, wxT("wxRect"), 0); PyObject* otext = wx2PyString(caption); PyObject* ro; ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue( - "(OOOii)", - odc, orect, otext, + "(OOOOii)", + odc, ownd, orect, otext, (int)active, close_button_state)); if (ro) { if (PySequence_Check(ro) && PyObject_Length(ro) == 3) { @@ -3141,16 +3147,18 @@ class wxPyAuiTabArt : public wxAuiDefaultTabArt } Py_DECREF(odc); + Py_DECREF(ownd); Py_DECREF(orect); Py_DECREF(otext); } wxPyEndBlockThreads(blocked); if (!found) - wxAuiDefaultTabArt::DrawTab(dc, in_rect, caption, active, close_button_state, out_tab_rect, out_button_rect, x_extent); + wxAuiDefaultTabArt::DrawTab(dc, wnd, in_rect, caption, active, close_button_state, out_tab_rect, out_button_rect, x_extent); } virtual void DrawButton( wxDC* dc, + wxWindow* wnd, const wxRect& in_rect, int bitmap_id, int button_state, @@ -3163,10 +3171,11 @@ class wxPyAuiTabArt : public wxAuiDefaultTabArt wxPyBlock_t blocked = wxPyBeginBlockThreads(); if ((found = wxPyCBH_findCallback(m_myInst, "DrawButton"))) { PyObject* odc = wxPyMake_wxObject(dc, false); + PyObject* ownd = wxPyMake_wxObject(wnd, false); PyObject* orect = wxPyConstructObject((void*)&in_rect, wxT("wxRect"), 0); PyObject* obmp = wxPyConstructObject((void*)&bitmap_override, wxT("wxBitmap"), 0); PyObject* ro; - ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("(OOiiiO)", odc, orect, + ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("(OOOiiiO)", odc, ownd, orect, bitmap_id, button_state, orientation, obmp)); if (ro) { @@ -3176,16 +3185,24 @@ class wxPyAuiTabArt : public wxAuiDefaultTabArt } Py_DECREF(odc); + Py_DECREF(ownd); Py_DECREF(orect); Py_DECREF(obmp); } wxPyEndBlockThreads(blocked); if (!found) - wxAuiDefaultTabArt::DrawButton(dc, in_rect, bitmap_id, button_state, orientation, bitmap_override, out_rect); + wxAuiDefaultTabArt::DrawButton(dc, wnd, in_rect, bitmap_id, button_state, orientation, bitmap_override, out_rect); } + +// TODO +// virtual int ShowWindowList( +// wxWindow* wnd, +// const wxArrayString& items, +// int active_idx); virtual wxSize GetTabSize( wxDC* dc, + wxWindow* wnd, const wxString& caption, bool active, int close_button_state, @@ -3197,10 +3214,11 @@ class wxPyAuiTabArt : public wxAuiDefaultTabArt wxPyBlock_t blocked = wxPyBeginBlockThreads(); if ((found = wxPyCBH_findCallback(m_myInst, "GetTabSize"))) { PyObject* odc = wxPyMake_wxObject(dc, false); + PyObject* ownd = wxPyMake_wxObject(wnd, false); PyObject* otext = wx2PyString(caption); PyObject* ro; ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue( - "(OOi)", odc, otext, (int)active, close_button_state)); + "(OOOi)", odc, ownd, otext, (int)active, close_button_state)); if (ro) { if (PySequence_Check(ro) && PyObject_Length(ro) == 2) { PyObject* o1 = PySequence_GetItem(ro, 0); @@ -3222,15 +3240,18 @@ class wxPyAuiTabArt : public wxAuiDefaultTabArt } Py_DECREF(odc); + Py_DECREF(ownd); Py_DECREF(otext); } wxPyEndBlockThreads(blocked); if (!found) - rv = wxAuiDefaultTabArt::GetTabSize(dc, caption, active, close_button_state, x_extent); + rv = wxAuiDefaultTabArt::GetTabSize(dc, wnd, caption, active, close_button_state, x_extent); return rv; } - - + +// TODO +// virtual int GetBestTabCtrlSize(wxWindow* wnd); + DEC_PYCALLBACK__FONT(SetNormalFont); DEC_PYCALLBACK__FONT(SetSelectedFont); @@ -11510,20 +11531,24 @@ SWIGINTERN PyObject *_wrap_AuiTabArt_DrawBackground(PyObject *SWIGUNUSEDPARM(sel PyObject *resultobj = 0; wxAuiTabArt *arg1 = (wxAuiTabArt *) 0 ; wxDC *arg2 = (wxDC *) 0 ; - wxRect *arg3 = 0 ; + wxWindow *arg3 = (wxWindow *) 0 ; + wxRect *arg4 = 0 ; void *argp1 = 0 ; int res1 = 0 ; void *argp2 = 0 ; int res2 = 0 ; - wxRect temp3 ; + void *argp3 = 0 ; + int res3 = 0 ; + wxRect temp4 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; char * kwnames[] = { - (char *) "self",(char *) "dc",(char *) "rect", NULL + (char *) "self",(char *) "dc",(char *) "wnd",(char *) "rect", NULL }; - if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:AuiTabArt_DrawBackground",kwnames,&obj0,&obj1,&obj2)) SWIG_fail; + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:AuiTabArt_DrawBackground",kwnames,&obj0,&obj1,&obj2,&obj3)) SWIG_fail; res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxAuiTabArt, 0 | 0 ); if (!SWIG_IsOK(res1)) { SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AuiTabArt_DrawBackground" "', expected argument " "1"" of type '" "wxAuiTabArt *""'"); @@ -11534,13 +11559,18 @@ SWIGINTERN PyObject *_wrap_AuiTabArt_DrawBackground(PyObject *SWIGUNUSEDPARM(sel SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "AuiTabArt_DrawBackground" "', expected argument " "2"" of type '" "wxDC *""'"); } arg2 = reinterpret_cast< wxDC * >(argp2); + res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_p_wxWindow, 0 | 0 ); + if (!SWIG_IsOK(res3)) { + SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "AuiTabArt_DrawBackground" "', expected argument " "3"" of type '" "wxWindow *""'"); + } + arg3 = reinterpret_cast< wxWindow * >(argp3); { - arg3 = &temp3; - if ( ! wxRect_helper(obj2, &arg3)) SWIG_fail; + arg4 = &temp4; + if ( ! wxRect_helper(obj3, &arg4)) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->DrawBackground(arg2,(wxRect const &)*arg3); + (arg1)->DrawBackground(arg2,arg3,(wxRect const &)*arg4); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } @@ -11555,29 +11585,32 @@ SWIGINTERN PyObject *_wrap_AuiTabArt_DrawTab(PyObject *SWIGUNUSEDPARM(self), PyO PyObject *resultobj = 0; wxAuiTabArt *arg1 = (wxAuiTabArt *) 0 ; wxDC *arg2 = (wxDC *) 0 ; - wxRect *arg3 = 0 ; - wxString *arg4 = 0 ; - bool arg5 ; - int arg6 ; - wxRect *arg7 = (wxRect *) 0 ; + wxWindow *arg3 = (wxWindow *) 0 ; + wxRect *arg4 = 0 ; + wxString *arg5 = 0 ; + bool arg6 ; + int arg7 ; wxRect *arg8 = (wxRect *) 0 ; - int *arg9 = (int *) 0 ; + wxRect *arg9 = (wxRect *) 0 ; + int *arg10 = (int *) 0 ; void *argp1 = 0 ; int res1 = 0 ; void *argp2 = 0 ; int res2 = 0 ; - wxRect temp3 ; - bool temp4 = false ; - bool val5 ; - int ecode5 = 0 ; - int val6 ; + void *argp3 = 0 ; + int res3 = 0 ; + wxRect temp4 ; + bool temp5 = false ; + bool val6 ; int ecode6 = 0 ; - void *argp7 = 0 ; - int res7 = 0 ; + int val7 ; + int ecode7 = 0 ; void *argp8 = 0 ; int res8 = 0 ; void *argp9 = 0 ; int res9 = 0 ; + void *argp10 = 0 ; + int res10 = 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; @@ -11587,11 +11620,12 @@ SWIGINTERN PyObject *_wrap_AuiTabArt_DrawTab(PyObject *SWIGUNUSEDPARM(self), PyO PyObject * obj6 = 0 ; PyObject * obj7 = 0 ; PyObject * obj8 = 0 ; + PyObject * obj9 = 0 ; char * kwnames[] = { - (char *) "self",(char *) "dc",(char *) "in_rect",(char *) "caption",(char *) "active",(char *) "close_button_state",(char *) "out_tab_rect",(char *) "out_button_rect",(char *) "x_extent", NULL + (char *) "self",(char *) "dc",(char *) "wnd",(char *) "in_rect",(char *) "caption",(char *) "active",(char *) "close_button_state",(char *) "out_tab_rect",(char *) "out_button_rect",(char *) "x_extent", NULL }; - if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOOOOO:AuiTabArt_DrawTab",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8)) SWIG_fail; + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOOOOOO:AuiTabArt_DrawTab",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9)) SWIG_fail; res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxAuiTabArt, 0 | 0 ); if (!SWIG_IsOK(res1)) { SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AuiTabArt_DrawTab" "', expected argument " "1"" of type '" "wxAuiTabArt *""'"); @@ -11602,56 +11636,61 @@ SWIGINTERN PyObject *_wrap_AuiTabArt_DrawTab(PyObject *SWIGUNUSEDPARM(self), PyO SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "AuiTabArt_DrawTab" "', expected argument " "2"" of type '" "wxDC *""'"); } arg2 = reinterpret_cast< wxDC * >(argp2); + res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_p_wxWindow, 0 | 0 ); + if (!SWIG_IsOK(res3)) { + SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "AuiTabArt_DrawTab" "', expected argument " "3"" of type '" "wxWindow *""'"); + } + arg3 = reinterpret_cast< wxWindow * >(argp3); { - arg3 = &temp3; - if ( ! wxRect_helper(obj2, &arg3)) SWIG_fail; + arg4 = &temp4; + if ( ! wxRect_helper(obj3, &arg4)) SWIG_fail; } { - arg4 = wxString_in_helper(obj3); - if (arg4 == NULL) SWIG_fail; - temp4 = true; + arg5 = wxString_in_helper(obj4); + if (arg5 == NULL) SWIG_fail; + temp5 = true; } - ecode5 = SWIG_AsVal_bool(obj4, &val5); - if (!SWIG_IsOK(ecode5)) { - SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "AuiTabArt_DrawTab" "', expected argument " "5"" of type '" "bool""'"); - } - arg5 = static_cast< bool >(val5); - ecode6 = SWIG_AsVal_int(obj5, &val6); + ecode6 = SWIG_AsVal_bool(obj5, &val6); if (!SWIG_IsOK(ecode6)) { - SWIG_exception_fail(SWIG_ArgError(ecode6), "in method '" "AuiTabArt_DrawTab" "', expected argument " "6"" of type '" "int""'"); + SWIG_exception_fail(SWIG_ArgError(ecode6), "in method '" "AuiTabArt_DrawTab" "', expected argument " "6"" of type '" "bool""'"); } - arg6 = static_cast< int >(val6); - res7 = SWIG_ConvertPtr(obj6, &argp7,SWIGTYPE_p_wxRect, 0 | 0 ); - if (!SWIG_IsOK(res7)) { - SWIG_exception_fail(SWIG_ArgError(res7), "in method '" "AuiTabArt_DrawTab" "', expected argument " "7"" of type '" "wxRect *""'"); - } - arg7 = reinterpret_cast< wxRect * >(argp7); + arg6 = static_cast< bool >(val6); + ecode7 = SWIG_AsVal_int(obj6, &val7); + if (!SWIG_IsOK(ecode7)) { + SWIG_exception_fail(SWIG_ArgError(ecode7), "in method '" "AuiTabArt_DrawTab" "', expected argument " "7"" of type '" "int""'"); + } + arg7 = static_cast< int >(val7); res8 = SWIG_ConvertPtr(obj7, &argp8,SWIGTYPE_p_wxRect, 0 | 0 ); if (!SWIG_IsOK(res8)) { SWIG_exception_fail(SWIG_ArgError(res8), "in method '" "AuiTabArt_DrawTab" "', expected argument " "8"" of type '" "wxRect *""'"); } arg8 = reinterpret_cast< wxRect * >(argp8); - res9 = SWIG_ConvertPtr(obj8, &argp9,SWIGTYPE_p_int, 0 | 0 ); + res9 = SWIG_ConvertPtr(obj8, &argp9,SWIGTYPE_p_wxRect, 0 | 0 ); if (!SWIG_IsOK(res9)) { - SWIG_exception_fail(SWIG_ArgError(res9), "in method '" "AuiTabArt_DrawTab" "', expected argument " "9"" of type '" "int *""'"); + SWIG_exception_fail(SWIG_ArgError(res9), "in method '" "AuiTabArt_DrawTab" "', expected argument " "9"" of type '" "wxRect *""'"); } - arg9 = reinterpret_cast< int * >(argp9); + arg9 = reinterpret_cast< wxRect * >(argp9); + res10 = SWIG_ConvertPtr(obj9, &argp10,SWIGTYPE_p_int, 0 | 0 ); + if (!SWIG_IsOK(res10)) { + SWIG_exception_fail(SWIG_ArgError(res10), "in method '" "AuiTabArt_DrawTab" "', expected argument " "10"" of type '" "int *""'"); + } + arg10 = reinterpret_cast< int * >(argp10); { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->DrawTab(arg2,(wxRect const &)*arg3,(wxString const &)*arg4,arg5,arg6,arg7,arg8,arg9); + (arg1)->DrawTab(arg2,arg3,(wxRect const &)*arg4,(wxString const &)*arg5,arg6,arg7,arg8,arg9,arg10); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } resultobj = SWIG_Py_Void(); { - if (temp4) - delete arg4; + if (temp5) + delete arg5; } return resultobj; fail: { - if (temp4) - delete arg4; + if (temp5) + delete arg5; } return NULL; } @@ -11661,27 +11700,30 @@ SWIGINTERN PyObject *_wrap_AuiTabArt_DrawButton(PyObject *SWIGUNUSEDPARM(self), PyObject *resultobj = 0; wxAuiTabArt *arg1 = (wxAuiTabArt *) 0 ; wxDC *arg2 = (wxDC *) 0 ; - wxRect *arg3 = 0 ; - int arg4 ; + wxWindow *arg3 = (wxWindow *) 0 ; + wxRect *arg4 = 0 ; int arg5 ; int arg6 ; - wxBitmap *arg7 = 0 ; - wxRect *arg8 = (wxRect *) 0 ; + int arg7 ; + wxBitmap *arg8 = 0 ; + wxRect *arg9 = (wxRect *) 0 ; void *argp1 = 0 ; int res1 = 0 ; void *argp2 = 0 ; int res2 = 0 ; - wxRect temp3 ; - int val4 ; - int ecode4 = 0 ; + void *argp3 = 0 ; + int res3 = 0 ; + wxRect temp4 ; int val5 ; int ecode5 = 0 ; int val6 ; int ecode6 = 0 ; - void *argp7 = 0 ; - int res7 = 0 ; + int val7 ; + int ecode7 = 0 ; void *argp8 = 0 ; int res8 = 0 ; + void *argp9 = 0 ; + int res9 = 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; @@ -11690,11 +11732,12 @@ SWIGINTERN PyObject *_wrap_AuiTabArt_DrawButton(PyObject *SWIGUNUSEDPARM(self), PyObject * obj5 = 0 ; PyObject * obj6 = 0 ; PyObject * obj7 = 0 ; + PyObject * obj8 = 0 ; char * kwnames[] = { - (char *) "self",(char *) "dc",(char *) "in_rect",(char *) "bitmap_id",(char *) "button_state",(char *) "orientation",(char *) "bitmap_override",(char *) "out_rect", NULL + (char *) "self",(char *) "dc",(char *) "wnd",(char *) "in_rect",(char *) "bitmap_id",(char *) "button_state",(char *) "orientation",(char *) "bitmap_override",(char *) "out_rect", NULL }; - if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOOOO:AuiTabArt_DrawButton",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) SWIG_fail; + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOOOOO:AuiTabArt_DrawButton",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8)) SWIG_fail; res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxAuiTabArt, 0 | 0 ); if (!SWIG_IsOK(res1)) { SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AuiTabArt_DrawButton" "', expected argument " "1"" of type '" "wxAuiTabArt *""'"); @@ -11705,15 +11748,15 @@ SWIGINTERN PyObject *_wrap_AuiTabArt_DrawButton(PyObject *SWIGUNUSEDPARM(self), SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "AuiTabArt_DrawButton" "', expected argument " "2"" of type '" "wxDC *""'"); } arg2 = reinterpret_cast< wxDC * >(argp2); + res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_p_wxWindow, 0 | 0 ); + if (!SWIG_IsOK(res3)) { + SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "AuiTabArt_DrawButton" "', expected argument " "3"" of type '" "wxWindow *""'"); + } + arg3 = reinterpret_cast< wxWindow * >(argp3); { - arg3 = &temp3; - if ( ! wxRect_helper(obj2, &arg3)) SWIG_fail; + arg4 = &temp4; + if ( ! wxRect_helper(obj3, &arg4)) SWIG_fail; } - ecode4 = SWIG_AsVal_int(obj3, &val4); - if (!SWIG_IsOK(ecode4)) { - SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "AuiTabArt_DrawButton" "', expected argument " "4"" of type '" "int""'"); - } - arg4 = static_cast< int >(val4); ecode5 = SWIG_AsVal_int(obj4, &val5); if (!SWIG_IsOK(ecode5)) { SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "AuiTabArt_DrawButton" "', expected argument " "5"" of type '" "int""'"); @@ -11724,22 +11767,27 @@ SWIGINTERN PyObject *_wrap_AuiTabArt_DrawButton(PyObject *SWIGUNUSEDPARM(self), SWIG_exception_fail(SWIG_ArgError(ecode6), "in method '" "AuiTabArt_DrawButton" "', expected argument " "6"" of type '" "int""'"); } arg6 = static_cast< int >(val6); - res7 = SWIG_ConvertPtr(obj6, &argp7, SWIGTYPE_p_wxBitmap, 0 | 0); - if (!SWIG_IsOK(res7)) { - SWIG_exception_fail(SWIG_ArgError(res7), "in method '" "AuiTabArt_DrawButton" "', expected argument " "7"" of type '" "wxBitmap const &""'"); + ecode7 = SWIG_AsVal_int(obj6, &val7); + if (!SWIG_IsOK(ecode7)) { + SWIG_exception_fail(SWIG_ArgError(ecode7), "in method '" "AuiTabArt_DrawButton" "', expected argument " "7"" of type '" "int""'"); + } + arg7 = static_cast< int >(val7); + res8 = SWIG_ConvertPtr(obj7, &argp8, SWIGTYPE_p_wxBitmap, 0 | 0); + if (!SWIG_IsOK(res8)) { + SWIG_exception_fail(SWIG_ArgError(res8), "in method '" "AuiTabArt_DrawButton" "', expected argument " "8"" of type '" "wxBitmap const &""'"); } - if (!argp7) { - SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "AuiTabArt_DrawButton" "', expected argument " "7"" of type '" "wxBitmap const &""'"); + if (!argp8) { + SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "AuiTabArt_DrawButton" "', expected argument " "8"" of type '" "wxBitmap const &""'"); } - arg7 = reinterpret_cast< wxBitmap * >(argp7); - res8 = SWIG_ConvertPtr(obj7, &argp8,SWIGTYPE_p_wxRect, 0 | 0 ); - if (!SWIG_IsOK(res8)) { - SWIG_exception_fail(SWIG_ArgError(res8), "in method '" "AuiTabArt_DrawButton" "', expected argument " "8"" of type '" "wxRect *""'"); + arg8 = reinterpret_cast< wxBitmap * >(argp8); + res9 = SWIG_ConvertPtr(obj8, &argp9,SWIGTYPE_p_wxRect, 0 | 0 ); + if (!SWIG_IsOK(res9)) { + SWIG_exception_fail(SWIG_ArgError(res9), "in method '" "AuiTabArt_DrawButton" "', expected argument " "9"" of type '" "wxRect *""'"); } - arg8 = reinterpret_cast< wxRect * >(argp8); + arg9 = reinterpret_cast< wxRect * >(argp9); { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->DrawButton(arg2,(wxRect const &)*arg3,arg4,arg5,arg6,(wxBitmap const &)*arg7,arg8); + (arg1)->DrawButton(arg2,arg3,(wxRect const &)*arg4,arg5,arg6,arg7,(wxBitmap const &)*arg8,arg9); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } @@ -11750,37 +11798,115 @@ fail: } +SWIGINTERN PyObject *_wrap_AuiTabArt_ShowWindowList(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { + PyObject *resultobj = 0; + wxAuiTabArt *arg1 = (wxAuiTabArt *) 0 ; + wxWindow *arg2 = (wxWindow *) 0 ; + wxArrayString *arg3 = 0 ; + int arg4 ; + int result; + void *argp1 = 0 ; + int res1 = 0 ; + void *argp2 = 0 ; + int res2 = 0 ; + bool temp3 = false ; + int val4 ; + int ecode4 = 0 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + char * kwnames[] = { + (char *) "self",(char *) "wnd",(char *) "items",(char *) "active_idx", NULL + }; + + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:AuiTabArt_ShowWindowList",kwnames,&obj0,&obj1,&obj2,&obj3)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxAuiTabArt, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AuiTabArt_ShowWindowList" "', expected argument " "1"" of type '" "wxAuiTabArt *""'"); + } + arg1 = reinterpret_cast< wxAuiTabArt * >(argp1); + res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_wxWindow, 0 | 0 ); + if (!SWIG_IsOK(res2)) { + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "AuiTabArt_ShowWindowList" "', expected argument " "2"" of type '" "wxWindow *""'"); + } + arg2 = reinterpret_cast< wxWindow * >(argp2); + { + if (! PySequence_Check(obj2)) { + PyErr_SetString(PyExc_TypeError, "Sequence of strings expected."); + SWIG_fail; + } + arg3 = new wxArrayString; + temp3 = true; + int i, len=PySequence_Length(obj2); + for (i=0; iAdd(*s); + delete s; + Py_DECREF(item); + } + } + ecode4 = SWIG_AsVal_int(obj3, &val4); + if (!SWIG_IsOK(ecode4)) { + SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "AuiTabArt_ShowWindowList" "', expected argument " "4"" of type '" "int""'"); + } + arg4 = static_cast< int >(val4); + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (int)(arg1)->ShowWindowList(arg2,(wxArrayString const &)*arg3,arg4); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_From_int(static_cast< int >(result)); + { + if (temp3) delete arg3; + } + return resultobj; +fail: + { + if (temp3) delete arg3; + } + return NULL; +} + + SWIGINTERN PyObject *_wrap_AuiTabArt_GetTabSize(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxAuiTabArt *arg1 = (wxAuiTabArt *) 0 ; wxDC *arg2 = (wxDC *) 0 ; - wxString *arg3 = 0 ; - bool arg4 ; - int arg5 ; - int *arg6 = (int *) 0 ; + wxWindow *arg3 = (wxWindow *) 0 ; + wxString *arg4 = 0 ; + bool arg5 ; + int arg6 ; + int *arg7 = (int *) 0 ; wxSize result; void *argp1 = 0 ; int res1 = 0 ; void *argp2 = 0 ; int res2 = 0 ; - bool temp3 = false ; - bool val4 ; - int ecode4 = 0 ; - int val5 ; + void *argp3 = 0 ; + int res3 = 0 ; + bool temp4 = false ; + bool val5 ; int ecode5 = 0 ; - void *argp6 = 0 ; - int res6 = 0 ; + int val6 ; + int ecode6 = 0 ; + void *argp7 = 0 ; + int res7 = 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; PyObject * obj4 = 0 ; PyObject * obj5 = 0 ; + PyObject * obj6 = 0 ; char * kwnames[] = { - (char *) "self",(char *) "dc",(char *) "caption",(char *) "active",(char *) "close_button_state",(char *) "x_extent", NULL + (char *) "self",(char *) "dc",(char *) "wnd",(char *) "caption",(char *) "active",(char *) "close_button_state",(char *) "x_extent", NULL }; - if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO:AuiTabArt_GetTabSize",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail; + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOOO:AuiTabArt_GetTabSize",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) SWIG_fail; res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxAuiTabArt, 0 | 0 ); if (!SWIG_IsOK(res1)) { SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AuiTabArt_GetTabSize" "', expected argument " "1"" of type '" "wxAuiTabArt *""'"); @@ -11791,42 +11917,47 @@ SWIGINTERN PyObject *_wrap_AuiTabArt_GetTabSize(PyObject *SWIGUNUSEDPARM(self), SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "AuiTabArt_GetTabSize" "', expected argument " "2"" of type '" "wxDC *""'"); } arg2 = reinterpret_cast< wxDC * >(argp2); + res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_p_wxWindow, 0 | 0 ); + if (!SWIG_IsOK(res3)) { + SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "AuiTabArt_GetTabSize" "', expected argument " "3"" of type '" "wxWindow *""'"); + } + arg3 = reinterpret_cast< wxWindow * >(argp3); { - arg3 = wxString_in_helper(obj2); - if (arg3 == NULL) SWIG_fail; - temp3 = true; + arg4 = wxString_in_helper(obj3); + if (arg4 == NULL) SWIG_fail; + temp4 = true; } - ecode4 = SWIG_AsVal_bool(obj3, &val4); - if (!SWIG_IsOK(ecode4)) { - SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "AuiTabArt_GetTabSize" "', expected argument " "4"" of type '" "bool""'"); - } - arg4 = static_cast< bool >(val4); - ecode5 = SWIG_AsVal_int(obj4, &val5); + ecode5 = SWIG_AsVal_bool(obj4, &val5); if (!SWIG_IsOK(ecode5)) { - SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "AuiTabArt_GetTabSize" "', expected argument " "5"" of type '" "int""'"); + SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "AuiTabArt_GetTabSize" "', expected argument " "5"" of type '" "bool""'"); } - arg5 = static_cast< int >(val5); - res6 = SWIG_ConvertPtr(obj5, &argp6,SWIGTYPE_p_int, 0 | 0 ); - if (!SWIG_IsOK(res6)) { - SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "AuiTabArt_GetTabSize" "', expected argument " "6"" of type '" "int *""'"); + arg5 = static_cast< bool >(val5); + ecode6 = SWIG_AsVal_int(obj5, &val6); + if (!SWIG_IsOK(ecode6)) { + SWIG_exception_fail(SWIG_ArgError(ecode6), "in method '" "AuiTabArt_GetTabSize" "', expected argument " "6"" of type '" "int""'"); + } + arg6 = static_cast< int >(val6); + res7 = SWIG_ConvertPtr(obj6, &argp7,SWIGTYPE_p_int, 0 | 0 ); + if (!SWIG_IsOK(res7)) { + SWIG_exception_fail(SWIG_ArgError(res7), "in method '" "AuiTabArt_GetTabSize" "', expected argument " "7"" of type '" "int *""'"); } - arg6 = reinterpret_cast< int * >(argp6); + arg7 = reinterpret_cast< int * >(argp7); { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (arg1)->GetTabSize(arg2,(wxString const &)*arg3,arg4,arg5,arg6); + result = (arg1)->GetTabSize(arg2,arg3,(wxString const &)*arg4,arg5,arg6,arg7); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } resultobj = SWIG_NewPointerObj((new wxSize(static_cast< const wxSize& >(result))), SWIGTYPE_p_wxSize, SWIG_POINTER_OWN | 0 ); { - if (temp3) - delete arg3; + if (temp4) + delete arg4; } return resultobj; fail: { - if (temp3) - delete arg3; + if (temp4) + delete arg4; } return NULL; } @@ -15161,6 +15292,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"AuiTabArt_DrawBackground", (PyCFunction) _wrap_AuiTabArt_DrawBackground, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"AuiTabArt_DrawTab", (PyCFunction) _wrap_AuiTabArt_DrawTab, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"AuiTabArt_DrawButton", (PyCFunction) _wrap_AuiTabArt_DrawButton, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"AuiTabArt_ShowWindowList", (PyCFunction) _wrap_AuiTabArt_ShowWindowList, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"AuiTabArt_GetTabSize", (PyCFunction) _wrap_AuiTabArt_GetTabSize, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"AuiTabArt_GetBestTabCtrlSize", (PyCFunction) _wrap_AuiTabArt_GetBestTabCtrlSize, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"AuiTabArt_swigregister", AuiTabArt_swigregister, METH_VARARGS, NULL}, @@ -16530,6 +16662,7 @@ static swig_type_info _swigt__p_p_wxMDIParentFrame = {"_p_p_wxMDIParentFrame", 0 static swig_type_info _swigt__p_unsigned_char = {"_p_unsigned_char", "unsigned char *|byte *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_unsigned_int = {"_p_unsigned_int", "unsigned int *|time_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_unsigned_long = {"_p_unsigned_long", "unsigned long *|wxUIntPtr *", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_wxArrayString = {"_p_wxArrayString", "wxArrayString *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_wxAuiDefaultDockArt = {"_p_wxAuiDefaultDockArt", "wxAuiDefaultDockArt *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_wxAuiDefaultTabArt = {"_p_wxAuiDefaultTabArt", "wxAuiDefaultTabArt *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_wxAuiDockArt = {"_p_wxAuiDockArt", "wxAuiDockArt *", 0, 0, (void*)0, 0}; @@ -16764,6 +16897,7 @@ static swig_type_info *swig_type_initial[] = { &_swigt__p_wxANIHandler, &_swigt__p_wxAcceleratorTable, &_swigt__p_wxActivateEvent, + &_swigt__p_wxArrayString, &_swigt__p_wxAuiDefaultDockArt, &_swigt__p_wxAuiDefaultTabArt, &_swigt__p_wxAuiDockArt, @@ -16992,6 +17126,7 @@ static swig_cast_info _swigc__p_p_wxWindow[] = { {&_swigt__p_p_wxSplashScreen, static swig_cast_info _swigc__p_unsigned_char[] = { {&_swigt__p_unsigned_char, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_unsigned_int[] = { {&_swigt__p_unsigned_int, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_unsigned_long[] = { {&_swigt__p_unsigned_long, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_wxArrayString[] = { {&_swigt__p_wxArrayString, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxAuiDefaultDockArt[] = { {&_swigt__p_wxAuiDefaultDockArt, 0, 0, 0}, {&_swigt__p_wxPyAuiDockArt, _p_wxPyAuiDockArtTo_p_wxAuiDefaultDockArt, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxAuiDefaultTabArt[] = { {&_swigt__p_wxAuiDefaultTabArt, 0, 0, 0}, {&_swigt__p_wxPyAuiTabArt, _p_wxPyAuiTabArtTo_p_wxAuiDefaultTabArt, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxAuiDockArt[] = { {&_swigt__p_wxAuiDockArt, 0, 0, 0}, {&_swigt__p_wxAuiDefaultDockArt, _p_wxAuiDefaultDockArtTo_p_wxAuiDockArt, 0, 0}, {&_swigt__p_wxPyAuiDockArt, _p_wxPyAuiDockArtTo_p_wxAuiDockArt, 0, 0},{0, 0, 0, 0}}; @@ -17226,6 +17361,7 @@ static swig_cast_info *swig_cast_initial[] = { _swigc__p_wxANIHandler, _swigc__p_wxAcceleratorTable, _swigc__p_wxActivateEvent, + _swigc__p_wxArrayString, _swigc__p_wxAuiDefaultDockArt, _swigc__p_wxAuiDefaultTabArt, _swigc__p_wxAuiDockArt, @@ -17947,6 +18083,7 @@ SWIGEXPORT void SWIG_init(void) { SWIG_Python_SetConstant(d, "AUI_BUTTON_MINIMIZE",SWIG_From_int(static_cast< int >(wxAUI_BUTTON_MINIMIZE))); SWIG_Python_SetConstant(d, "AUI_BUTTON_PIN",SWIG_From_int(static_cast< int >(wxAUI_BUTTON_PIN))); SWIG_Python_SetConstant(d, "AUI_BUTTON_OPTIONS",SWIG_From_int(static_cast< int >(wxAUI_BUTTON_OPTIONS))); + SWIG_Python_SetConstant(d, "AUI_BUTTON_WINDOWLIST",SWIG_From_int(static_cast< int >(wxAUI_BUTTON_WINDOWLIST))); SWIG_Python_SetConstant(d, "AUI_BUTTON_LEFT",SWIG_From_int(static_cast< int >(wxAUI_BUTTON_LEFT))); SWIG_Python_SetConstant(d, "AUI_BUTTON_RIGHT",SWIG_From_int(static_cast< int >(wxAUI_BUTTON_RIGHT))); SWIG_Python_SetConstant(d, "AUI_BUTTON_UP",SWIG_From_int(static_cast< int >(wxAUI_BUTTON_UP))); @@ -18007,7 +18144,7 @@ SWIGEXPORT void SWIG_init(void) { SWIG_Python_SetConstant(d, "AUI_NB_TAB_SPLIT",SWIG_From_int(static_cast< int >(wxAUI_NB_TAB_SPLIT))); SWIG_Python_SetConstant(d, "AUI_NB_TAB_MOVE",SWIG_From_int(static_cast< int >(wxAUI_NB_TAB_MOVE))); SWIG_Python_SetConstant(d, "AUI_NB_SCROLL_BUTTONS",SWIG_From_int(static_cast< int >(wxAUI_NB_SCROLL_BUTTONS))); - SWIG_Python_SetConstant(d, "AUI_NB_PAGELIST_BUTTON",SWIG_From_int(static_cast< int >(wxAUI_NB_PAGELIST_BUTTON))); + SWIG_Python_SetConstant(d, "AUI_NB_WINDOWLIST_BUTTON",SWIG_From_int(static_cast< int >(wxAUI_NB_WINDOWLIST_BUTTON))); SWIG_Python_SetConstant(d, "AUI_NB_CLOSE_BUTTON",SWIG_From_int(static_cast< int >(wxAUI_NB_CLOSE_BUTTON))); SWIG_Python_SetConstant(d, "AUI_NB_CLOSE_ON_ACTIVE_TAB",SWIG_From_int(static_cast< int >(wxAUI_NB_CLOSE_ON_ACTIVE_TAB))); SWIG_Python_SetConstant(d, "AUI_NB_CLOSE_ON_ALL_TABS",SWIG_From_int(static_cast< int >(wxAUI_NB_CLOSE_ON_ALL_TABS))); -- 2.45.2