From 0a27f3943619be8fe8b3c6acb6140aae1c6503de Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Sun, 22 Oct 2006 03:08:27 +0000 Subject: [PATCH] reSWIGged git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42225 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- wxPython/src/gtk/_gdi.py | 56 ++- wxPython/src/gtk/_gdi_wrap.cpp | 572 +++++++++++++++++++++--------- wxPython/src/gtk/animate.py | 9 + wxPython/src/gtk/animate_wrap.cpp | 71 ++++ wxPython/src/gtk/xrc.py | 9 + wxPython/src/gtk/xrc_wrap.cpp | 323 +++++++++++------ wxPython/src/mac/_controls.py | 2 +- wxPython/src/mac/_gdi.py | 56 ++- wxPython/src/mac/_gdi_wrap.cpp | 572 +++++++++++++++++++++--------- wxPython/src/mac/animate.py | 9 + wxPython/src/mac/animate_wrap.cpp | 71 ++++ wxPython/src/mac/xrc.py | 9 + wxPython/src/mac/xrc_wrap.cpp | 323 +++++++++++------ wxPython/src/msw/_gdi.py | 56 ++- wxPython/src/msw/_gdi_wrap.cpp | 572 +++++++++++++++++++++--------- wxPython/src/msw/animate.py | 9 + wxPython/src/msw/animate_wrap.cpp | 71 ++++ wxPython/src/msw/xrc.py | 9 + wxPython/src/msw/xrc_wrap.cpp | 323 +++++++++++------ 19 files changed, 2254 insertions(+), 868 deletions(-) diff --git a/wxPython/src/gtk/_gdi.py b/wxPython/src/gtk/_gdi.py index fe6b8b93ff..4523047e2e 100644 --- a/wxPython/src/gtk/_gdi.py +++ b/wxPython/src/gtk/_gdi.py @@ -4921,13 +4921,19 @@ class GraphicsContext(object): __repr__ = _swig_repr __swig_destroy__ = _gdi_.delete_GraphicsContext __del__ = lambda self : None; - def Create(*args, **kwargs): - """Create(WindowDC dc) -> GraphicsContext""" - val = _gdi_.GraphicsContext_Create(*args, **kwargs) - val.__dc = args[0] # save a ref so the other dc will not be deleted before self - return val + def Create(*args): + """ + Create(WindowDC dc) -> GraphicsContext + Create(Window window) -> GraphicsContext + """ + return _gdi_.GraphicsContext_Create(*args) Create = staticmethod(Create) + def CreateFromNative(*args, **kwargs): + """CreateFromNative(void context) -> GraphicsContext""" + return _gdi_.GraphicsContext_CreateFromNative(*args, **kwargs) + + CreateFromNative = staticmethod(CreateFromNative) def CreatePath(*args, **kwargs): """CreatePath(self) -> GraphicsPath""" return _gdi_.GraphicsContext_CreatePath(*args, **kwargs) @@ -4940,10 +4946,22 @@ class GraphicsContext(object): """PopState(self)""" return _gdi_.GraphicsContext_PopState(*args, **kwargs) + def ClipRegion(*args, **kwargs): + """ClipRegion(self, Region region)""" + return _gdi_.GraphicsContext_ClipRegion(*args, **kwargs) + def Clip(*args, **kwargs): - """Clip(self, Region region)""" + """Clip(self, Double x, Double y, Double w, Double h)""" return _gdi_.GraphicsContext_Clip(*args, **kwargs) + def ResetClip(*args, **kwargs): + """ResetClip(self)""" + return _gdi_.GraphicsContext_ResetClip(*args, **kwargs) + + def GetNativeContext(*args, **kwargs): + """GetNativeContext(self) -> void""" + return _gdi_.GraphicsContext_GetNativeContext(*args, **kwargs) + def Translate(*args, **kwargs): """Translate(self, Double dx, Double dy)""" return _gdi_.GraphicsContext_Translate(*args, **kwargs) @@ -5052,11 +5070,16 @@ class GraphicsContext(object): _gdi_.GraphicsContext_swigregister(GraphicsContext) -def GraphicsContext_Create(*args, **kwargs): - """GraphicsContext_Create(WindowDC dc) -> GraphicsContext""" - val = _gdi_.GraphicsContext_Create(*args, **kwargs) - val.__dc = args[0] # save a ref so the other dc will not be deleted before self - return val +def GraphicsContext_Create(*args): + """ + Create(WindowDC dc) -> GraphicsContext + GraphicsContext_Create(Window window) -> GraphicsContext + """ + return _gdi_.GraphicsContext_Create(*args) + +def GraphicsContext_CreateFromNative(*args, **kwargs): + """GraphicsContext_CreateFromNative(void context) -> GraphicsContext""" + return _gdi_.GraphicsContext_CreateFromNative(*args, **kwargs) class GCDC(DC): """Proxy of C++ GCDC class""" @@ -5069,10 +5092,15 @@ class GCDC(DC): __swig_destroy__ = _gdi_.delete_GCDC __del__ = lambda self : None; - def GetGraphicContext(*args, **kwargs): - """GetGraphicContext(self) -> GraphicsContext""" - return _gdi_.GCDC_GetGraphicContext(*args, **kwargs) + def GetGraphicsContext(*args, **kwargs): + """GetGraphicsContext(self) -> GraphicsContext""" + return _gdi_.GCDC_GetGraphicsContext(*args, **kwargs) + + def SetGraphicsContext(*args, **kwargs): + """SetGraphicsContext(self, GraphicsContext ctx)""" + return _gdi_.GCDC_SetGraphicsContext(*args, **kwargs) + GraphicsContext = property(GetGraphicsContext,SetGraphicsContext) _gdi_.GCDC_swigregister(GCDC) class Overlay(object): diff --git a/wxPython/src/gtk/_gdi_wrap.cpp b/wxPython/src/gtk/_gdi_wrap.cpp index 2684cc91a3..9f985b993d 100644 --- a/wxPython/src/gtk/_gdi_wrap.cpp +++ b/wxPython/src/gtk/_gdi_wrap.cpp @@ -2471,157 +2471,158 @@ SWIG_Python_MustGetPtr(PyObject *obj, swig_type_info *ty, int argnum, int flags) #define SWIGTYPE_p_unsigned_char swig_types[5] #define SWIGTYPE_p_unsigned_int swig_types[6] #define SWIGTYPE_p_unsigned_long swig_types[7] -#define SWIGTYPE_p_wxANIHandler swig_types[8] -#define SWIGTYPE_p_wxAcceleratorTable swig_types[9] -#define SWIGTYPE_p_wxActivateEvent swig_types[10] -#define SWIGTYPE_p_wxAlphaPixelData swig_types[11] -#define SWIGTYPE_p_wxAlphaPixelData_Accessor swig_types[12] -#define SWIGTYPE_p_wxAutoBufferedPaintDC swig_types[13] -#define SWIGTYPE_p_wxBMPHandler swig_types[14] -#define SWIGTYPE_p_wxBitmap swig_types[15] -#define SWIGTYPE_p_wxBoxSizer swig_types[16] -#define SWIGTYPE_p_wxBrush swig_types[17] -#define SWIGTYPE_p_wxBrushList swig_types[18] -#define SWIGTYPE_p_wxBufferedDC swig_types[19] -#define SWIGTYPE_p_wxBufferedPaintDC swig_types[20] -#define SWIGTYPE_p_wxCURHandler swig_types[21] -#define SWIGTYPE_p_wxChar swig_types[22] -#define SWIGTYPE_p_wxChildFocusEvent swig_types[23] -#define SWIGTYPE_p_wxClientDC swig_types[24] -#define SWIGTYPE_p_wxClipboardTextEvent swig_types[25] -#define SWIGTYPE_p_wxCloseEvent swig_types[26] -#define SWIGTYPE_p_wxColor swig_types[27] -#define SWIGTYPE_p_wxColour swig_types[28] -#define SWIGTYPE_p_wxColourDatabase swig_types[29] -#define SWIGTYPE_p_wxCommandEvent swig_types[30] -#define SWIGTYPE_p_wxContextMenuEvent swig_types[31] -#define SWIGTYPE_p_wxControl swig_types[32] -#define SWIGTYPE_p_wxControlWithItems swig_types[33] -#define SWIGTYPE_p_wxCursor swig_types[34] -#define SWIGTYPE_p_wxDC swig_types[35] -#define SWIGTYPE_p_wxDCOverlay swig_types[36] -#define SWIGTYPE_p_wxDash swig_types[37] -#define SWIGTYPE_p_wxDateEvent swig_types[38] -#define SWIGTYPE_p_wxDisplayChangedEvent swig_types[39] -#define SWIGTYPE_p_wxDropFilesEvent swig_types[40] -#define SWIGTYPE_p_wxDuplexMode swig_types[41] -#define SWIGTYPE_p_wxEffects swig_types[42] -#define SWIGTYPE_p_wxEncodingConverter swig_types[43] -#define SWIGTYPE_p_wxEraseEvent swig_types[44] -#define SWIGTYPE_p_wxEvent swig_types[45] -#define SWIGTYPE_p_wxEvtHandler swig_types[46] -#define SWIGTYPE_p_wxFSFile swig_types[47] -#define SWIGTYPE_p_wxFileSystem swig_types[48] -#define SWIGTYPE_p_wxFlexGridSizer swig_types[49] -#define SWIGTYPE_p_wxFocusEvent swig_types[50] -#define SWIGTYPE_p_wxFont swig_types[51] -#define SWIGTYPE_p_wxFontList swig_types[52] -#define SWIGTYPE_p_wxFontMapper swig_types[53] -#define SWIGTYPE_p_wxGBSizerItem swig_types[54] -#define SWIGTYPE_p_wxGCDC swig_types[55] -#define SWIGTYPE_p_wxGDIObjListBase swig_types[56] -#define SWIGTYPE_p_wxGDIObject swig_types[57] -#define SWIGTYPE_p_wxGIFHandler swig_types[58] -#define SWIGTYPE_p_wxGraphicsContext swig_types[59] -#define SWIGTYPE_p_wxGraphicsPath swig_types[60] -#define SWIGTYPE_p_wxGridBagSizer swig_types[61] -#define SWIGTYPE_p_wxGridSizer swig_types[62] -#define SWIGTYPE_p_wxHeaderButtonParams swig_types[63] -#define SWIGTYPE_p_wxICOHandler swig_types[64] -#define SWIGTYPE_p_wxIcon swig_types[65] -#define SWIGTYPE_p_wxIconBundle swig_types[66] -#define SWIGTYPE_p_wxIconLocation swig_types[67] -#define SWIGTYPE_p_wxIconizeEvent swig_types[68] -#define SWIGTYPE_p_wxIdleEvent swig_types[69] -#define SWIGTYPE_p_wxImage swig_types[70] -#define SWIGTYPE_p_wxImageHandler swig_types[71] -#define SWIGTYPE_p_wxImageList swig_types[72] -#define SWIGTYPE_p_wxIndividualLayoutConstraint swig_types[73] -#define SWIGTYPE_p_wxInitDialogEvent swig_types[74] -#define SWIGTYPE_p_wxJPEGHandler swig_types[75] -#define SWIGTYPE_p_wxKeyEvent swig_types[76] -#define SWIGTYPE_p_wxLanguageInfo swig_types[77] -#define SWIGTYPE_p_wxLayoutConstraints swig_types[78] -#define SWIGTYPE_p_wxLocale swig_types[79] -#define SWIGTYPE_p_wxMask swig_types[80] -#define SWIGTYPE_p_wxMaximizeEvent swig_types[81] -#define SWIGTYPE_p_wxMemoryDC swig_types[82] -#define SWIGTYPE_p_wxMenu swig_types[83] -#define SWIGTYPE_p_wxMenuBar swig_types[84] -#define SWIGTYPE_p_wxMenuEvent swig_types[85] -#define SWIGTYPE_p_wxMenuItem swig_types[86] -#define SWIGTYPE_p_wxMetaFile swig_types[87] -#define SWIGTYPE_p_wxMetaFileDC swig_types[88] -#define SWIGTYPE_p_wxMirrorDC swig_types[89] -#define SWIGTYPE_p_wxMouseCaptureChangedEvent swig_types[90] -#define SWIGTYPE_p_wxMouseCaptureLostEvent swig_types[91] -#define SWIGTYPE_p_wxMouseEvent swig_types[92] -#define SWIGTYPE_p_wxMoveEvent swig_types[93] -#define SWIGTYPE_p_wxNativeEncodingInfo swig_types[94] -#define SWIGTYPE_p_wxNativeFontInfo swig_types[95] -#define SWIGTYPE_p_wxNativePixelData swig_types[96] -#define SWIGTYPE_p_wxNativePixelData_Accessor swig_types[97] -#define SWIGTYPE_p_wxNavigationKeyEvent swig_types[98] -#define SWIGTYPE_p_wxNcPaintEvent swig_types[99] -#define SWIGTYPE_p_wxNotifyEvent swig_types[100] -#define SWIGTYPE_p_wxObject swig_types[101] -#define SWIGTYPE_p_wxOverlay swig_types[102] -#define SWIGTYPE_p_wxPCXHandler swig_types[103] -#define SWIGTYPE_p_wxPNGHandler swig_types[104] -#define SWIGTYPE_p_wxPNMHandler swig_types[105] -#define SWIGTYPE_p_wxPaintDC swig_types[106] -#define SWIGTYPE_p_wxPaintEvent swig_types[107] -#define SWIGTYPE_p_wxPalette swig_types[108] -#define SWIGTYPE_p_wxPaletteChangedEvent swig_types[109] -#define SWIGTYPE_p_wxPaperSize swig_types[110] -#define SWIGTYPE_p_wxPen swig_types[111] -#define SWIGTYPE_p_wxPenList swig_types[112] -#define SWIGTYPE_p_wxPixelDataBase swig_types[113] -#define SWIGTYPE_p_wxPoint swig_types[114] -#define SWIGTYPE_p_wxPoint2D swig_types[115] -#define SWIGTYPE_p_wxPostScriptDC swig_types[116] -#define SWIGTYPE_p_wxPrintData swig_types[117] -#define SWIGTYPE_p_wxPrinterDC swig_types[118] -#define SWIGTYPE_p_wxPseudoDC swig_types[119] -#define SWIGTYPE_p_wxPyApp swig_types[120] -#define SWIGTYPE_p_wxPyCommandEvent swig_types[121] -#define SWIGTYPE_p_wxPyEvent swig_types[122] -#define SWIGTYPE_p_wxPyFontEnumerator swig_types[123] -#define SWIGTYPE_p_wxPyImageHandler swig_types[124] -#define SWIGTYPE_p_wxPyLocale swig_types[125] -#define SWIGTYPE_p_wxPySizer swig_types[126] -#define SWIGTYPE_p_wxPyValidator swig_types[127] -#define SWIGTYPE_p_wxQueryNewPaletteEvent swig_types[128] -#define SWIGTYPE_p_wxRect swig_types[129] -#define SWIGTYPE_p_wxRegion swig_types[130] -#define SWIGTYPE_p_wxRegionIterator swig_types[131] -#define SWIGTYPE_p_wxRendererNative swig_types[132] -#define SWIGTYPE_p_wxRendererVersion swig_types[133] -#define SWIGTYPE_p_wxScreenDC swig_types[134] -#define SWIGTYPE_p_wxScrollEvent swig_types[135] -#define SWIGTYPE_p_wxScrollWinEvent swig_types[136] -#define SWIGTYPE_p_wxSetCursorEvent swig_types[137] -#define SWIGTYPE_p_wxShowEvent swig_types[138] -#define SWIGTYPE_p_wxSize swig_types[139] -#define SWIGTYPE_p_wxSizeEvent swig_types[140] -#define SWIGTYPE_p_wxSizer swig_types[141] -#define SWIGTYPE_p_wxSizerItem swig_types[142] -#define SWIGTYPE_p_wxSplitterRenderParams swig_types[143] -#define SWIGTYPE_p_wxStaticBoxSizer swig_types[144] -#define SWIGTYPE_p_wxStdDialogButtonSizer swig_types[145] -#define SWIGTYPE_p_wxStockGDI swig_types[146] -#define SWIGTYPE_p_wxString swig_types[147] -#define SWIGTYPE_p_wxSysColourChangedEvent swig_types[148] -#define SWIGTYPE_p_wxTIFFHandler swig_types[149] -#define SWIGTYPE_p_wxUpdateUIEvent swig_types[150] -#define SWIGTYPE_p_wxValidator swig_types[151] -#define SWIGTYPE_p_wxWindow swig_types[152] -#define SWIGTYPE_p_wxWindowCreateEvent swig_types[153] -#define SWIGTYPE_p_wxWindowDC swig_types[154] -#define SWIGTYPE_p_wxWindowDestroyEvent swig_types[155] -#define SWIGTYPE_p_wxXPMHandler swig_types[156] -static swig_type_info *swig_types[158]; -static swig_module_info swig_module = {swig_types, 157, 0, 0, 0, 0}; +#define SWIGTYPE_p_void swig_types[8] +#define SWIGTYPE_p_wxANIHandler swig_types[9] +#define SWIGTYPE_p_wxAcceleratorTable swig_types[10] +#define SWIGTYPE_p_wxActivateEvent swig_types[11] +#define SWIGTYPE_p_wxAlphaPixelData swig_types[12] +#define SWIGTYPE_p_wxAlphaPixelData_Accessor swig_types[13] +#define SWIGTYPE_p_wxAutoBufferedPaintDC swig_types[14] +#define SWIGTYPE_p_wxBMPHandler swig_types[15] +#define SWIGTYPE_p_wxBitmap swig_types[16] +#define SWIGTYPE_p_wxBoxSizer swig_types[17] +#define SWIGTYPE_p_wxBrush swig_types[18] +#define SWIGTYPE_p_wxBrushList swig_types[19] +#define SWIGTYPE_p_wxBufferedDC swig_types[20] +#define SWIGTYPE_p_wxBufferedPaintDC swig_types[21] +#define SWIGTYPE_p_wxCURHandler swig_types[22] +#define SWIGTYPE_p_wxChar swig_types[23] +#define SWIGTYPE_p_wxChildFocusEvent swig_types[24] +#define SWIGTYPE_p_wxClientDC swig_types[25] +#define SWIGTYPE_p_wxClipboardTextEvent swig_types[26] +#define SWIGTYPE_p_wxCloseEvent swig_types[27] +#define SWIGTYPE_p_wxColor swig_types[28] +#define SWIGTYPE_p_wxColour swig_types[29] +#define SWIGTYPE_p_wxColourDatabase swig_types[30] +#define SWIGTYPE_p_wxCommandEvent swig_types[31] +#define SWIGTYPE_p_wxContextMenuEvent swig_types[32] +#define SWIGTYPE_p_wxControl swig_types[33] +#define SWIGTYPE_p_wxControlWithItems swig_types[34] +#define SWIGTYPE_p_wxCursor swig_types[35] +#define SWIGTYPE_p_wxDC swig_types[36] +#define SWIGTYPE_p_wxDCOverlay swig_types[37] +#define SWIGTYPE_p_wxDash swig_types[38] +#define SWIGTYPE_p_wxDateEvent swig_types[39] +#define SWIGTYPE_p_wxDisplayChangedEvent swig_types[40] +#define SWIGTYPE_p_wxDropFilesEvent swig_types[41] +#define SWIGTYPE_p_wxDuplexMode swig_types[42] +#define SWIGTYPE_p_wxEffects swig_types[43] +#define SWIGTYPE_p_wxEncodingConverter swig_types[44] +#define SWIGTYPE_p_wxEraseEvent swig_types[45] +#define SWIGTYPE_p_wxEvent swig_types[46] +#define SWIGTYPE_p_wxEvtHandler swig_types[47] +#define SWIGTYPE_p_wxFSFile swig_types[48] +#define SWIGTYPE_p_wxFileSystem swig_types[49] +#define SWIGTYPE_p_wxFlexGridSizer swig_types[50] +#define SWIGTYPE_p_wxFocusEvent swig_types[51] +#define SWIGTYPE_p_wxFont swig_types[52] +#define SWIGTYPE_p_wxFontList swig_types[53] +#define SWIGTYPE_p_wxFontMapper swig_types[54] +#define SWIGTYPE_p_wxGBSizerItem swig_types[55] +#define SWIGTYPE_p_wxGCDC swig_types[56] +#define SWIGTYPE_p_wxGDIObjListBase swig_types[57] +#define SWIGTYPE_p_wxGDIObject swig_types[58] +#define SWIGTYPE_p_wxGIFHandler swig_types[59] +#define SWIGTYPE_p_wxGraphicsContext swig_types[60] +#define SWIGTYPE_p_wxGraphicsPath swig_types[61] +#define SWIGTYPE_p_wxGridBagSizer swig_types[62] +#define SWIGTYPE_p_wxGridSizer swig_types[63] +#define SWIGTYPE_p_wxHeaderButtonParams swig_types[64] +#define SWIGTYPE_p_wxICOHandler swig_types[65] +#define SWIGTYPE_p_wxIcon swig_types[66] +#define SWIGTYPE_p_wxIconBundle swig_types[67] +#define SWIGTYPE_p_wxIconLocation swig_types[68] +#define SWIGTYPE_p_wxIconizeEvent swig_types[69] +#define SWIGTYPE_p_wxIdleEvent swig_types[70] +#define SWIGTYPE_p_wxImage swig_types[71] +#define SWIGTYPE_p_wxImageHandler swig_types[72] +#define SWIGTYPE_p_wxImageList swig_types[73] +#define SWIGTYPE_p_wxIndividualLayoutConstraint swig_types[74] +#define SWIGTYPE_p_wxInitDialogEvent swig_types[75] +#define SWIGTYPE_p_wxJPEGHandler swig_types[76] +#define SWIGTYPE_p_wxKeyEvent swig_types[77] +#define SWIGTYPE_p_wxLanguageInfo swig_types[78] +#define SWIGTYPE_p_wxLayoutConstraints swig_types[79] +#define SWIGTYPE_p_wxLocale swig_types[80] +#define SWIGTYPE_p_wxMask swig_types[81] +#define SWIGTYPE_p_wxMaximizeEvent swig_types[82] +#define SWIGTYPE_p_wxMemoryDC swig_types[83] +#define SWIGTYPE_p_wxMenu swig_types[84] +#define SWIGTYPE_p_wxMenuBar swig_types[85] +#define SWIGTYPE_p_wxMenuEvent swig_types[86] +#define SWIGTYPE_p_wxMenuItem swig_types[87] +#define SWIGTYPE_p_wxMetaFile swig_types[88] +#define SWIGTYPE_p_wxMetaFileDC swig_types[89] +#define SWIGTYPE_p_wxMirrorDC swig_types[90] +#define SWIGTYPE_p_wxMouseCaptureChangedEvent swig_types[91] +#define SWIGTYPE_p_wxMouseCaptureLostEvent swig_types[92] +#define SWIGTYPE_p_wxMouseEvent swig_types[93] +#define SWIGTYPE_p_wxMoveEvent swig_types[94] +#define SWIGTYPE_p_wxNativeEncodingInfo swig_types[95] +#define SWIGTYPE_p_wxNativeFontInfo swig_types[96] +#define SWIGTYPE_p_wxNativePixelData swig_types[97] +#define SWIGTYPE_p_wxNativePixelData_Accessor swig_types[98] +#define SWIGTYPE_p_wxNavigationKeyEvent swig_types[99] +#define SWIGTYPE_p_wxNcPaintEvent swig_types[100] +#define SWIGTYPE_p_wxNotifyEvent swig_types[101] +#define SWIGTYPE_p_wxObject swig_types[102] +#define SWIGTYPE_p_wxOverlay swig_types[103] +#define SWIGTYPE_p_wxPCXHandler swig_types[104] +#define SWIGTYPE_p_wxPNGHandler swig_types[105] +#define SWIGTYPE_p_wxPNMHandler swig_types[106] +#define SWIGTYPE_p_wxPaintDC swig_types[107] +#define SWIGTYPE_p_wxPaintEvent swig_types[108] +#define SWIGTYPE_p_wxPalette swig_types[109] +#define SWIGTYPE_p_wxPaletteChangedEvent swig_types[110] +#define SWIGTYPE_p_wxPaperSize swig_types[111] +#define SWIGTYPE_p_wxPen swig_types[112] +#define SWIGTYPE_p_wxPenList swig_types[113] +#define SWIGTYPE_p_wxPixelDataBase swig_types[114] +#define SWIGTYPE_p_wxPoint swig_types[115] +#define SWIGTYPE_p_wxPoint2D swig_types[116] +#define SWIGTYPE_p_wxPostScriptDC swig_types[117] +#define SWIGTYPE_p_wxPrintData swig_types[118] +#define SWIGTYPE_p_wxPrinterDC swig_types[119] +#define SWIGTYPE_p_wxPseudoDC swig_types[120] +#define SWIGTYPE_p_wxPyApp swig_types[121] +#define SWIGTYPE_p_wxPyCommandEvent swig_types[122] +#define SWIGTYPE_p_wxPyEvent swig_types[123] +#define SWIGTYPE_p_wxPyFontEnumerator swig_types[124] +#define SWIGTYPE_p_wxPyImageHandler swig_types[125] +#define SWIGTYPE_p_wxPyLocale swig_types[126] +#define SWIGTYPE_p_wxPySizer swig_types[127] +#define SWIGTYPE_p_wxPyValidator swig_types[128] +#define SWIGTYPE_p_wxQueryNewPaletteEvent swig_types[129] +#define SWIGTYPE_p_wxRect swig_types[130] +#define SWIGTYPE_p_wxRegion swig_types[131] +#define SWIGTYPE_p_wxRegionIterator swig_types[132] +#define SWIGTYPE_p_wxRendererNative swig_types[133] +#define SWIGTYPE_p_wxRendererVersion swig_types[134] +#define SWIGTYPE_p_wxScreenDC swig_types[135] +#define SWIGTYPE_p_wxScrollEvent swig_types[136] +#define SWIGTYPE_p_wxScrollWinEvent swig_types[137] +#define SWIGTYPE_p_wxSetCursorEvent swig_types[138] +#define SWIGTYPE_p_wxShowEvent swig_types[139] +#define SWIGTYPE_p_wxSize swig_types[140] +#define SWIGTYPE_p_wxSizeEvent swig_types[141] +#define SWIGTYPE_p_wxSizer swig_types[142] +#define SWIGTYPE_p_wxSizerItem swig_types[143] +#define SWIGTYPE_p_wxSplitterRenderParams swig_types[144] +#define SWIGTYPE_p_wxStaticBoxSizer swig_types[145] +#define SWIGTYPE_p_wxStdDialogButtonSizer swig_types[146] +#define SWIGTYPE_p_wxStockGDI swig_types[147] +#define SWIGTYPE_p_wxString swig_types[148] +#define SWIGTYPE_p_wxSysColourChangedEvent swig_types[149] +#define SWIGTYPE_p_wxTIFFHandler swig_types[150] +#define SWIGTYPE_p_wxUpdateUIEvent swig_types[151] +#define SWIGTYPE_p_wxValidator swig_types[152] +#define SWIGTYPE_p_wxWindow swig_types[153] +#define SWIGTYPE_p_wxWindowCreateEvent swig_types[154] +#define SWIGTYPE_p_wxWindowDC swig_types[155] +#define SWIGTYPE_p_wxWindowDestroyEvent swig_types[156] +#define SWIGTYPE_p_wxXPMHandler swig_types[157] +static swig_type_info *swig_types[159]; +static swig_module_info swig_module = {swig_types, 158, 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) @@ -3688,6 +3689,9 @@ SWIGINTERN void wxGraphicsContext_StrokeLineSegements(wxGraphicsContext *self,Py delete [] endP; } +#include "wx/dcgraph.h" + + SWIGINTERN void wxColourDatabase_Append(wxColourDatabase *self,wxString const &name,int red,int green,int blue){ self->AddColour(name, wxColour(red, green, blue)); @@ -24842,19 +24846,15 @@ fail: } -SWIGINTERN PyObject *_wrap_GraphicsContext_Create(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { +SWIGINTERN PyObject *_wrap_GraphicsContext_Create__SWIG_0(PyObject *SWIGUNUSEDPARM(self), int nobjs, PyObject **swig_obj) { PyObject *resultobj = 0; wxWindowDC *arg1 = 0 ; wxGraphicsContext *result = 0 ; void *argp1 = 0 ; int res1 = 0 ; - PyObject * obj0 = 0 ; - char * kwnames[] = { - (char *) "dc", NULL - }; - if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:GraphicsContext_Create",kwnames,&obj0)) SWIG_fail; - res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_wxWindowDC, 0 | 0); + if ((nobjs < 1) || (nobjs > 1)) SWIG_fail; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1, SWIGTYPE_p_wxWindowDC, 0 | 0); if (!SWIG_IsOK(res1)) { SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GraphicsContext_Create" "', expected argument " "1"" of type '" "wxWindowDC const &""'"); } @@ -24873,6 +24873,83 @@ fail: } +SWIGINTERN PyObject *_wrap_GraphicsContext_Create__SWIG_1(PyObject *SWIGUNUSEDPARM(self), int nobjs, PyObject **swig_obj) { + PyObject *resultobj = 0; + wxWindow *arg1 = (wxWindow *) 0 ; + wxGraphicsContext *result = 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + + if ((nobjs < 1) || (nobjs > 1)) SWIG_fail; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxWindow, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GraphicsContext_Create" "', expected argument " "1"" of type '" "wxWindow *""'"); + } + arg1 = reinterpret_cast< wxWindow * >(argp1); + { + result = (wxGraphicsContext *)wxGraphicsContext::Create(arg1); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxGraphicsContext, 0 | 0 ); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_GraphicsContext_Create(PyObject *self, PyObject *args) { + int argc; + PyObject *argv[2]; + + if (!(argc = SWIG_Python_UnpackTuple(args,"GraphicsContext_Create",0,1,argv))) SWIG_fail; + --argc; + if (argc == 1) { + int _v = 0; + { + int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_wxWindowDC, 0); + _v = SWIG_CheckState(res); + } + if (!_v) goto check_1; + return _wrap_GraphicsContext_Create__SWIG_0(self, argc, argv); + } +check_1: + + if (argc == 1) { + return _wrap_GraphicsContext_Create__SWIG_1(self, argc, argv); + } + +fail: + SWIG_SetErrorMsg(PyExc_NotImplementedError,"No matching function for overloaded 'GraphicsContext_Create'"); + return NULL; +} + + +SWIGINTERN PyObject *_wrap_GraphicsContext_CreateFromNative(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { + PyObject *resultobj = 0; + void *arg1 = (void *) 0 ; + wxGraphicsContext *result = 0 ; + int res1 ; + PyObject * obj0 = 0 ; + char * kwnames[] = { + (char *) "context", NULL + }; + + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:GraphicsContext_CreateFromNative",kwnames,&obj0)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0,SWIG_as_voidptrptr(&arg1), 0, 0); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GraphicsContext_CreateFromNative" "', expected argument " "1"" of type '" "void *""'"); + } + { + result = (wxGraphicsContext *)wxGraphicsContext::CreateFromNative(arg1); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxGraphicsContext, 0 | 0 ); + return resultobj; +fail: + return NULL; +} + + SWIGINTERN PyObject *_wrap_GraphicsContext_CreatePath(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; wxGraphicsContext *arg1 = (wxGraphicsContext *) 0 ; @@ -24949,7 +25026,7 @@ fail: } -SWIGINTERN PyObject *_wrap_GraphicsContext_Clip(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { +SWIGINTERN PyObject *_wrap_GraphicsContext_ClipRegion(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxGraphicsContext *arg1 = (wxGraphicsContext *) 0 ; wxRegion *arg2 = 0 ; @@ -24963,18 +25040,18 @@ SWIGINTERN PyObject *_wrap_GraphicsContext_Clip(PyObject *SWIGUNUSEDPARM(self), (char *) "self",(char *) "region", NULL }; - if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:GraphicsContext_Clip",kwnames,&obj0,&obj1)) SWIG_fail; + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:GraphicsContext_ClipRegion",kwnames,&obj0,&obj1)) SWIG_fail; res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxGraphicsContext, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GraphicsContext_Clip" "', expected argument " "1"" of type '" "wxGraphicsContext *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GraphicsContext_ClipRegion" "', expected argument " "1"" of type '" "wxGraphicsContext *""'"); } arg1 = reinterpret_cast< wxGraphicsContext * >(argp1); res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_wxRegion, 0 | 0); if (!SWIG_IsOK(res2)) { - SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "GraphicsContext_Clip" "', expected argument " "2"" of type '" "wxRegion const &""'"); + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "GraphicsContext_ClipRegion" "', expected argument " "2"" of type '" "wxRegion const &""'"); } if (!argp2) { - SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "GraphicsContext_Clip" "', expected argument " "2"" of type '" "wxRegion const &""'"); + SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "GraphicsContext_ClipRegion" "', expected argument " "2"" of type '" "wxRegion const &""'"); } arg2 = reinterpret_cast< wxRegion * >(argp2); { @@ -24988,6 +25065,120 @@ fail: } +SWIGINTERN PyObject *_wrap_GraphicsContext_Clip(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { + PyObject *resultobj = 0; + wxGraphicsContext *arg1 = (wxGraphicsContext *) 0 ; + wxDouble arg2 ; + wxDouble arg3 ; + wxDouble arg4 ; + wxDouble arg5 ; + void *argp1 = 0 ; + int res1 = 0 ; + double val2 ; + int ecode2 = 0 ; + double val3 ; + int ecode3 = 0 ; + double val4 ; + int ecode4 = 0 ; + double val5 ; + int ecode5 = 0 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + char * kwnames[] = { + (char *) "self",(char *) "x",(char *) "y",(char *) "w",(char *) "h", NULL + }; + + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:GraphicsContext_Clip",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxGraphicsContext, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GraphicsContext_Clip" "', expected argument " "1"" of type '" "wxGraphicsContext *""'"); + } + arg1 = reinterpret_cast< wxGraphicsContext * >(argp1); + ecode2 = SWIG_AsVal_double(obj1, &val2); + if (!SWIG_IsOK(ecode2)) { + SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "GraphicsContext_Clip" "', expected argument " "2"" of type '" "wxDouble""'"); + } + arg2 = static_cast< wxDouble >(val2); + ecode3 = SWIG_AsVal_double(obj2, &val3); + if (!SWIG_IsOK(ecode3)) { + SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "GraphicsContext_Clip" "', expected argument " "3"" of type '" "wxDouble""'"); + } + arg3 = static_cast< wxDouble >(val3); + ecode4 = SWIG_AsVal_double(obj3, &val4); + if (!SWIG_IsOK(ecode4)) { + SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "GraphicsContext_Clip" "', expected argument " "4"" of type '" "wxDouble""'"); + } + arg4 = static_cast< wxDouble >(val4); + ecode5 = SWIG_AsVal_double(obj4, &val5); + if (!SWIG_IsOK(ecode5)) { + SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "GraphicsContext_Clip" "', expected argument " "5"" of type '" "wxDouble""'"); + } + arg5 = static_cast< wxDouble >(val5); + { + (arg1)->Clip(arg2,arg3,arg4,arg5); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_Py_Void(); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_GraphicsContext_ResetClip(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + wxGraphicsContext *arg1 = (wxGraphicsContext *) 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject *swig_obj[1] ; + + if (!args) SWIG_fail; + swig_obj[0] = args; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxGraphicsContext, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GraphicsContext_ResetClip" "', expected argument " "1"" of type '" "wxGraphicsContext *""'"); + } + arg1 = reinterpret_cast< wxGraphicsContext * >(argp1); + { + (arg1)->ResetClip(); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_Py_Void(); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_GraphicsContext_GetNativeContext(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + wxGraphicsContext *arg1 = (wxGraphicsContext *) 0 ; + void *result = 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject *swig_obj[1] ; + + if (!args) SWIG_fail; + swig_obj[0] = args; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxGraphicsContext, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GraphicsContext_GetNativeContext" "', expected argument " "1"" of type '" "wxGraphicsContext *""'"); + } + arg1 = reinterpret_cast< wxGraphicsContext * >(argp1); + { + result = (void *)(arg1)->GetNativeContext(); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_void, 0 | 0 ); + return resultobj; +fail: + return NULL; +} + + SWIGINTERN PyObject *_wrap_GraphicsContext_Translate(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxGraphicsContext *arg1 = (wxGraphicsContext *) 0 ; @@ -26420,7 +26611,7 @@ fail: } -SWIGINTERN PyObject *_wrap_GCDC_GetGraphicContext(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { +SWIGINTERN PyObject *_wrap_GCDC_GetGraphicsContext(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; wxGCDC *arg1 = (wxGCDC *) 0 ; wxGraphicsContext *result = 0 ; @@ -26432,11 +26623,11 @@ SWIGINTERN PyObject *_wrap_GCDC_GetGraphicContext(PyObject *SWIGUNUSEDPARM(self) swig_obj[0] = args; res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxGCDC, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GCDC_GetGraphicContext" "', expected argument " "1"" of type '" "wxGCDC *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GCDC_GetGraphicsContext" "', expected argument " "1"" of type '" "wxGCDC *""'"); } arg1 = reinterpret_cast< wxGCDC * >(argp1); { - result = (wxGraphicsContext *)(arg1)->GetGraphicContext(); + result = (wxGraphicsContext *)(arg1)->GetGraphicsContext(); if (PyErr_Occurred()) SWIG_fail; } resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxGraphicsContext, 0 | 0 ); @@ -26446,6 +26637,42 @@ fail: } +SWIGINTERN PyObject *_wrap_GCDC_SetGraphicsContext(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { + PyObject *resultobj = 0; + wxGCDC *arg1 = (wxGCDC *) 0 ; + wxGraphicsContext *arg2 = (wxGraphicsContext *) 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + void *argp2 = 0 ; + int res2 = 0 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char * kwnames[] = { + (char *) "self",(char *) "ctx", NULL + }; + + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:GCDC_SetGraphicsContext",kwnames,&obj0,&obj1)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxGCDC, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GCDC_SetGraphicsContext" "', expected argument " "1"" of type '" "wxGCDC *""'"); + } + arg1 = reinterpret_cast< wxGCDC * >(argp1); + res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_wxGraphicsContext, 0 | 0 ); + if (!SWIG_IsOK(res2)) { + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "GCDC_SetGraphicsContext" "', expected argument " "2"" of type '" "wxGraphicsContext *""'"); + } + arg2 = reinterpret_cast< wxGraphicsContext * >(argp2); + { + (arg1)->SetGraphicsContext(arg2); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_Py_Void(); + return resultobj; +fail: + return NULL; +} + + SWIGINTERN PyObject *GCDC_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *obj; if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL; @@ -34774,11 +35001,15 @@ static PyMethodDef SwigMethods[] = { { (char *)"GraphicsPath_AddArcToPoint", (PyCFunction) _wrap_GraphicsPath_AddArcToPoint, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"GraphicsPath_swigregister", GraphicsPath_swigregister, METH_VARARGS, NULL}, { (char *)"delete_GraphicsContext", (PyCFunction)_wrap_delete_GraphicsContext, METH_O, NULL}, - { (char *)"GraphicsContext_Create", (PyCFunction) _wrap_GraphicsContext_Create, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"GraphicsContext_Create", _wrap_GraphicsContext_Create, METH_VARARGS, NULL}, + { (char *)"GraphicsContext_CreateFromNative", (PyCFunction) _wrap_GraphicsContext_CreateFromNative, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"GraphicsContext_CreatePath", (PyCFunction)_wrap_GraphicsContext_CreatePath, METH_O, NULL}, { (char *)"GraphicsContext_PushState", (PyCFunction)_wrap_GraphicsContext_PushState, METH_O, NULL}, { (char *)"GraphicsContext_PopState", (PyCFunction)_wrap_GraphicsContext_PopState, METH_O, NULL}, + { (char *)"GraphicsContext_ClipRegion", (PyCFunction) _wrap_GraphicsContext_ClipRegion, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"GraphicsContext_Clip", (PyCFunction) _wrap_GraphicsContext_Clip, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"GraphicsContext_ResetClip", (PyCFunction)_wrap_GraphicsContext_ResetClip, METH_O, NULL}, + { (char *)"GraphicsContext_GetNativeContext", (PyCFunction)_wrap_GraphicsContext_GetNativeContext, METH_O, NULL}, { (char *)"GraphicsContext_Translate", (PyCFunction) _wrap_GraphicsContext_Translate, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"GraphicsContext_Scale", (PyCFunction) _wrap_GraphicsContext_Scale, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"GraphicsContext_Rotate", (PyCFunction) _wrap_GraphicsContext_Rotate, METH_VARARGS | METH_KEYWORDS, NULL}, @@ -34807,7 +35038,8 @@ static PyMethodDef SwigMethods[] = { { (char *)"GraphicsContext_swigregister", GraphicsContext_swigregister, METH_VARARGS, NULL}, { (char *)"new_GCDC", (PyCFunction) _wrap_new_GCDC, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"delete_GCDC", (PyCFunction)_wrap_delete_GCDC, METH_O, NULL}, - { (char *)"GCDC_GetGraphicContext", (PyCFunction)_wrap_GCDC_GetGraphicContext, METH_O, NULL}, + { (char *)"GCDC_GetGraphicsContext", (PyCFunction)_wrap_GCDC_GetGraphicsContext, METH_O, NULL}, + { (char *)"GCDC_SetGraphicsContext", (PyCFunction) _wrap_GCDC_SetGraphicsContext, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"GCDC_swigregister", GCDC_swigregister, METH_VARARGS, NULL}, { (char *)"GCDC_swiginit", GCDC_swiginit, METH_VARARGS, NULL}, { (char *)"new_Overlay", (PyCFunction)_wrap_new_Overlay, METH_NOARGS, NULL}, @@ -35459,6 +35691,7 @@ static swig_type_info _swigt__p_int = {"_p_int", "int *", 0, 0, (void*)0, 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_void = {"_p_void", "void *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_wxAlphaPixelData = {"_p_wxAlphaPixelData", "wxAlphaPixelData *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_wxAlphaPixelData_Accessor = {"_p_wxAlphaPixelData_Accessor", "wxAlphaPixelData_Accessor *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_wxAutoBufferedPaintDC = {"_p_wxAutoBufferedPaintDC", "wxAutoBufferedPaintDC *", 0, 0, (void*)0, 0}; @@ -35618,6 +35851,7 @@ static swig_type_info *swig_type_initial[] = { &_swigt__p_unsigned_char, &_swigt__p_unsigned_int, &_swigt__p_unsigned_long, + &_swigt__p_void, &_swigt__p_wxANIHandler, &_swigt__p_wxAcceleratorTable, &_swigt__p_wxActivateEvent, @@ -35777,6 +36011,7 @@ static swig_cast_info _swigc__p_int[] = { {&_swigt__p_int, 0, 0, 0},{0, 0, 0, 0 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_void[] = { {&_swigt__p_void, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxAlphaPixelData[] = { {&_swigt__p_wxAlphaPixelData, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxAlphaPixelData_Accessor[] = { {&_swigt__p_wxAlphaPixelData_Accessor, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxAutoBufferedPaintDC[] = { {&_swigt__p_wxAutoBufferedPaintDC, 0, 0, 0},{0, 0, 0, 0}}; @@ -35936,6 +36171,7 @@ static swig_cast_info *swig_cast_initial[] = { _swigc__p_unsigned_char, _swigc__p_unsigned_int, _swigc__p_unsigned_long, + _swigc__p_void, _swigc__p_wxANIHandler, _swigc__p_wxAcceleratorTable, _swigc__p_wxActivateEvent, diff --git a/wxPython/src/gtk/animate.py b/wxPython/src/gtk/animate.py index a099b9bd89..1f82126f33 100644 --- a/wxPython/src/gtk/animate.py +++ b/wxPython/src/gtk/animate.py @@ -174,6 +174,15 @@ class AnimationCtrlBase(_core.Control): """IsPlaying(self) -> bool""" return _animate.AnimationCtrlBase_IsPlaying(*args, **kwargs) + def SetInactiveBitmap(*args, **kwargs): + """SetInactiveBitmap(self, Bitmap bmp)""" + return _animate.AnimationCtrlBase_SetInactiveBitmap(*args, **kwargs) + + def GetInactiveBitmap(*args, **kwargs): + """GetInactiveBitmap(self) -> Bitmap""" + return _animate.AnimationCtrlBase_GetInactiveBitmap(*args, **kwargs) + + InactiveBitmap = property(GetInactiveBitmap,SetInactiveBitmap) _animate.AnimationCtrlBase_swigregister(AnimationCtrlBase) NullAnimation = cvar.NullAnimation diff --git a/wxPython/src/gtk/animate_wrap.cpp b/wxPython/src/gtk/animate_wrap.cpp index 1124398a97..8155f34a88 100644 --- a/wxPython/src/gtk/animate_wrap.cpp +++ b/wxPython/src/gtk/animate_wrap.cpp @@ -3670,6 +3670,75 @@ fail: } +SWIGINTERN PyObject *_wrap_AnimationCtrlBase_SetInactiveBitmap(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { + PyObject *resultobj = 0; + wxAnimationCtrlBase *arg1 = (wxAnimationCtrlBase *) 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:AnimationCtrlBase_SetInactiveBitmap",kwnames,&obj0,&obj1)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxAnimationCtrlBase, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AnimationCtrlBase_SetInactiveBitmap" "', expected argument " "1"" of type '" "wxAnimationCtrlBase *""'"); + } + arg1 = reinterpret_cast< wxAnimationCtrlBase * >(argp1); + res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_wxBitmap, 0 | 0); + if (!SWIG_IsOK(res2)) { + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "AnimationCtrlBase_SetInactiveBitmap" "', expected argument " "2"" of type '" "wxBitmap const &""'"); + } + if (!argp2) { + SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "AnimationCtrlBase_SetInactiveBitmap" "', expected argument " "2"" of type '" "wxBitmap const &""'"); + } + arg2 = reinterpret_cast< wxBitmap * >(argp2); + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + (arg1)->SetInactiveBitmap((wxBitmap const &)*arg2); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_Py_Void(); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_AnimationCtrlBase_GetInactiveBitmap(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + wxAnimationCtrlBase *arg1 = (wxAnimationCtrlBase *) 0 ; + wxBitmap result; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject *swig_obj[1] ; + + if (!args) SWIG_fail; + swig_obj[0] = args; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxAnimationCtrlBase, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AnimationCtrlBase_GetInactiveBitmap" "', expected argument " "1"" of type '" "wxAnimationCtrlBase const *""'"); + } + arg1 = reinterpret_cast< wxAnimationCtrlBase * >(argp1); + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = ((wxAnimationCtrlBase const *)arg1)->GetInactiveBitmap(); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_NewPointerObj((new wxBitmap(static_cast< const wxBitmap& >(result))), SWIGTYPE_p_wxBitmap, SWIG_POINTER_OWN | 0 ); + return resultobj; +fail: + return NULL; +} + + SWIGINTERN PyObject *AnimationCtrlBase_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *obj; if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL; @@ -4099,6 +4168,8 @@ static PyMethodDef SwigMethods[] = { { (char *)"AnimationCtrlBase_Play", (PyCFunction)_wrap_AnimationCtrlBase_Play, METH_O, NULL}, { (char *)"AnimationCtrlBase_Stop", (PyCFunction)_wrap_AnimationCtrlBase_Stop, METH_O, NULL}, { (char *)"AnimationCtrlBase_IsPlaying", (PyCFunction)_wrap_AnimationCtrlBase_IsPlaying, METH_O, NULL}, + { (char *)"AnimationCtrlBase_SetInactiveBitmap", (PyCFunction) _wrap_AnimationCtrlBase_SetInactiveBitmap, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"AnimationCtrlBase_GetInactiveBitmap", (PyCFunction)_wrap_AnimationCtrlBase_GetInactiveBitmap, METH_O, NULL}, { (char *)"AnimationCtrlBase_swigregister", AnimationCtrlBase_swigregister, METH_VARARGS, NULL}, { (char *)"new_AnimationCtrl", (PyCFunction) _wrap_new_AnimationCtrl, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"new_PreAnimationCtrl", (PyCFunction)_wrap_new_PreAnimationCtrl, METH_NOARGS, NULL}, diff --git a/wxPython/src/gtk/xrc.py b/wxPython/src/gtk/xrc.py index 31946bfa96..cf28fe485f 100644 --- a/wxPython/src/gtk/xrc.py +++ b/wxPython/src/gtk/xrc.py @@ -79,6 +79,10 @@ class XmlResource(_core.Object): __swig_destroy__ = _xrc.delete_XmlResource __del__ = lambda self : None; + def GetFirstRoot(*args, **kwargs): + """GetFirstRoot(self) -> XmlNode""" + return _xrc.XmlResource_GetFirstRoot(*args, **kwargs) + def Load(*args, **kwargs): """Load(self, String filemask) -> bool""" return _xrc.XmlResource_Load(*args, **kwargs) @@ -223,6 +227,7 @@ PosString = cvar.PosString BitmapString = cvar.BitmapString IconString = cvar.IconString FontString = cvar.FontString +AnimationString = cvar.AnimationString def EmptyXmlResource(*args, **kwargs): """EmptyXmlResource(int flags=XRC_USE_LOCALE, String domain=wxEmptyString) -> XmlResource""" @@ -660,6 +665,10 @@ class XmlResourceHandler(_core.Object): """GetFont(self, String param=FontString) -> Font""" return _xrc.XmlResourceHandler_GetFont(*args, **kwargs) + def GetAnimation(*args, **kwargs): + """GetAnimation(self, String param=AnimationString) -> wxAnimation""" + return _xrc.XmlResourceHandler_GetAnimation(*args, **kwargs) + def SetupWindow(*args, **kwargs): """SetupWindow(self, Window wnd)""" return _xrc.XmlResourceHandler_SetupWindow(*args, **kwargs) diff --git a/wxPython/src/gtk/xrc_wrap.cpp b/wxPython/src/gtk/xrc_wrap.cpp index 79dff7afac..a7a4d7adfb 100644 --- a/wxPython/src/gtk/xrc_wrap.cpp +++ b/wxPython/src/gtk/xrc_wrap.cpp @@ -2472,104 +2472,105 @@ SWIG_Python_MustGetPtr(PyObject *obj, swig_type_info *ty, int argnum, int flags) #define SWIGTYPE_p_wxANIHandler swig_types[6] #define SWIGTYPE_p_wxAcceleratorTable swig_types[7] #define SWIGTYPE_p_wxActivateEvent swig_types[8] -#define SWIGTYPE_p_wxArtClient swig_types[9] -#define SWIGTYPE_p_wxBMPHandler swig_types[10] -#define SWIGTYPE_p_wxBitmap swig_types[11] -#define SWIGTYPE_p_wxBoxSizer swig_types[12] -#define SWIGTYPE_p_wxCURHandler swig_types[13] -#define SWIGTYPE_p_wxChildFocusEvent swig_types[14] -#define SWIGTYPE_p_wxClipboardTextEvent swig_types[15] -#define SWIGTYPE_p_wxCloseEvent swig_types[16] -#define SWIGTYPE_p_wxColour swig_types[17] -#define SWIGTYPE_p_wxCommandEvent swig_types[18] -#define SWIGTYPE_p_wxContextMenuEvent swig_types[19] -#define SWIGTYPE_p_wxControl swig_types[20] -#define SWIGTYPE_p_wxControlWithItems swig_types[21] -#define SWIGTYPE_p_wxDateEvent swig_types[22] -#define SWIGTYPE_p_wxDialog swig_types[23] -#define SWIGTYPE_p_wxDisplayChangedEvent swig_types[24] -#define SWIGTYPE_p_wxDropFilesEvent swig_types[25] -#define SWIGTYPE_p_wxDuplexMode swig_types[26] -#define SWIGTYPE_p_wxEraseEvent swig_types[27] -#define SWIGTYPE_p_wxEvent swig_types[28] -#define SWIGTYPE_p_wxEvtHandler swig_types[29] -#define SWIGTYPE_p_wxFSFile swig_types[30] -#define SWIGTYPE_p_wxFileSystem swig_types[31] -#define SWIGTYPE_p_wxFlexGridSizer swig_types[32] -#define SWIGTYPE_p_wxFocusEvent swig_types[33] -#define SWIGTYPE_p_wxFont swig_types[34] -#define SWIGTYPE_p_wxFrame swig_types[35] -#define SWIGTYPE_p_wxGBSizerItem swig_types[36] -#define SWIGTYPE_p_wxGIFHandler swig_types[37] -#define SWIGTYPE_p_wxGridBagSizer swig_types[38] -#define SWIGTYPE_p_wxGridSizer swig_types[39] -#define SWIGTYPE_p_wxICOHandler swig_types[40] -#define SWIGTYPE_p_wxIcon swig_types[41] -#define SWIGTYPE_p_wxIconizeEvent swig_types[42] -#define SWIGTYPE_p_wxIdleEvent swig_types[43] -#define SWIGTYPE_p_wxImage swig_types[44] -#define SWIGTYPE_p_wxImageHandler swig_types[45] -#define SWIGTYPE_p_wxIndividualLayoutConstraint swig_types[46] -#define SWIGTYPE_p_wxInitDialogEvent swig_types[47] -#define SWIGTYPE_p_wxInputStream swig_types[48] -#define SWIGTYPE_p_wxJPEGHandler swig_types[49] -#define SWIGTYPE_p_wxKeyEvent swig_types[50] -#define SWIGTYPE_p_wxLayoutConstraints swig_types[51] -#define SWIGTYPE_p_wxMaximizeEvent swig_types[52] -#define SWIGTYPE_p_wxMenu swig_types[53] -#define SWIGTYPE_p_wxMenuBar swig_types[54] -#define SWIGTYPE_p_wxMenuEvent swig_types[55] -#define SWIGTYPE_p_wxMenuItem swig_types[56] -#define SWIGTYPE_p_wxMouseCaptureChangedEvent swig_types[57] -#define SWIGTYPE_p_wxMouseCaptureLostEvent swig_types[58] -#define SWIGTYPE_p_wxMouseEvent swig_types[59] -#define SWIGTYPE_p_wxMoveEvent swig_types[60] -#define SWIGTYPE_p_wxNavigationKeyEvent swig_types[61] -#define SWIGTYPE_p_wxNcPaintEvent swig_types[62] -#define SWIGTYPE_p_wxNotifyEvent swig_types[63] -#define SWIGTYPE_p_wxObject swig_types[64] -#define SWIGTYPE_p_wxOutputStream swig_types[65] -#define SWIGTYPE_p_wxPCXHandler swig_types[66] -#define SWIGTYPE_p_wxPNGHandler swig_types[67] -#define SWIGTYPE_p_wxPNMHandler swig_types[68] -#define SWIGTYPE_p_wxPaintEvent swig_types[69] -#define SWIGTYPE_p_wxPaletteChangedEvent swig_types[70] -#define SWIGTYPE_p_wxPanel swig_types[71] -#define SWIGTYPE_p_wxPaperSize swig_types[72] -#define SWIGTYPE_p_wxPoint swig_types[73] -#define SWIGTYPE_p_wxPyApp swig_types[74] -#define SWIGTYPE_p_wxPyCommandEvent swig_types[75] -#define SWIGTYPE_p_wxPyEvent swig_types[76] -#define SWIGTYPE_p_wxPyImageHandler swig_types[77] -#define SWIGTYPE_p_wxPySizer swig_types[78] -#define SWIGTYPE_p_wxPyValidator swig_types[79] -#define SWIGTYPE_p_wxPyXmlResourceHandler swig_types[80] -#define SWIGTYPE_p_wxPyXmlSubclassFactory swig_types[81] -#define SWIGTYPE_p_wxQueryNewPaletteEvent swig_types[82] -#define SWIGTYPE_p_wxScrollEvent swig_types[83] -#define SWIGTYPE_p_wxScrollWinEvent swig_types[84] -#define SWIGTYPE_p_wxSetCursorEvent swig_types[85] -#define SWIGTYPE_p_wxShowEvent swig_types[86] -#define SWIGTYPE_p_wxSize swig_types[87] -#define SWIGTYPE_p_wxSizeEvent swig_types[88] -#define SWIGTYPE_p_wxSizer swig_types[89] -#define SWIGTYPE_p_wxSizerItem swig_types[90] -#define SWIGTYPE_p_wxStaticBoxSizer swig_types[91] -#define SWIGTYPE_p_wxStdDialogButtonSizer swig_types[92] -#define SWIGTYPE_p_wxSysColourChangedEvent swig_types[93] -#define SWIGTYPE_p_wxTIFFHandler swig_types[94] -#define SWIGTYPE_p_wxUpdateUIEvent swig_types[95] -#define SWIGTYPE_p_wxValidator swig_types[96] -#define SWIGTYPE_p_wxWindow swig_types[97] -#define SWIGTYPE_p_wxWindowCreateEvent swig_types[98] -#define SWIGTYPE_p_wxWindowDestroyEvent swig_types[99] -#define SWIGTYPE_p_wxXPMHandler swig_types[100] -#define SWIGTYPE_p_wxXmlDocument swig_types[101] -#define SWIGTYPE_p_wxXmlNode swig_types[102] -#define SWIGTYPE_p_wxXmlProperty swig_types[103] -#define SWIGTYPE_p_wxXmlResource swig_types[104] -static swig_type_info *swig_types[106]; -static swig_module_info swig_module = {swig_types, 105, 0, 0, 0, 0}; +#define SWIGTYPE_p_wxAnimation swig_types[9] +#define SWIGTYPE_p_wxArtClient swig_types[10] +#define SWIGTYPE_p_wxBMPHandler swig_types[11] +#define SWIGTYPE_p_wxBitmap swig_types[12] +#define SWIGTYPE_p_wxBoxSizer swig_types[13] +#define SWIGTYPE_p_wxCURHandler swig_types[14] +#define SWIGTYPE_p_wxChildFocusEvent swig_types[15] +#define SWIGTYPE_p_wxClipboardTextEvent swig_types[16] +#define SWIGTYPE_p_wxCloseEvent swig_types[17] +#define SWIGTYPE_p_wxColour swig_types[18] +#define SWIGTYPE_p_wxCommandEvent swig_types[19] +#define SWIGTYPE_p_wxContextMenuEvent swig_types[20] +#define SWIGTYPE_p_wxControl swig_types[21] +#define SWIGTYPE_p_wxControlWithItems swig_types[22] +#define SWIGTYPE_p_wxDateEvent swig_types[23] +#define SWIGTYPE_p_wxDialog swig_types[24] +#define SWIGTYPE_p_wxDisplayChangedEvent swig_types[25] +#define SWIGTYPE_p_wxDropFilesEvent swig_types[26] +#define SWIGTYPE_p_wxDuplexMode swig_types[27] +#define SWIGTYPE_p_wxEraseEvent swig_types[28] +#define SWIGTYPE_p_wxEvent swig_types[29] +#define SWIGTYPE_p_wxEvtHandler swig_types[30] +#define SWIGTYPE_p_wxFSFile swig_types[31] +#define SWIGTYPE_p_wxFileSystem swig_types[32] +#define SWIGTYPE_p_wxFlexGridSizer swig_types[33] +#define SWIGTYPE_p_wxFocusEvent swig_types[34] +#define SWIGTYPE_p_wxFont swig_types[35] +#define SWIGTYPE_p_wxFrame swig_types[36] +#define SWIGTYPE_p_wxGBSizerItem swig_types[37] +#define SWIGTYPE_p_wxGIFHandler swig_types[38] +#define SWIGTYPE_p_wxGridBagSizer swig_types[39] +#define SWIGTYPE_p_wxGridSizer swig_types[40] +#define SWIGTYPE_p_wxICOHandler swig_types[41] +#define SWIGTYPE_p_wxIcon swig_types[42] +#define SWIGTYPE_p_wxIconizeEvent swig_types[43] +#define SWIGTYPE_p_wxIdleEvent swig_types[44] +#define SWIGTYPE_p_wxImage swig_types[45] +#define SWIGTYPE_p_wxImageHandler swig_types[46] +#define SWIGTYPE_p_wxIndividualLayoutConstraint swig_types[47] +#define SWIGTYPE_p_wxInitDialogEvent swig_types[48] +#define SWIGTYPE_p_wxInputStream swig_types[49] +#define SWIGTYPE_p_wxJPEGHandler swig_types[50] +#define SWIGTYPE_p_wxKeyEvent swig_types[51] +#define SWIGTYPE_p_wxLayoutConstraints swig_types[52] +#define SWIGTYPE_p_wxMaximizeEvent swig_types[53] +#define SWIGTYPE_p_wxMenu swig_types[54] +#define SWIGTYPE_p_wxMenuBar swig_types[55] +#define SWIGTYPE_p_wxMenuEvent swig_types[56] +#define SWIGTYPE_p_wxMenuItem swig_types[57] +#define SWIGTYPE_p_wxMouseCaptureChangedEvent swig_types[58] +#define SWIGTYPE_p_wxMouseCaptureLostEvent swig_types[59] +#define SWIGTYPE_p_wxMouseEvent swig_types[60] +#define SWIGTYPE_p_wxMoveEvent swig_types[61] +#define SWIGTYPE_p_wxNavigationKeyEvent swig_types[62] +#define SWIGTYPE_p_wxNcPaintEvent swig_types[63] +#define SWIGTYPE_p_wxNotifyEvent swig_types[64] +#define SWIGTYPE_p_wxObject swig_types[65] +#define SWIGTYPE_p_wxOutputStream swig_types[66] +#define SWIGTYPE_p_wxPCXHandler swig_types[67] +#define SWIGTYPE_p_wxPNGHandler swig_types[68] +#define SWIGTYPE_p_wxPNMHandler swig_types[69] +#define SWIGTYPE_p_wxPaintEvent swig_types[70] +#define SWIGTYPE_p_wxPaletteChangedEvent swig_types[71] +#define SWIGTYPE_p_wxPanel swig_types[72] +#define SWIGTYPE_p_wxPaperSize swig_types[73] +#define SWIGTYPE_p_wxPoint swig_types[74] +#define SWIGTYPE_p_wxPyApp swig_types[75] +#define SWIGTYPE_p_wxPyCommandEvent swig_types[76] +#define SWIGTYPE_p_wxPyEvent swig_types[77] +#define SWIGTYPE_p_wxPyImageHandler swig_types[78] +#define SWIGTYPE_p_wxPySizer swig_types[79] +#define SWIGTYPE_p_wxPyValidator swig_types[80] +#define SWIGTYPE_p_wxPyXmlResourceHandler swig_types[81] +#define SWIGTYPE_p_wxPyXmlSubclassFactory swig_types[82] +#define SWIGTYPE_p_wxQueryNewPaletteEvent swig_types[83] +#define SWIGTYPE_p_wxScrollEvent swig_types[84] +#define SWIGTYPE_p_wxScrollWinEvent swig_types[85] +#define SWIGTYPE_p_wxSetCursorEvent swig_types[86] +#define SWIGTYPE_p_wxShowEvent swig_types[87] +#define SWIGTYPE_p_wxSize swig_types[88] +#define SWIGTYPE_p_wxSizeEvent swig_types[89] +#define SWIGTYPE_p_wxSizer swig_types[90] +#define SWIGTYPE_p_wxSizerItem swig_types[91] +#define SWIGTYPE_p_wxStaticBoxSizer swig_types[92] +#define SWIGTYPE_p_wxStdDialogButtonSizer swig_types[93] +#define SWIGTYPE_p_wxSysColourChangedEvent swig_types[94] +#define SWIGTYPE_p_wxTIFFHandler swig_types[95] +#define SWIGTYPE_p_wxUpdateUIEvent swig_types[96] +#define SWIGTYPE_p_wxValidator swig_types[97] +#define SWIGTYPE_p_wxWindow swig_types[98] +#define SWIGTYPE_p_wxWindowCreateEvent swig_types[99] +#define SWIGTYPE_p_wxWindowDestroyEvent swig_types[100] +#define SWIGTYPE_p_wxXPMHandler swig_types[101] +#define SWIGTYPE_p_wxXmlDocument swig_types[102] +#define SWIGTYPE_p_wxXmlNode swig_types[103] +#define SWIGTYPE_p_wxXmlProperty swig_types[104] +#define SWIGTYPE_p_wxXmlResource swig_types[105] +static swig_type_info *swig_types[107]; +static swig_module_info swig_module = {swig_types, 106, 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) @@ -2682,6 +2683,7 @@ namespace swig { static const wxString wxPyBitmapString(wxT("bitmap")); static const wxString wxPyIconString(wxT("icon")); static const wxString wxPyFontString(wxT("font")); + static const wxString wxPyAnimationString(wxT("animation")); #define SWIG_From_long PyInt_FromLong @@ -2854,6 +2856,9 @@ public: wxSize size = wxDefaultSize) { return wxXmlResourceHandler::GetIcon(param, defaultArtClient, size); } + wxAnimation GetAnimation(const wxString& param = wxT("animation")) + { return wxXmlResourceHandler::GetAnimation(param); } + wxFont GetFont(const wxString& param = wxT("font")) { return wxXmlResourceHandler::GetFont(param); } @@ -3042,6 +3047,26 @@ SWIGINTERN PyObject *FontString_get(void) { } +SWIGINTERN int AnimationString_set(PyObject *) { + SWIG_Error(SWIG_AttributeError,"Variable AnimationString is read-only."); + return 1; +} + + +SWIGINTERN PyObject *AnimationString_get(void) { + PyObject *pyobj = 0; + + { +#if wxUSE_UNICODE + pyobj = PyUnicode_FromWideChar((&wxPyAnimationString)->c_str(), (&wxPyAnimationString)->Len()); +#else + pyobj = PyString_FromStringAndSize((&wxPyAnimationString)->c_str(), (&wxPyAnimationString)->Len()); +#endif + } + return pyobj; +} + + SWIGINTERN PyObject *_wrap_new_XmlResource(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxString *arg1 = 0 ; @@ -3188,6 +3213,34 @@ fail: } +SWIGINTERN PyObject *_wrap_XmlResource_GetFirstRoot(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + wxXmlResource *arg1 = (wxXmlResource *) 0 ; + wxXmlNode *result = 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject *swig_obj[1] ; + + if (!args) SWIG_fail; + swig_obj[0] = args; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxXmlResource, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "XmlResource_GetFirstRoot" "', expected argument " "1"" of type '" "wxXmlResource *""'"); + } + arg1 = reinterpret_cast< wxXmlResource * >(argp1); + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (wxXmlNode *)(arg1)->GetFirstRoot(); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxXmlNode, 0 | 0 ); + return resultobj; +fail: + return NULL; +} + + SWIGINTERN PyObject *_wrap_XmlResource_Load(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxXmlResource *arg1 = (wxXmlResource *) 0 ; @@ -8429,6 +8482,55 @@ fail: } +SWIGINTERN PyObject *_wrap_XmlResourceHandler_GetAnimation(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { + PyObject *resultobj = 0; + wxPyXmlResourceHandler *arg1 = (wxPyXmlResourceHandler *) 0 ; + wxString const &arg2_defvalue = wxPyAnimationString ; + wxString *arg2 = (wxString *) &arg2_defvalue ; + wxAnimation result; + void *argp1 = 0 ; + int res1 = 0 ; + bool temp2 = false ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char * kwnames[] = { + (char *) "self",(char *) "param", NULL + }; + + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:XmlResourceHandler_GetAnimation",kwnames,&obj0,&obj1)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPyXmlResourceHandler, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "XmlResourceHandler_GetAnimation" "', expected argument " "1"" of type '" "wxPyXmlResourceHandler *""'"); + } + arg1 = reinterpret_cast< wxPyXmlResourceHandler * >(argp1); + if (obj1) { + { + arg2 = wxString_in_helper(obj1); + if (arg2 == NULL) SWIG_fail; + temp2 = true; + } + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (arg1)->GetAnimation((wxString const &)*arg2); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_NewPointerObj((new wxAnimation(static_cast< const wxAnimation& >(result))), SWIGTYPE_p_wxAnimation, SWIG_POINTER_OWN | 0 ); + { + if (temp2) + delete arg2; + } + return resultobj; +fail: + { + if (temp2) + delete arg2; + } + return NULL; +} + + SWIGINTERN PyObject *_wrap_XmlResourceHandler_SetupWindow(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxPyXmlResourceHandler *arg1 = (wxPyXmlResourceHandler *) 0 ; @@ -8672,6 +8774,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"new_XmlResource", (PyCFunction) _wrap_new_XmlResource, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"new_EmptyXmlResource", (PyCFunction) _wrap_new_EmptyXmlResource, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"delete_XmlResource", (PyCFunction)_wrap_delete_XmlResource, METH_O, NULL}, + { (char *)"XmlResource_GetFirstRoot", (PyCFunction)_wrap_XmlResource_GetFirstRoot, METH_O, NULL}, { (char *)"XmlResource_Load", (PyCFunction) _wrap_XmlResource_Load, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"XmlResource_LoadFromString", (PyCFunction) _wrap_XmlResource_LoadFromString, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"XmlResource_Unload", (PyCFunction) _wrap_XmlResource_Unload, METH_VARARGS | METH_KEYWORDS, NULL}, @@ -8798,6 +8901,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"XmlResourceHandler_GetBitmap", (PyCFunction) _wrap_XmlResourceHandler_GetBitmap, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"XmlResourceHandler_GetIcon", (PyCFunction) _wrap_XmlResourceHandler_GetIcon, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"XmlResourceHandler_GetFont", (PyCFunction) _wrap_XmlResourceHandler_GetFont, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"XmlResourceHandler_GetAnimation", (PyCFunction) _wrap_XmlResourceHandler_GetAnimation, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"XmlResourceHandler_SetupWindow", (PyCFunction) _wrap_XmlResourceHandler_SetupWindow, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"XmlResourceHandler_CreateChildren", (PyCFunction) _wrap_XmlResourceHandler_CreateChildren, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"XmlResourceHandler_CreateChildrenPrivately", (PyCFunction) _wrap_XmlResourceHandler_CreateChildrenPrivately, METH_VARARGS | METH_KEYWORDS, NULL}, @@ -8811,6 +8915,15 @@ static PyMethodDef SwigMethods[] = { /* -------- TYPE CONVERSION AND EQUIVALENCE RULES (BEGIN) -------- */ +static void *_p_wxControlTo_p_wxWindow(void *x) { + return (void *)((wxWindow *) ((wxControl *) x)); +} +static void *_p_wxControlWithItemsTo_p_wxWindow(void *x) { + return (void *)((wxWindow *) (wxControl *) ((wxControlWithItems *) x)); +} +static void *_p_wxMenuBarTo_p_wxWindow(void *x) { + return (void *)((wxWindow *) ((wxMenuBar *) x)); +} static void *_p_wxLayoutConstraintsTo_p_wxObject(void *x) { return (void *)((wxObject *) ((wxLayoutConstraints *) x)); } @@ -9054,21 +9167,13 @@ static void *_p_wxPyValidatorTo_p_wxObject(void *x) { static void *_p_wxValidatorTo_p_wxObject(void *x) { return (void *)((wxObject *) (wxEvtHandler *) ((wxValidator *) x)); } -static void *_p_wxControlTo_p_wxWindow(void *x) { - return (void *)((wxWindow *) ((wxControl *) x)); -} -static void *_p_wxControlWithItemsTo_p_wxWindow(void *x) { - return (void *)((wxWindow *) (wxControl *) ((wxControlWithItems *) x)); -} -static void *_p_wxMenuBarTo_p_wxWindow(void *x) { - return (void *)((wxWindow *) ((wxMenuBar *) x)); -} static swig_type_info _swigt__p_char = {"_p_char", "char *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_form_ops_t = {"_p_form_ops_t", "enum form_ops_t *|form_ops_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_int = {"_p_int", "int *|wxEventType *", 0, 0, (void*)0, 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_wxAnimation = {"_p_wxAnimation", "wxAnimation *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_wxArtClient = {"_p_wxArtClient", "wxArtClient *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_wxBitmap = {"_p_wxBitmap", "wxBitmap *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_wxColour = {"_p_wxColour", "wxColour *", 0, 0, (void*)0, 0}; @@ -9179,6 +9284,7 @@ static swig_type_info *swig_type_initial[] = { &_swigt__p_wxANIHandler, &_swigt__p_wxAcceleratorTable, &_swigt__p_wxActivateEvent, + &_swigt__p_wxAnimation, &_swigt__p_wxArtClient, &_swigt__p_wxBMPHandler, &_swigt__p_wxBitmap, @@ -9283,6 +9389,7 @@ static swig_cast_info _swigc__p_int[] = { {&_swigt__p_int, 0, 0, 0},{0, 0, 0, 0 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_wxAnimation[] = { {&_swigt__p_wxAnimation, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxArtClient[] = { {&_swigt__p_wxArtClient, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxBitmap[] = { {&_swigt__p_wxBitmap, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxColour[] = { {&_swigt__p_wxColour, 0, 0, 0},{0, 0, 0, 0}}; @@ -9393,6 +9500,7 @@ static swig_cast_info *swig_cast_initial[] = { _swigc__p_wxANIHandler, _swigc__p_wxAcceleratorTable, _swigc__p_wxActivateEvent, + _swigc__p_wxAnimation, _swigc__p_wxArtClient, _swigc__p_wxBMPHandler, _swigc__p_wxBitmap, @@ -10000,6 +10108,7 @@ SWIGEXPORT void SWIG_init(void) { SWIG_addvarlink(SWIG_globals(),(char*)"BitmapString",BitmapString_get, BitmapString_set); SWIG_addvarlink(SWIG_globals(),(char*)"IconString",IconString_get, IconString_set); SWIG_addvarlink(SWIG_globals(),(char*)"FontString",FontString_get, FontString_set); + SWIG_addvarlink(SWIG_globals(),(char*)"AnimationString",AnimationString_get, AnimationString_set); SWIG_Python_SetConstant(d, "WX_XMLRES_CURRENT_VERSION_MAJOR",SWIG_From_int(static_cast< int >(WX_XMLRES_CURRENT_VERSION_MAJOR))); SWIG_Python_SetConstant(d, "WX_XMLRES_CURRENT_VERSION_MINOR",SWIG_From_int(static_cast< int >(WX_XMLRES_CURRENT_VERSION_MINOR))); SWIG_Python_SetConstant(d, "WX_XMLRES_CURRENT_VERSION_RELEASE",SWIG_From_int(static_cast< int >(WX_XMLRES_CURRENT_VERSION_RELEASE))); diff --git a/wxPython/src/mac/_controls.py b/wxPython/src/mac/_controls.py index 1c778bb1b9..38cb6f8c78 100644 --- a/wxPython/src/mac/_controls.py +++ b/wxPython/src/mac/_controls.py @@ -678,7 +678,7 @@ class ComboBox(_core.Control,_core.ItemContainer): return _controls_.ComboBox_SetMark(*args, **kwargs) def GetMark(self): - raise NotImplementedError + return (0,0) def GetCurrentSelection(*args, **kwargs): """ diff --git a/wxPython/src/mac/_gdi.py b/wxPython/src/mac/_gdi.py index 4eeb91695d..693e32ff09 100644 --- a/wxPython/src/mac/_gdi.py +++ b/wxPython/src/mac/_gdi.py @@ -4948,13 +4948,19 @@ class GraphicsContext(object): __repr__ = _swig_repr __swig_destroy__ = _gdi_.delete_GraphicsContext __del__ = lambda self : None; - def Create(*args, **kwargs): - """Create(WindowDC dc) -> GraphicsContext""" - val = _gdi_.GraphicsContext_Create(*args, **kwargs) - val.__dc = args[0] # save a ref so the other dc will not be deleted before self - return val + def Create(*args): + """ + Create(WindowDC dc) -> GraphicsContext + Create(Window window) -> GraphicsContext + """ + return _gdi_.GraphicsContext_Create(*args) Create = staticmethod(Create) + def CreateFromNative(*args, **kwargs): + """CreateFromNative(void context) -> GraphicsContext""" + return _gdi_.GraphicsContext_CreateFromNative(*args, **kwargs) + + CreateFromNative = staticmethod(CreateFromNative) def CreatePath(*args, **kwargs): """CreatePath(self) -> GraphicsPath""" return _gdi_.GraphicsContext_CreatePath(*args, **kwargs) @@ -4967,10 +4973,22 @@ class GraphicsContext(object): """PopState(self)""" return _gdi_.GraphicsContext_PopState(*args, **kwargs) + def ClipRegion(*args, **kwargs): + """ClipRegion(self, Region region)""" + return _gdi_.GraphicsContext_ClipRegion(*args, **kwargs) + def Clip(*args, **kwargs): - """Clip(self, Region region)""" + """Clip(self, Double x, Double y, Double w, Double h)""" return _gdi_.GraphicsContext_Clip(*args, **kwargs) + def ResetClip(*args, **kwargs): + """ResetClip(self)""" + return _gdi_.GraphicsContext_ResetClip(*args, **kwargs) + + def GetNativeContext(*args, **kwargs): + """GetNativeContext(self) -> void""" + return _gdi_.GraphicsContext_GetNativeContext(*args, **kwargs) + def Translate(*args, **kwargs): """Translate(self, Double dx, Double dy)""" return _gdi_.GraphicsContext_Translate(*args, **kwargs) @@ -5079,11 +5097,16 @@ class GraphicsContext(object): _gdi_.GraphicsContext_swigregister(GraphicsContext) -def GraphicsContext_Create(*args, **kwargs): - """GraphicsContext_Create(WindowDC dc) -> GraphicsContext""" - val = _gdi_.GraphicsContext_Create(*args, **kwargs) - val.__dc = args[0] # save a ref so the other dc will not be deleted before self - return val +def GraphicsContext_Create(*args): + """ + Create(WindowDC dc) -> GraphicsContext + GraphicsContext_Create(Window window) -> GraphicsContext + """ + return _gdi_.GraphicsContext_Create(*args) + +def GraphicsContext_CreateFromNative(*args, **kwargs): + """GraphicsContext_CreateFromNative(void context) -> GraphicsContext""" + return _gdi_.GraphicsContext_CreateFromNative(*args, **kwargs) class GCDC(DC): """Proxy of C++ GCDC class""" @@ -5096,10 +5119,15 @@ class GCDC(DC): __swig_destroy__ = _gdi_.delete_GCDC __del__ = lambda self : None; - def GetGraphicContext(*args, **kwargs): - """GetGraphicContext(self) -> GraphicsContext""" - return _gdi_.GCDC_GetGraphicContext(*args, **kwargs) + def GetGraphicsContext(*args, **kwargs): + """GetGraphicsContext(self) -> GraphicsContext""" + return _gdi_.GCDC_GetGraphicsContext(*args, **kwargs) + + def SetGraphicsContext(*args, **kwargs): + """SetGraphicsContext(self, GraphicsContext ctx)""" + return _gdi_.GCDC_SetGraphicsContext(*args, **kwargs) + GraphicsContext = property(GetGraphicsContext,SetGraphicsContext) _gdi_.GCDC_swigregister(GCDC) class Overlay(object): diff --git a/wxPython/src/mac/_gdi_wrap.cpp b/wxPython/src/mac/_gdi_wrap.cpp index 33b1c023f9..4218a491f3 100644 --- a/wxPython/src/mac/_gdi_wrap.cpp +++ b/wxPython/src/mac/_gdi_wrap.cpp @@ -2471,157 +2471,158 @@ SWIG_Python_MustGetPtr(PyObject *obj, swig_type_info *ty, int argnum, int flags) #define SWIGTYPE_p_unsigned_char swig_types[5] #define SWIGTYPE_p_unsigned_int swig_types[6] #define SWIGTYPE_p_unsigned_long swig_types[7] -#define SWIGTYPE_p_wxANIHandler swig_types[8] -#define SWIGTYPE_p_wxAcceleratorTable swig_types[9] -#define SWIGTYPE_p_wxActivateEvent swig_types[10] -#define SWIGTYPE_p_wxAlphaPixelData swig_types[11] -#define SWIGTYPE_p_wxAlphaPixelData_Accessor swig_types[12] -#define SWIGTYPE_p_wxAutoBufferedPaintDC swig_types[13] -#define SWIGTYPE_p_wxBMPHandler swig_types[14] -#define SWIGTYPE_p_wxBitmap swig_types[15] -#define SWIGTYPE_p_wxBoxSizer swig_types[16] -#define SWIGTYPE_p_wxBrush swig_types[17] -#define SWIGTYPE_p_wxBrushList swig_types[18] -#define SWIGTYPE_p_wxBufferedDC swig_types[19] -#define SWIGTYPE_p_wxBufferedPaintDC swig_types[20] -#define SWIGTYPE_p_wxCURHandler swig_types[21] -#define SWIGTYPE_p_wxChar swig_types[22] -#define SWIGTYPE_p_wxChildFocusEvent swig_types[23] -#define SWIGTYPE_p_wxClientDC swig_types[24] -#define SWIGTYPE_p_wxClipboardTextEvent swig_types[25] -#define SWIGTYPE_p_wxCloseEvent swig_types[26] -#define SWIGTYPE_p_wxColor swig_types[27] -#define SWIGTYPE_p_wxColour swig_types[28] -#define SWIGTYPE_p_wxColourDatabase swig_types[29] -#define SWIGTYPE_p_wxCommandEvent swig_types[30] -#define SWIGTYPE_p_wxContextMenuEvent swig_types[31] -#define SWIGTYPE_p_wxControl swig_types[32] -#define SWIGTYPE_p_wxControlWithItems swig_types[33] -#define SWIGTYPE_p_wxCursor swig_types[34] -#define SWIGTYPE_p_wxDC swig_types[35] -#define SWIGTYPE_p_wxDCOverlay swig_types[36] -#define SWIGTYPE_p_wxDash swig_types[37] -#define SWIGTYPE_p_wxDateEvent swig_types[38] -#define SWIGTYPE_p_wxDisplayChangedEvent swig_types[39] -#define SWIGTYPE_p_wxDropFilesEvent swig_types[40] -#define SWIGTYPE_p_wxDuplexMode swig_types[41] -#define SWIGTYPE_p_wxEffects swig_types[42] -#define SWIGTYPE_p_wxEncodingConverter swig_types[43] -#define SWIGTYPE_p_wxEraseEvent swig_types[44] -#define SWIGTYPE_p_wxEvent swig_types[45] -#define SWIGTYPE_p_wxEvtHandler swig_types[46] -#define SWIGTYPE_p_wxFSFile swig_types[47] -#define SWIGTYPE_p_wxFileSystem swig_types[48] -#define SWIGTYPE_p_wxFlexGridSizer swig_types[49] -#define SWIGTYPE_p_wxFocusEvent swig_types[50] -#define SWIGTYPE_p_wxFont swig_types[51] -#define SWIGTYPE_p_wxFontList swig_types[52] -#define SWIGTYPE_p_wxFontMapper swig_types[53] -#define SWIGTYPE_p_wxGBSizerItem swig_types[54] -#define SWIGTYPE_p_wxGCDC swig_types[55] -#define SWIGTYPE_p_wxGDIObjListBase swig_types[56] -#define SWIGTYPE_p_wxGDIObject swig_types[57] -#define SWIGTYPE_p_wxGIFHandler swig_types[58] -#define SWIGTYPE_p_wxGraphicsContext swig_types[59] -#define SWIGTYPE_p_wxGraphicsPath swig_types[60] -#define SWIGTYPE_p_wxGridBagSizer swig_types[61] -#define SWIGTYPE_p_wxGridSizer swig_types[62] -#define SWIGTYPE_p_wxHeaderButtonParams swig_types[63] -#define SWIGTYPE_p_wxICOHandler swig_types[64] -#define SWIGTYPE_p_wxIcon swig_types[65] -#define SWIGTYPE_p_wxIconBundle swig_types[66] -#define SWIGTYPE_p_wxIconLocation swig_types[67] -#define SWIGTYPE_p_wxIconizeEvent swig_types[68] -#define SWIGTYPE_p_wxIdleEvent swig_types[69] -#define SWIGTYPE_p_wxImage swig_types[70] -#define SWIGTYPE_p_wxImageHandler swig_types[71] -#define SWIGTYPE_p_wxImageList swig_types[72] -#define SWIGTYPE_p_wxIndividualLayoutConstraint swig_types[73] -#define SWIGTYPE_p_wxInitDialogEvent swig_types[74] -#define SWIGTYPE_p_wxJPEGHandler swig_types[75] -#define SWIGTYPE_p_wxKeyEvent swig_types[76] -#define SWIGTYPE_p_wxLanguageInfo swig_types[77] -#define SWIGTYPE_p_wxLayoutConstraints swig_types[78] -#define SWIGTYPE_p_wxLocale swig_types[79] -#define SWIGTYPE_p_wxMask swig_types[80] -#define SWIGTYPE_p_wxMaximizeEvent swig_types[81] -#define SWIGTYPE_p_wxMemoryDC swig_types[82] -#define SWIGTYPE_p_wxMenu swig_types[83] -#define SWIGTYPE_p_wxMenuBar swig_types[84] -#define SWIGTYPE_p_wxMenuEvent swig_types[85] -#define SWIGTYPE_p_wxMenuItem swig_types[86] -#define SWIGTYPE_p_wxMetaFile swig_types[87] -#define SWIGTYPE_p_wxMetaFileDC swig_types[88] -#define SWIGTYPE_p_wxMirrorDC swig_types[89] -#define SWIGTYPE_p_wxMouseCaptureChangedEvent swig_types[90] -#define SWIGTYPE_p_wxMouseCaptureLostEvent swig_types[91] -#define SWIGTYPE_p_wxMouseEvent swig_types[92] -#define SWIGTYPE_p_wxMoveEvent swig_types[93] -#define SWIGTYPE_p_wxNativeEncodingInfo swig_types[94] -#define SWIGTYPE_p_wxNativeFontInfo swig_types[95] -#define SWIGTYPE_p_wxNativePixelData swig_types[96] -#define SWIGTYPE_p_wxNativePixelData_Accessor swig_types[97] -#define SWIGTYPE_p_wxNavigationKeyEvent swig_types[98] -#define SWIGTYPE_p_wxNcPaintEvent swig_types[99] -#define SWIGTYPE_p_wxNotifyEvent swig_types[100] -#define SWIGTYPE_p_wxObject swig_types[101] -#define SWIGTYPE_p_wxOverlay swig_types[102] -#define SWIGTYPE_p_wxPCXHandler swig_types[103] -#define SWIGTYPE_p_wxPNGHandler swig_types[104] -#define SWIGTYPE_p_wxPNMHandler swig_types[105] -#define SWIGTYPE_p_wxPaintDC swig_types[106] -#define SWIGTYPE_p_wxPaintEvent swig_types[107] -#define SWIGTYPE_p_wxPalette swig_types[108] -#define SWIGTYPE_p_wxPaletteChangedEvent swig_types[109] -#define SWIGTYPE_p_wxPaperSize swig_types[110] -#define SWIGTYPE_p_wxPen swig_types[111] -#define SWIGTYPE_p_wxPenList swig_types[112] -#define SWIGTYPE_p_wxPixelDataBase swig_types[113] -#define SWIGTYPE_p_wxPoint swig_types[114] -#define SWIGTYPE_p_wxPoint2D swig_types[115] -#define SWIGTYPE_p_wxPostScriptDC swig_types[116] -#define SWIGTYPE_p_wxPrintData swig_types[117] -#define SWIGTYPE_p_wxPrinterDC swig_types[118] -#define SWIGTYPE_p_wxPseudoDC swig_types[119] -#define SWIGTYPE_p_wxPyApp swig_types[120] -#define SWIGTYPE_p_wxPyCommandEvent swig_types[121] -#define SWIGTYPE_p_wxPyEvent swig_types[122] -#define SWIGTYPE_p_wxPyFontEnumerator swig_types[123] -#define SWIGTYPE_p_wxPyImageHandler swig_types[124] -#define SWIGTYPE_p_wxPyLocale swig_types[125] -#define SWIGTYPE_p_wxPySizer swig_types[126] -#define SWIGTYPE_p_wxPyValidator swig_types[127] -#define SWIGTYPE_p_wxQueryNewPaletteEvent swig_types[128] -#define SWIGTYPE_p_wxRect swig_types[129] -#define SWIGTYPE_p_wxRegion swig_types[130] -#define SWIGTYPE_p_wxRegionIterator swig_types[131] -#define SWIGTYPE_p_wxRendererNative swig_types[132] -#define SWIGTYPE_p_wxRendererVersion swig_types[133] -#define SWIGTYPE_p_wxScreenDC swig_types[134] -#define SWIGTYPE_p_wxScrollEvent swig_types[135] -#define SWIGTYPE_p_wxScrollWinEvent swig_types[136] -#define SWIGTYPE_p_wxSetCursorEvent swig_types[137] -#define SWIGTYPE_p_wxShowEvent swig_types[138] -#define SWIGTYPE_p_wxSize swig_types[139] -#define SWIGTYPE_p_wxSizeEvent swig_types[140] -#define SWIGTYPE_p_wxSizer swig_types[141] -#define SWIGTYPE_p_wxSizerItem swig_types[142] -#define SWIGTYPE_p_wxSplitterRenderParams swig_types[143] -#define SWIGTYPE_p_wxStaticBoxSizer swig_types[144] -#define SWIGTYPE_p_wxStdDialogButtonSizer swig_types[145] -#define SWIGTYPE_p_wxStockGDI swig_types[146] -#define SWIGTYPE_p_wxString swig_types[147] -#define SWIGTYPE_p_wxSysColourChangedEvent swig_types[148] -#define SWIGTYPE_p_wxTIFFHandler swig_types[149] -#define SWIGTYPE_p_wxUpdateUIEvent swig_types[150] -#define SWIGTYPE_p_wxValidator swig_types[151] -#define SWIGTYPE_p_wxWindow swig_types[152] -#define SWIGTYPE_p_wxWindowCreateEvent swig_types[153] -#define SWIGTYPE_p_wxWindowDC swig_types[154] -#define SWIGTYPE_p_wxWindowDestroyEvent swig_types[155] -#define SWIGTYPE_p_wxXPMHandler swig_types[156] -static swig_type_info *swig_types[158]; -static swig_module_info swig_module = {swig_types, 157, 0, 0, 0, 0}; +#define SWIGTYPE_p_void swig_types[8] +#define SWIGTYPE_p_wxANIHandler swig_types[9] +#define SWIGTYPE_p_wxAcceleratorTable swig_types[10] +#define SWIGTYPE_p_wxActivateEvent swig_types[11] +#define SWIGTYPE_p_wxAlphaPixelData swig_types[12] +#define SWIGTYPE_p_wxAlphaPixelData_Accessor swig_types[13] +#define SWIGTYPE_p_wxAutoBufferedPaintDC swig_types[14] +#define SWIGTYPE_p_wxBMPHandler swig_types[15] +#define SWIGTYPE_p_wxBitmap swig_types[16] +#define SWIGTYPE_p_wxBoxSizer swig_types[17] +#define SWIGTYPE_p_wxBrush swig_types[18] +#define SWIGTYPE_p_wxBrushList swig_types[19] +#define SWIGTYPE_p_wxBufferedDC swig_types[20] +#define SWIGTYPE_p_wxBufferedPaintDC swig_types[21] +#define SWIGTYPE_p_wxCURHandler swig_types[22] +#define SWIGTYPE_p_wxChar swig_types[23] +#define SWIGTYPE_p_wxChildFocusEvent swig_types[24] +#define SWIGTYPE_p_wxClientDC swig_types[25] +#define SWIGTYPE_p_wxClipboardTextEvent swig_types[26] +#define SWIGTYPE_p_wxCloseEvent swig_types[27] +#define SWIGTYPE_p_wxColor swig_types[28] +#define SWIGTYPE_p_wxColour swig_types[29] +#define SWIGTYPE_p_wxColourDatabase swig_types[30] +#define SWIGTYPE_p_wxCommandEvent swig_types[31] +#define SWIGTYPE_p_wxContextMenuEvent swig_types[32] +#define SWIGTYPE_p_wxControl swig_types[33] +#define SWIGTYPE_p_wxControlWithItems swig_types[34] +#define SWIGTYPE_p_wxCursor swig_types[35] +#define SWIGTYPE_p_wxDC swig_types[36] +#define SWIGTYPE_p_wxDCOverlay swig_types[37] +#define SWIGTYPE_p_wxDash swig_types[38] +#define SWIGTYPE_p_wxDateEvent swig_types[39] +#define SWIGTYPE_p_wxDisplayChangedEvent swig_types[40] +#define SWIGTYPE_p_wxDropFilesEvent swig_types[41] +#define SWIGTYPE_p_wxDuplexMode swig_types[42] +#define SWIGTYPE_p_wxEffects swig_types[43] +#define SWIGTYPE_p_wxEncodingConverter swig_types[44] +#define SWIGTYPE_p_wxEraseEvent swig_types[45] +#define SWIGTYPE_p_wxEvent swig_types[46] +#define SWIGTYPE_p_wxEvtHandler swig_types[47] +#define SWIGTYPE_p_wxFSFile swig_types[48] +#define SWIGTYPE_p_wxFileSystem swig_types[49] +#define SWIGTYPE_p_wxFlexGridSizer swig_types[50] +#define SWIGTYPE_p_wxFocusEvent swig_types[51] +#define SWIGTYPE_p_wxFont swig_types[52] +#define SWIGTYPE_p_wxFontList swig_types[53] +#define SWIGTYPE_p_wxFontMapper swig_types[54] +#define SWIGTYPE_p_wxGBSizerItem swig_types[55] +#define SWIGTYPE_p_wxGCDC swig_types[56] +#define SWIGTYPE_p_wxGDIObjListBase swig_types[57] +#define SWIGTYPE_p_wxGDIObject swig_types[58] +#define SWIGTYPE_p_wxGIFHandler swig_types[59] +#define SWIGTYPE_p_wxGraphicsContext swig_types[60] +#define SWIGTYPE_p_wxGraphicsPath swig_types[61] +#define SWIGTYPE_p_wxGridBagSizer swig_types[62] +#define SWIGTYPE_p_wxGridSizer swig_types[63] +#define SWIGTYPE_p_wxHeaderButtonParams swig_types[64] +#define SWIGTYPE_p_wxICOHandler swig_types[65] +#define SWIGTYPE_p_wxIcon swig_types[66] +#define SWIGTYPE_p_wxIconBundle swig_types[67] +#define SWIGTYPE_p_wxIconLocation swig_types[68] +#define SWIGTYPE_p_wxIconizeEvent swig_types[69] +#define SWIGTYPE_p_wxIdleEvent swig_types[70] +#define SWIGTYPE_p_wxImage swig_types[71] +#define SWIGTYPE_p_wxImageHandler swig_types[72] +#define SWIGTYPE_p_wxImageList swig_types[73] +#define SWIGTYPE_p_wxIndividualLayoutConstraint swig_types[74] +#define SWIGTYPE_p_wxInitDialogEvent swig_types[75] +#define SWIGTYPE_p_wxJPEGHandler swig_types[76] +#define SWIGTYPE_p_wxKeyEvent swig_types[77] +#define SWIGTYPE_p_wxLanguageInfo swig_types[78] +#define SWIGTYPE_p_wxLayoutConstraints swig_types[79] +#define SWIGTYPE_p_wxLocale swig_types[80] +#define SWIGTYPE_p_wxMask swig_types[81] +#define SWIGTYPE_p_wxMaximizeEvent swig_types[82] +#define SWIGTYPE_p_wxMemoryDC swig_types[83] +#define SWIGTYPE_p_wxMenu swig_types[84] +#define SWIGTYPE_p_wxMenuBar swig_types[85] +#define SWIGTYPE_p_wxMenuEvent swig_types[86] +#define SWIGTYPE_p_wxMenuItem swig_types[87] +#define SWIGTYPE_p_wxMetaFile swig_types[88] +#define SWIGTYPE_p_wxMetaFileDC swig_types[89] +#define SWIGTYPE_p_wxMirrorDC swig_types[90] +#define SWIGTYPE_p_wxMouseCaptureChangedEvent swig_types[91] +#define SWIGTYPE_p_wxMouseCaptureLostEvent swig_types[92] +#define SWIGTYPE_p_wxMouseEvent swig_types[93] +#define SWIGTYPE_p_wxMoveEvent swig_types[94] +#define SWIGTYPE_p_wxNativeEncodingInfo swig_types[95] +#define SWIGTYPE_p_wxNativeFontInfo swig_types[96] +#define SWIGTYPE_p_wxNativePixelData swig_types[97] +#define SWIGTYPE_p_wxNativePixelData_Accessor swig_types[98] +#define SWIGTYPE_p_wxNavigationKeyEvent swig_types[99] +#define SWIGTYPE_p_wxNcPaintEvent swig_types[100] +#define SWIGTYPE_p_wxNotifyEvent swig_types[101] +#define SWIGTYPE_p_wxObject swig_types[102] +#define SWIGTYPE_p_wxOverlay swig_types[103] +#define SWIGTYPE_p_wxPCXHandler swig_types[104] +#define SWIGTYPE_p_wxPNGHandler swig_types[105] +#define SWIGTYPE_p_wxPNMHandler swig_types[106] +#define SWIGTYPE_p_wxPaintDC swig_types[107] +#define SWIGTYPE_p_wxPaintEvent swig_types[108] +#define SWIGTYPE_p_wxPalette swig_types[109] +#define SWIGTYPE_p_wxPaletteChangedEvent swig_types[110] +#define SWIGTYPE_p_wxPaperSize swig_types[111] +#define SWIGTYPE_p_wxPen swig_types[112] +#define SWIGTYPE_p_wxPenList swig_types[113] +#define SWIGTYPE_p_wxPixelDataBase swig_types[114] +#define SWIGTYPE_p_wxPoint swig_types[115] +#define SWIGTYPE_p_wxPoint2D swig_types[116] +#define SWIGTYPE_p_wxPostScriptDC swig_types[117] +#define SWIGTYPE_p_wxPrintData swig_types[118] +#define SWIGTYPE_p_wxPrinterDC swig_types[119] +#define SWIGTYPE_p_wxPseudoDC swig_types[120] +#define SWIGTYPE_p_wxPyApp swig_types[121] +#define SWIGTYPE_p_wxPyCommandEvent swig_types[122] +#define SWIGTYPE_p_wxPyEvent swig_types[123] +#define SWIGTYPE_p_wxPyFontEnumerator swig_types[124] +#define SWIGTYPE_p_wxPyImageHandler swig_types[125] +#define SWIGTYPE_p_wxPyLocale swig_types[126] +#define SWIGTYPE_p_wxPySizer swig_types[127] +#define SWIGTYPE_p_wxPyValidator swig_types[128] +#define SWIGTYPE_p_wxQueryNewPaletteEvent swig_types[129] +#define SWIGTYPE_p_wxRect swig_types[130] +#define SWIGTYPE_p_wxRegion swig_types[131] +#define SWIGTYPE_p_wxRegionIterator swig_types[132] +#define SWIGTYPE_p_wxRendererNative swig_types[133] +#define SWIGTYPE_p_wxRendererVersion swig_types[134] +#define SWIGTYPE_p_wxScreenDC swig_types[135] +#define SWIGTYPE_p_wxScrollEvent swig_types[136] +#define SWIGTYPE_p_wxScrollWinEvent swig_types[137] +#define SWIGTYPE_p_wxSetCursorEvent swig_types[138] +#define SWIGTYPE_p_wxShowEvent swig_types[139] +#define SWIGTYPE_p_wxSize swig_types[140] +#define SWIGTYPE_p_wxSizeEvent swig_types[141] +#define SWIGTYPE_p_wxSizer swig_types[142] +#define SWIGTYPE_p_wxSizerItem swig_types[143] +#define SWIGTYPE_p_wxSplitterRenderParams swig_types[144] +#define SWIGTYPE_p_wxStaticBoxSizer swig_types[145] +#define SWIGTYPE_p_wxStdDialogButtonSizer swig_types[146] +#define SWIGTYPE_p_wxStockGDI swig_types[147] +#define SWIGTYPE_p_wxString swig_types[148] +#define SWIGTYPE_p_wxSysColourChangedEvent swig_types[149] +#define SWIGTYPE_p_wxTIFFHandler swig_types[150] +#define SWIGTYPE_p_wxUpdateUIEvent swig_types[151] +#define SWIGTYPE_p_wxValidator swig_types[152] +#define SWIGTYPE_p_wxWindow swig_types[153] +#define SWIGTYPE_p_wxWindowCreateEvent swig_types[154] +#define SWIGTYPE_p_wxWindowDC swig_types[155] +#define SWIGTYPE_p_wxWindowDestroyEvent swig_types[156] +#define SWIGTYPE_p_wxXPMHandler swig_types[157] +static swig_type_info *swig_types[159]; +static swig_module_info swig_module = {swig_types, 158, 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) @@ -3692,6 +3693,9 @@ SWIGINTERN void wxGraphicsContext_StrokeLineSegements(wxGraphicsContext *self,Py delete [] endP; } +#include "wx/dcgraph.h" + + SWIGINTERN void wxColourDatabase_Append(wxColourDatabase *self,wxString const &name,int red,int green,int blue){ self->AddColour(name, wxColour(red, green, blue)); @@ -25051,19 +25055,15 @@ fail: } -SWIGINTERN PyObject *_wrap_GraphicsContext_Create(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { +SWIGINTERN PyObject *_wrap_GraphicsContext_Create__SWIG_0(PyObject *SWIGUNUSEDPARM(self), int nobjs, PyObject **swig_obj) { PyObject *resultobj = 0; wxWindowDC *arg1 = 0 ; wxGraphicsContext *result = 0 ; void *argp1 = 0 ; int res1 = 0 ; - PyObject * obj0 = 0 ; - char * kwnames[] = { - (char *) "dc", NULL - }; - if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:GraphicsContext_Create",kwnames,&obj0)) SWIG_fail; - res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_wxWindowDC, 0 | 0); + if ((nobjs < 1) || (nobjs > 1)) SWIG_fail; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1, SWIGTYPE_p_wxWindowDC, 0 | 0); if (!SWIG_IsOK(res1)) { SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GraphicsContext_Create" "', expected argument " "1"" of type '" "wxWindowDC const &""'"); } @@ -25082,6 +25082,83 @@ fail: } +SWIGINTERN PyObject *_wrap_GraphicsContext_Create__SWIG_1(PyObject *SWIGUNUSEDPARM(self), int nobjs, PyObject **swig_obj) { + PyObject *resultobj = 0; + wxWindow *arg1 = (wxWindow *) 0 ; + wxGraphicsContext *result = 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + + if ((nobjs < 1) || (nobjs > 1)) SWIG_fail; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxWindow, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GraphicsContext_Create" "', expected argument " "1"" of type '" "wxWindow *""'"); + } + arg1 = reinterpret_cast< wxWindow * >(argp1); + { + result = (wxGraphicsContext *)wxGraphicsContext::Create(arg1); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxGraphicsContext, 0 | 0 ); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_GraphicsContext_Create(PyObject *self, PyObject *args) { + int argc; + PyObject *argv[2]; + + if (!(argc = SWIG_Python_UnpackTuple(args,"GraphicsContext_Create",0,1,argv))) SWIG_fail; + --argc; + if (argc == 1) { + int _v = 0; + { + int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_wxWindowDC, 0); + _v = SWIG_CheckState(res); + } + if (!_v) goto check_1; + return _wrap_GraphicsContext_Create__SWIG_0(self, argc, argv); + } +check_1: + + if (argc == 1) { + return _wrap_GraphicsContext_Create__SWIG_1(self, argc, argv); + } + +fail: + SWIG_SetErrorMsg(PyExc_NotImplementedError,"No matching function for overloaded 'GraphicsContext_Create'"); + return NULL; +} + + +SWIGINTERN PyObject *_wrap_GraphicsContext_CreateFromNative(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { + PyObject *resultobj = 0; + void *arg1 = (void *) 0 ; + wxGraphicsContext *result = 0 ; + int res1 ; + PyObject * obj0 = 0 ; + char * kwnames[] = { + (char *) "context", NULL + }; + + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:GraphicsContext_CreateFromNative",kwnames,&obj0)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0,SWIG_as_voidptrptr(&arg1), 0, 0); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GraphicsContext_CreateFromNative" "', expected argument " "1"" of type '" "void *""'"); + } + { + result = (wxGraphicsContext *)wxGraphicsContext::CreateFromNative(arg1); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxGraphicsContext, 0 | 0 ); + return resultobj; +fail: + return NULL; +} + + SWIGINTERN PyObject *_wrap_GraphicsContext_CreatePath(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; wxGraphicsContext *arg1 = (wxGraphicsContext *) 0 ; @@ -25158,7 +25235,7 @@ fail: } -SWIGINTERN PyObject *_wrap_GraphicsContext_Clip(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { +SWIGINTERN PyObject *_wrap_GraphicsContext_ClipRegion(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxGraphicsContext *arg1 = (wxGraphicsContext *) 0 ; wxRegion *arg2 = 0 ; @@ -25172,18 +25249,18 @@ SWIGINTERN PyObject *_wrap_GraphicsContext_Clip(PyObject *SWIGUNUSEDPARM(self), (char *) "self",(char *) "region", NULL }; - if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:GraphicsContext_Clip",kwnames,&obj0,&obj1)) SWIG_fail; + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:GraphicsContext_ClipRegion",kwnames,&obj0,&obj1)) SWIG_fail; res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxGraphicsContext, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GraphicsContext_Clip" "', expected argument " "1"" of type '" "wxGraphicsContext *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GraphicsContext_ClipRegion" "', expected argument " "1"" of type '" "wxGraphicsContext *""'"); } arg1 = reinterpret_cast< wxGraphicsContext * >(argp1); res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_wxRegion, 0 | 0); if (!SWIG_IsOK(res2)) { - SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "GraphicsContext_Clip" "', expected argument " "2"" of type '" "wxRegion const &""'"); + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "GraphicsContext_ClipRegion" "', expected argument " "2"" of type '" "wxRegion const &""'"); } if (!argp2) { - SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "GraphicsContext_Clip" "', expected argument " "2"" of type '" "wxRegion const &""'"); + SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "GraphicsContext_ClipRegion" "', expected argument " "2"" of type '" "wxRegion const &""'"); } arg2 = reinterpret_cast< wxRegion * >(argp2); { @@ -25197,6 +25274,120 @@ fail: } +SWIGINTERN PyObject *_wrap_GraphicsContext_Clip(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { + PyObject *resultobj = 0; + wxGraphicsContext *arg1 = (wxGraphicsContext *) 0 ; + wxDouble arg2 ; + wxDouble arg3 ; + wxDouble arg4 ; + wxDouble arg5 ; + void *argp1 = 0 ; + int res1 = 0 ; + double val2 ; + int ecode2 = 0 ; + double val3 ; + int ecode3 = 0 ; + double val4 ; + int ecode4 = 0 ; + double val5 ; + int ecode5 = 0 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + char * kwnames[] = { + (char *) "self",(char *) "x",(char *) "y",(char *) "w",(char *) "h", NULL + }; + + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:GraphicsContext_Clip",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxGraphicsContext, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GraphicsContext_Clip" "', expected argument " "1"" of type '" "wxGraphicsContext *""'"); + } + arg1 = reinterpret_cast< wxGraphicsContext * >(argp1); + ecode2 = SWIG_AsVal_double(obj1, &val2); + if (!SWIG_IsOK(ecode2)) { + SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "GraphicsContext_Clip" "', expected argument " "2"" of type '" "wxDouble""'"); + } + arg2 = static_cast< wxDouble >(val2); + ecode3 = SWIG_AsVal_double(obj2, &val3); + if (!SWIG_IsOK(ecode3)) { + SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "GraphicsContext_Clip" "', expected argument " "3"" of type '" "wxDouble""'"); + } + arg3 = static_cast< wxDouble >(val3); + ecode4 = SWIG_AsVal_double(obj3, &val4); + if (!SWIG_IsOK(ecode4)) { + SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "GraphicsContext_Clip" "', expected argument " "4"" of type '" "wxDouble""'"); + } + arg4 = static_cast< wxDouble >(val4); + ecode5 = SWIG_AsVal_double(obj4, &val5); + if (!SWIG_IsOK(ecode5)) { + SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "GraphicsContext_Clip" "', expected argument " "5"" of type '" "wxDouble""'"); + } + arg5 = static_cast< wxDouble >(val5); + { + (arg1)->Clip(arg2,arg3,arg4,arg5); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_Py_Void(); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_GraphicsContext_ResetClip(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + wxGraphicsContext *arg1 = (wxGraphicsContext *) 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject *swig_obj[1] ; + + if (!args) SWIG_fail; + swig_obj[0] = args; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxGraphicsContext, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GraphicsContext_ResetClip" "', expected argument " "1"" of type '" "wxGraphicsContext *""'"); + } + arg1 = reinterpret_cast< wxGraphicsContext * >(argp1); + { + (arg1)->ResetClip(); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_Py_Void(); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_GraphicsContext_GetNativeContext(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + wxGraphicsContext *arg1 = (wxGraphicsContext *) 0 ; + void *result = 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject *swig_obj[1] ; + + if (!args) SWIG_fail; + swig_obj[0] = args; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxGraphicsContext, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GraphicsContext_GetNativeContext" "', expected argument " "1"" of type '" "wxGraphicsContext *""'"); + } + arg1 = reinterpret_cast< wxGraphicsContext * >(argp1); + { + result = (void *)(arg1)->GetNativeContext(); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_void, 0 | 0 ); + return resultobj; +fail: + return NULL; +} + + SWIGINTERN PyObject *_wrap_GraphicsContext_Translate(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxGraphicsContext *arg1 = (wxGraphicsContext *) 0 ; @@ -26629,7 +26820,7 @@ fail: } -SWIGINTERN PyObject *_wrap_GCDC_GetGraphicContext(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { +SWIGINTERN PyObject *_wrap_GCDC_GetGraphicsContext(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; wxGCDC *arg1 = (wxGCDC *) 0 ; wxGraphicsContext *result = 0 ; @@ -26641,11 +26832,11 @@ SWIGINTERN PyObject *_wrap_GCDC_GetGraphicContext(PyObject *SWIGUNUSEDPARM(self) swig_obj[0] = args; res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxGCDC, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GCDC_GetGraphicContext" "', expected argument " "1"" of type '" "wxGCDC *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GCDC_GetGraphicsContext" "', expected argument " "1"" of type '" "wxGCDC *""'"); } arg1 = reinterpret_cast< wxGCDC * >(argp1); { - result = (wxGraphicsContext *)(arg1)->GetGraphicContext(); + result = (wxGraphicsContext *)(arg1)->GetGraphicsContext(); if (PyErr_Occurred()) SWIG_fail; } resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxGraphicsContext, 0 | 0 ); @@ -26655,6 +26846,42 @@ fail: } +SWIGINTERN PyObject *_wrap_GCDC_SetGraphicsContext(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { + PyObject *resultobj = 0; + wxGCDC *arg1 = (wxGCDC *) 0 ; + wxGraphicsContext *arg2 = (wxGraphicsContext *) 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + void *argp2 = 0 ; + int res2 = 0 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char * kwnames[] = { + (char *) "self",(char *) "ctx", NULL + }; + + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:GCDC_SetGraphicsContext",kwnames,&obj0,&obj1)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxGCDC, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GCDC_SetGraphicsContext" "', expected argument " "1"" of type '" "wxGCDC *""'"); + } + arg1 = reinterpret_cast< wxGCDC * >(argp1); + res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_wxGraphicsContext, 0 | 0 ); + if (!SWIG_IsOK(res2)) { + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "GCDC_SetGraphicsContext" "', expected argument " "2"" of type '" "wxGraphicsContext *""'"); + } + arg2 = reinterpret_cast< wxGraphicsContext * >(argp2); + { + (arg1)->SetGraphicsContext(arg2); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_Py_Void(); + return resultobj; +fail: + return NULL; +} + + SWIGINTERN PyObject *GCDC_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *obj; if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL; @@ -34990,11 +35217,15 @@ static PyMethodDef SwigMethods[] = { { (char *)"GraphicsPath_AddArcToPoint", (PyCFunction) _wrap_GraphicsPath_AddArcToPoint, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"GraphicsPath_swigregister", GraphicsPath_swigregister, METH_VARARGS, NULL}, { (char *)"delete_GraphicsContext", (PyCFunction)_wrap_delete_GraphicsContext, METH_O, NULL}, - { (char *)"GraphicsContext_Create", (PyCFunction) _wrap_GraphicsContext_Create, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"GraphicsContext_Create", _wrap_GraphicsContext_Create, METH_VARARGS, NULL}, + { (char *)"GraphicsContext_CreateFromNative", (PyCFunction) _wrap_GraphicsContext_CreateFromNative, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"GraphicsContext_CreatePath", (PyCFunction)_wrap_GraphicsContext_CreatePath, METH_O, NULL}, { (char *)"GraphicsContext_PushState", (PyCFunction)_wrap_GraphicsContext_PushState, METH_O, NULL}, { (char *)"GraphicsContext_PopState", (PyCFunction)_wrap_GraphicsContext_PopState, METH_O, NULL}, + { (char *)"GraphicsContext_ClipRegion", (PyCFunction) _wrap_GraphicsContext_ClipRegion, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"GraphicsContext_Clip", (PyCFunction) _wrap_GraphicsContext_Clip, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"GraphicsContext_ResetClip", (PyCFunction)_wrap_GraphicsContext_ResetClip, METH_O, NULL}, + { (char *)"GraphicsContext_GetNativeContext", (PyCFunction)_wrap_GraphicsContext_GetNativeContext, METH_O, NULL}, { (char *)"GraphicsContext_Translate", (PyCFunction) _wrap_GraphicsContext_Translate, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"GraphicsContext_Scale", (PyCFunction) _wrap_GraphicsContext_Scale, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"GraphicsContext_Rotate", (PyCFunction) _wrap_GraphicsContext_Rotate, METH_VARARGS | METH_KEYWORDS, NULL}, @@ -35023,7 +35254,8 @@ static PyMethodDef SwigMethods[] = { { (char *)"GraphicsContext_swigregister", GraphicsContext_swigregister, METH_VARARGS, NULL}, { (char *)"new_GCDC", (PyCFunction) _wrap_new_GCDC, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"delete_GCDC", (PyCFunction)_wrap_delete_GCDC, METH_O, NULL}, - { (char *)"GCDC_GetGraphicContext", (PyCFunction)_wrap_GCDC_GetGraphicContext, METH_O, NULL}, + { (char *)"GCDC_GetGraphicsContext", (PyCFunction)_wrap_GCDC_GetGraphicsContext, METH_O, NULL}, + { (char *)"GCDC_SetGraphicsContext", (PyCFunction) _wrap_GCDC_SetGraphicsContext, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"GCDC_swigregister", GCDC_swigregister, METH_VARARGS, NULL}, { (char *)"GCDC_swiginit", GCDC_swiginit, METH_VARARGS, NULL}, { (char *)"new_Overlay", (PyCFunction)_wrap_new_Overlay, METH_NOARGS, NULL}, @@ -35675,6 +35907,7 @@ static swig_type_info _swigt__p_int = {"_p_int", "int *", 0, 0, (void*)0, 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_void = {"_p_void", "void *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_wxAlphaPixelData = {"_p_wxAlphaPixelData", "wxAlphaPixelData *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_wxAlphaPixelData_Accessor = {"_p_wxAlphaPixelData_Accessor", "wxAlphaPixelData_Accessor *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_wxAutoBufferedPaintDC = {"_p_wxAutoBufferedPaintDC", "wxAutoBufferedPaintDC *", 0, 0, (void*)0, 0}; @@ -35834,6 +36067,7 @@ static swig_type_info *swig_type_initial[] = { &_swigt__p_unsigned_char, &_swigt__p_unsigned_int, &_swigt__p_unsigned_long, + &_swigt__p_void, &_swigt__p_wxANIHandler, &_swigt__p_wxAcceleratorTable, &_swigt__p_wxActivateEvent, @@ -35993,6 +36227,7 @@ static swig_cast_info _swigc__p_int[] = { {&_swigt__p_int, 0, 0, 0},{0, 0, 0, 0 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_void[] = { {&_swigt__p_void, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxAlphaPixelData[] = { {&_swigt__p_wxAlphaPixelData, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxAlphaPixelData_Accessor[] = { {&_swigt__p_wxAlphaPixelData_Accessor, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxAutoBufferedPaintDC[] = { {&_swigt__p_wxAutoBufferedPaintDC, 0, 0, 0},{0, 0, 0, 0}}; @@ -36152,6 +36387,7 @@ static swig_cast_info *swig_cast_initial[] = { _swigc__p_unsigned_char, _swigc__p_unsigned_int, _swigc__p_unsigned_long, + _swigc__p_void, _swigc__p_wxANIHandler, _swigc__p_wxAcceleratorTable, _swigc__p_wxActivateEvent, diff --git a/wxPython/src/mac/animate.py b/wxPython/src/mac/animate.py index a099b9bd89..1f82126f33 100644 --- a/wxPython/src/mac/animate.py +++ b/wxPython/src/mac/animate.py @@ -174,6 +174,15 @@ class AnimationCtrlBase(_core.Control): """IsPlaying(self) -> bool""" return _animate.AnimationCtrlBase_IsPlaying(*args, **kwargs) + def SetInactiveBitmap(*args, **kwargs): + """SetInactiveBitmap(self, Bitmap bmp)""" + return _animate.AnimationCtrlBase_SetInactiveBitmap(*args, **kwargs) + + def GetInactiveBitmap(*args, **kwargs): + """GetInactiveBitmap(self) -> Bitmap""" + return _animate.AnimationCtrlBase_GetInactiveBitmap(*args, **kwargs) + + InactiveBitmap = property(GetInactiveBitmap,SetInactiveBitmap) _animate.AnimationCtrlBase_swigregister(AnimationCtrlBase) NullAnimation = cvar.NullAnimation diff --git a/wxPython/src/mac/animate_wrap.cpp b/wxPython/src/mac/animate_wrap.cpp index 80f6c7f8f2..a6b96e5238 100644 --- a/wxPython/src/mac/animate_wrap.cpp +++ b/wxPython/src/mac/animate_wrap.cpp @@ -3661,6 +3661,75 @@ fail: } +SWIGINTERN PyObject *_wrap_AnimationCtrlBase_SetInactiveBitmap(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { + PyObject *resultobj = 0; + wxAnimationCtrlBase *arg1 = (wxAnimationCtrlBase *) 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:AnimationCtrlBase_SetInactiveBitmap",kwnames,&obj0,&obj1)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxAnimationCtrlBase, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AnimationCtrlBase_SetInactiveBitmap" "', expected argument " "1"" of type '" "wxAnimationCtrlBase *""'"); + } + arg1 = reinterpret_cast< wxAnimationCtrlBase * >(argp1); + res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_wxBitmap, 0 | 0); + if (!SWIG_IsOK(res2)) { + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "AnimationCtrlBase_SetInactiveBitmap" "', expected argument " "2"" of type '" "wxBitmap const &""'"); + } + if (!argp2) { + SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "AnimationCtrlBase_SetInactiveBitmap" "', expected argument " "2"" of type '" "wxBitmap const &""'"); + } + arg2 = reinterpret_cast< wxBitmap * >(argp2); + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + (arg1)->SetInactiveBitmap((wxBitmap const &)*arg2); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_Py_Void(); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_AnimationCtrlBase_GetInactiveBitmap(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + wxAnimationCtrlBase *arg1 = (wxAnimationCtrlBase *) 0 ; + wxBitmap result; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject *swig_obj[1] ; + + if (!args) SWIG_fail; + swig_obj[0] = args; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxAnimationCtrlBase, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AnimationCtrlBase_GetInactiveBitmap" "', expected argument " "1"" of type '" "wxAnimationCtrlBase const *""'"); + } + arg1 = reinterpret_cast< wxAnimationCtrlBase * >(argp1); + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = ((wxAnimationCtrlBase const *)arg1)->GetInactiveBitmap(); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_NewPointerObj((new wxBitmap(static_cast< const wxBitmap& >(result))), SWIGTYPE_p_wxBitmap, SWIG_POINTER_OWN | 0 ); + return resultobj; +fail: + return NULL; +} + + SWIGINTERN PyObject *AnimationCtrlBase_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *obj; if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL; @@ -4090,6 +4159,8 @@ static PyMethodDef SwigMethods[] = { { (char *)"AnimationCtrlBase_Play", (PyCFunction)_wrap_AnimationCtrlBase_Play, METH_O, NULL}, { (char *)"AnimationCtrlBase_Stop", (PyCFunction)_wrap_AnimationCtrlBase_Stop, METH_O, NULL}, { (char *)"AnimationCtrlBase_IsPlaying", (PyCFunction)_wrap_AnimationCtrlBase_IsPlaying, METH_O, NULL}, + { (char *)"AnimationCtrlBase_SetInactiveBitmap", (PyCFunction) _wrap_AnimationCtrlBase_SetInactiveBitmap, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"AnimationCtrlBase_GetInactiveBitmap", (PyCFunction)_wrap_AnimationCtrlBase_GetInactiveBitmap, METH_O, NULL}, { (char *)"AnimationCtrlBase_swigregister", AnimationCtrlBase_swigregister, METH_VARARGS, NULL}, { (char *)"new_AnimationCtrl", (PyCFunction) _wrap_new_AnimationCtrl, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"new_PreAnimationCtrl", (PyCFunction)_wrap_new_PreAnimationCtrl, METH_NOARGS, NULL}, diff --git a/wxPython/src/mac/xrc.py b/wxPython/src/mac/xrc.py index 31946bfa96..cf28fe485f 100644 --- a/wxPython/src/mac/xrc.py +++ b/wxPython/src/mac/xrc.py @@ -79,6 +79,10 @@ class XmlResource(_core.Object): __swig_destroy__ = _xrc.delete_XmlResource __del__ = lambda self : None; + def GetFirstRoot(*args, **kwargs): + """GetFirstRoot(self) -> XmlNode""" + return _xrc.XmlResource_GetFirstRoot(*args, **kwargs) + def Load(*args, **kwargs): """Load(self, String filemask) -> bool""" return _xrc.XmlResource_Load(*args, **kwargs) @@ -223,6 +227,7 @@ PosString = cvar.PosString BitmapString = cvar.BitmapString IconString = cvar.IconString FontString = cvar.FontString +AnimationString = cvar.AnimationString def EmptyXmlResource(*args, **kwargs): """EmptyXmlResource(int flags=XRC_USE_LOCALE, String domain=wxEmptyString) -> XmlResource""" @@ -660,6 +665,10 @@ class XmlResourceHandler(_core.Object): """GetFont(self, String param=FontString) -> Font""" return _xrc.XmlResourceHandler_GetFont(*args, **kwargs) + def GetAnimation(*args, **kwargs): + """GetAnimation(self, String param=AnimationString) -> wxAnimation""" + return _xrc.XmlResourceHandler_GetAnimation(*args, **kwargs) + def SetupWindow(*args, **kwargs): """SetupWindow(self, Window wnd)""" return _xrc.XmlResourceHandler_SetupWindow(*args, **kwargs) diff --git a/wxPython/src/mac/xrc_wrap.cpp b/wxPython/src/mac/xrc_wrap.cpp index 79dff7afac..a7a4d7adfb 100644 --- a/wxPython/src/mac/xrc_wrap.cpp +++ b/wxPython/src/mac/xrc_wrap.cpp @@ -2472,104 +2472,105 @@ SWIG_Python_MustGetPtr(PyObject *obj, swig_type_info *ty, int argnum, int flags) #define SWIGTYPE_p_wxANIHandler swig_types[6] #define SWIGTYPE_p_wxAcceleratorTable swig_types[7] #define SWIGTYPE_p_wxActivateEvent swig_types[8] -#define SWIGTYPE_p_wxArtClient swig_types[9] -#define SWIGTYPE_p_wxBMPHandler swig_types[10] -#define SWIGTYPE_p_wxBitmap swig_types[11] -#define SWIGTYPE_p_wxBoxSizer swig_types[12] -#define SWIGTYPE_p_wxCURHandler swig_types[13] -#define SWIGTYPE_p_wxChildFocusEvent swig_types[14] -#define SWIGTYPE_p_wxClipboardTextEvent swig_types[15] -#define SWIGTYPE_p_wxCloseEvent swig_types[16] -#define SWIGTYPE_p_wxColour swig_types[17] -#define SWIGTYPE_p_wxCommandEvent swig_types[18] -#define SWIGTYPE_p_wxContextMenuEvent swig_types[19] -#define SWIGTYPE_p_wxControl swig_types[20] -#define SWIGTYPE_p_wxControlWithItems swig_types[21] -#define SWIGTYPE_p_wxDateEvent swig_types[22] -#define SWIGTYPE_p_wxDialog swig_types[23] -#define SWIGTYPE_p_wxDisplayChangedEvent swig_types[24] -#define SWIGTYPE_p_wxDropFilesEvent swig_types[25] -#define SWIGTYPE_p_wxDuplexMode swig_types[26] -#define SWIGTYPE_p_wxEraseEvent swig_types[27] -#define SWIGTYPE_p_wxEvent swig_types[28] -#define SWIGTYPE_p_wxEvtHandler swig_types[29] -#define SWIGTYPE_p_wxFSFile swig_types[30] -#define SWIGTYPE_p_wxFileSystem swig_types[31] -#define SWIGTYPE_p_wxFlexGridSizer swig_types[32] -#define SWIGTYPE_p_wxFocusEvent swig_types[33] -#define SWIGTYPE_p_wxFont swig_types[34] -#define SWIGTYPE_p_wxFrame swig_types[35] -#define SWIGTYPE_p_wxGBSizerItem swig_types[36] -#define SWIGTYPE_p_wxGIFHandler swig_types[37] -#define SWIGTYPE_p_wxGridBagSizer swig_types[38] -#define SWIGTYPE_p_wxGridSizer swig_types[39] -#define SWIGTYPE_p_wxICOHandler swig_types[40] -#define SWIGTYPE_p_wxIcon swig_types[41] -#define SWIGTYPE_p_wxIconizeEvent swig_types[42] -#define SWIGTYPE_p_wxIdleEvent swig_types[43] -#define SWIGTYPE_p_wxImage swig_types[44] -#define SWIGTYPE_p_wxImageHandler swig_types[45] -#define SWIGTYPE_p_wxIndividualLayoutConstraint swig_types[46] -#define SWIGTYPE_p_wxInitDialogEvent swig_types[47] -#define SWIGTYPE_p_wxInputStream swig_types[48] -#define SWIGTYPE_p_wxJPEGHandler swig_types[49] -#define SWIGTYPE_p_wxKeyEvent swig_types[50] -#define SWIGTYPE_p_wxLayoutConstraints swig_types[51] -#define SWIGTYPE_p_wxMaximizeEvent swig_types[52] -#define SWIGTYPE_p_wxMenu swig_types[53] -#define SWIGTYPE_p_wxMenuBar swig_types[54] -#define SWIGTYPE_p_wxMenuEvent swig_types[55] -#define SWIGTYPE_p_wxMenuItem swig_types[56] -#define SWIGTYPE_p_wxMouseCaptureChangedEvent swig_types[57] -#define SWIGTYPE_p_wxMouseCaptureLostEvent swig_types[58] -#define SWIGTYPE_p_wxMouseEvent swig_types[59] -#define SWIGTYPE_p_wxMoveEvent swig_types[60] -#define SWIGTYPE_p_wxNavigationKeyEvent swig_types[61] -#define SWIGTYPE_p_wxNcPaintEvent swig_types[62] -#define SWIGTYPE_p_wxNotifyEvent swig_types[63] -#define SWIGTYPE_p_wxObject swig_types[64] -#define SWIGTYPE_p_wxOutputStream swig_types[65] -#define SWIGTYPE_p_wxPCXHandler swig_types[66] -#define SWIGTYPE_p_wxPNGHandler swig_types[67] -#define SWIGTYPE_p_wxPNMHandler swig_types[68] -#define SWIGTYPE_p_wxPaintEvent swig_types[69] -#define SWIGTYPE_p_wxPaletteChangedEvent swig_types[70] -#define SWIGTYPE_p_wxPanel swig_types[71] -#define SWIGTYPE_p_wxPaperSize swig_types[72] -#define SWIGTYPE_p_wxPoint swig_types[73] -#define SWIGTYPE_p_wxPyApp swig_types[74] -#define SWIGTYPE_p_wxPyCommandEvent swig_types[75] -#define SWIGTYPE_p_wxPyEvent swig_types[76] -#define SWIGTYPE_p_wxPyImageHandler swig_types[77] -#define SWIGTYPE_p_wxPySizer swig_types[78] -#define SWIGTYPE_p_wxPyValidator swig_types[79] -#define SWIGTYPE_p_wxPyXmlResourceHandler swig_types[80] -#define SWIGTYPE_p_wxPyXmlSubclassFactory swig_types[81] -#define SWIGTYPE_p_wxQueryNewPaletteEvent swig_types[82] -#define SWIGTYPE_p_wxScrollEvent swig_types[83] -#define SWIGTYPE_p_wxScrollWinEvent swig_types[84] -#define SWIGTYPE_p_wxSetCursorEvent swig_types[85] -#define SWIGTYPE_p_wxShowEvent swig_types[86] -#define SWIGTYPE_p_wxSize swig_types[87] -#define SWIGTYPE_p_wxSizeEvent swig_types[88] -#define SWIGTYPE_p_wxSizer swig_types[89] -#define SWIGTYPE_p_wxSizerItem swig_types[90] -#define SWIGTYPE_p_wxStaticBoxSizer swig_types[91] -#define SWIGTYPE_p_wxStdDialogButtonSizer swig_types[92] -#define SWIGTYPE_p_wxSysColourChangedEvent swig_types[93] -#define SWIGTYPE_p_wxTIFFHandler swig_types[94] -#define SWIGTYPE_p_wxUpdateUIEvent swig_types[95] -#define SWIGTYPE_p_wxValidator swig_types[96] -#define SWIGTYPE_p_wxWindow swig_types[97] -#define SWIGTYPE_p_wxWindowCreateEvent swig_types[98] -#define SWIGTYPE_p_wxWindowDestroyEvent swig_types[99] -#define SWIGTYPE_p_wxXPMHandler swig_types[100] -#define SWIGTYPE_p_wxXmlDocument swig_types[101] -#define SWIGTYPE_p_wxXmlNode swig_types[102] -#define SWIGTYPE_p_wxXmlProperty swig_types[103] -#define SWIGTYPE_p_wxXmlResource swig_types[104] -static swig_type_info *swig_types[106]; -static swig_module_info swig_module = {swig_types, 105, 0, 0, 0, 0}; +#define SWIGTYPE_p_wxAnimation swig_types[9] +#define SWIGTYPE_p_wxArtClient swig_types[10] +#define SWIGTYPE_p_wxBMPHandler swig_types[11] +#define SWIGTYPE_p_wxBitmap swig_types[12] +#define SWIGTYPE_p_wxBoxSizer swig_types[13] +#define SWIGTYPE_p_wxCURHandler swig_types[14] +#define SWIGTYPE_p_wxChildFocusEvent swig_types[15] +#define SWIGTYPE_p_wxClipboardTextEvent swig_types[16] +#define SWIGTYPE_p_wxCloseEvent swig_types[17] +#define SWIGTYPE_p_wxColour swig_types[18] +#define SWIGTYPE_p_wxCommandEvent swig_types[19] +#define SWIGTYPE_p_wxContextMenuEvent swig_types[20] +#define SWIGTYPE_p_wxControl swig_types[21] +#define SWIGTYPE_p_wxControlWithItems swig_types[22] +#define SWIGTYPE_p_wxDateEvent swig_types[23] +#define SWIGTYPE_p_wxDialog swig_types[24] +#define SWIGTYPE_p_wxDisplayChangedEvent swig_types[25] +#define SWIGTYPE_p_wxDropFilesEvent swig_types[26] +#define SWIGTYPE_p_wxDuplexMode swig_types[27] +#define SWIGTYPE_p_wxEraseEvent swig_types[28] +#define SWIGTYPE_p_wxEvent swig_types[29] +#define SWIGTYPE_p_wxEvtHandler swig_types[30] +#define SWIGTYPE_p_wxFSFile swig_types[31] +#define SWIGTYPE_p_wxFileSystem swig_types[32] +#define SWIGTYPE_p_wxFlexGridSizer swig_types[33] +#define SWIGTYPE_p_wxFocusEvent swig_types[34] +#define SWIGTYPE_p_wxFont swig_types[35] +#define SWIGTYPE_p_wxFrame swig_types[36] +#define SWIGTYPE_p_wxGBSizerItem swig_types[37] +#define SWIGTYPE_p_wxGIFHandler swig_types[38] +#define SWIGTYPE_p_wxGridBagSizer swig_types[39] +#define SWIGTYPE_p_wxGridSizer swig_types[40] +#define SWIGTYPE_p_wxICOHandler swig_types[41] +#define SWIGTYPE_p_wxIcon swig_types[42] +#define SWIGTYPE_p_wxIconizeEvent swig_types[43] +#define SWIGTYPE_p_wxIdleEvent swig_types[44] +#define SWIGTYPE_p_wxImage swig_types[45] +#define SWIGTYPE_p_wxImageHandler swig_types[46] +#define SWIGTYPE_p_wxIndividualLayoutConstraint swig_types[47] +#define SWIGTYPE_p_wxInitDialogEvent swig_types[48] +#define SWIGTYPE_p_wxInputStream swig_types[49] +#define SWIGTYPE_p_wxJPEGHandler swig_types[50] +#define SWIGTYPE_p_wxKeyEvent swig_types[51] +#define SWIGTYPE_p_wxLayoutConstraints swig_types[52] +#define SWIGTYPE_p_wxMaximizeEvent swig_types[53] +#define SWIGTYPE_p_wxMenu swig_types[54] +#define SWIGTYPE_p_wxMenuBar swig_types[55] +#define SWIGTYPE_p_wxMenuEvent swig_types[56] +#define SWIGTYPE_p_wxMenuItem swig_types[57] +#define SWIGTYPE_p_wxMouseCaptureChangedEvent swig_types[58] +#define SWIGTYPE_p_wxMouseCaptureLostEvent swig_types[59] +#define SWIGTYPE_p_wxMouseEvent swig_types[60] +#define SWIGTYPE_p_wxMoveEvent swig_types[61] +#define SWIGTYPE_p_wxNavigationKeyEvent swig_types[62] +#define SWIGTYPE_p_wxNcPaintEvent swig_types[63] +#define SWIGTYPE_p_wxNotifyEvent swig_types[64] +#define SWIGTYPE_p_wxObject swig_types[65] +#define SWIGTYPE_p_wxOutputStream swig_types[66] +#define SWIGTYPE_p_wxPCXHandler swig_types[67] +#define SWIGTYPE_p_wxPNGHandler swig_types[68] +#define SWIGTYPE_p_wxPNMHandler swig_types[69] +#define SWIGTYPE_p_wxPaintEvent swig_types[70] +#define SWIGTYPE_p_wxPaletteChangedEvent swig_types[71] +#define SWIGTYPE_p_wxPanel swig_types[72] +#define SWIGTYPE_p_wxPaperSize swig_types[73] +#define SWIGTYPE_p_wxPoint swig_types[74] +#define SWIGTYPE_p_wxPyApp swig_types[75] +#define SWIGTYPE_p_wxPyCommandEvent swig_types[76] +#define SWIGTYPE_p_wxPyEvent swig_types[77] +#define SWIGTYPE_p_wxPyImageHandler swig_types[78] +#define SWIGTYPE_p_wxPySizer swig_types[79] +#define SWIGTYPE_p_wxPyValidator swig_types[80] +#define SWIGTYPE_p_wxPyXmlResourceHandler swig_types[81] +#define SWIGTYPE_p_wxPyXmlSubclassFactory swig_types[82] +#define SWIGTYPE_p_wxQueryNewPaletteEvent swig_types[83] +#define SWIGTYPE_p_wxScrollEvent swig_types[84] +#define SWIGTYPE_p_wxScrollWinEvent swig_types[85] +#define SWIGTYPE_p_wxSetCursorEvent swig_types[86] +#define SWIGTYPE_p_wxShowEvent swig_types[87] +#define SWIGTYPE_p_wxSize swig_types[88] +#define SWIGTYPE_p_wxSizeEvent swig_types[89] +#define SWIGTYPE_p_wxSizer swig_types[90] +#define SWIGTYPE_p_wxSizerItem swig_types[91] +#define SWIGTYPE_p_wxStaticBoxSizer swig_types[92] +#define SWIGTYPE_p_wxStdDialogButtonSizer swig_types[93] +#define SWIGTYPE_p_wxSysColourChangedEvent swig_types[94] +#define SWIGTYPE_p_wxTIFFHandler swig_types[95] +#define SWIGTYPE_p_wxUpdateUIEvent swig_types[96] +#define SWIGTYPE_p_wxValidator swig_types[97] +#define SWIGTYPE_p_wxWindow swig_types[98] +#define SWIGTYPE_p_wxWindowCreateEvent swig_types[99] +#define SWIGTYPE_p_wxWindowDestroyEvent swig_types[100] +#define SWIGTYPE_p_wxXPMHandler swig_types[101] +#define SWIGTYPE_p_wxXmlDocument swig_types[102] +#define SWIGTYPE_p_wxXmlNode swig_types[103] +#define SWIGTYPE_p_wxXmlProperty swig_types[104] +#define SWIGTYPE_p_wxXmlResource swig_types[105] +static swig_type_info *swig_types[107]; +static swig_module_info swig_module = {swig_types, 106, 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) @@ -2682,6 +2683,7 @@ namespace swig { static const wxString wxPyBitmapString(wxT("bitmap")); static const wxString wxPyIconString(wxT("icon")); static const wxString wxPyFontString(wxT("font")); + static const wxString wxPyAnimationString(wxT("animation")); #define SWIG_From_long PyInt_FromLong @@ -2854,6 +2856,9 @@ public: wxSize size = wxDefaultSize) { return wxXmlResourceHandler::GetIcon(param, defaultArtClient, size); } + wxAnimation GetAnimation(const wxString& param = wxT("animation")) + { return wxXmlResourceHandler::GetAnimation(param); } + wxFont GetFont(const wxString& param = wxT("font")) { return wxXmlResourceHandler::GetFont(param); } @@ -3042,6 +3047,26 @@ SWIGINTERN PyObject *FontString_get(void) { } +SWIGINTERN int AnimationString_set(PyObject *) { + SWIG_Error(SWIG_AttributeError,"Variable AnimationString is read-only."); + return 1; +} + + +SWIGINTERN PyObject *AnimationString_get(void) { + PyObject *pyobj = 0; + + { +#if wxUSE_UNICODE + pyobj = PyUnicode_FromWideChar((&wxPyAnimationString)->c_str(), (&wxPyAnimationString)->Len()); +#else + pyobj = PyString_FromStringAndSize((&wxPyAnimationString)->c_str(), (&wxPyAnimationString)->Len()); +#endif + } + return pyobj; +} + + SWIGINTERN PyObject *_wrap_new_XmlResource(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxString *arg1 = 0 ; @@ -3188,6 +3213,34 @@ fail: } +SWIGINTERN PyObject *_wrap_XmlResource_GetFirstRoot(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + wxXmlResource *arg1 = (wxXmlResource *) 0 ; + wxXmlNode *result = 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject *swig_obj[1] ; + + if (!args) SWIG_fail; + swig_obj[0] = args; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxXmlResource, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "XmlResource_GetFirstRoot" "', expected argument " "1"" of type '" "wxXmlResource *""'"); + } + arg1 = reinterpret_cast< wxXmlResource * >(argp1); + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (wxXmlNode *)(arg1)->GetFirstRoot(); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxXmlNode, 0 | 0 ); + return resultobj; +fail: + return NULL; +} + + SWIGINTERN PyObject *_wrap_XmlResource_Load(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxXmlResource *arg1 = (wxXmlResource *) 0 ; @@ -8429,6 +8482,55 @@ fail: } +SWIGINTERN PyObject *_wrap_XmlResourceHandler_GetAnimation(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { + PyObject *resultobj = 0; + wxPyXmlResourceHandler *arg1 = (wxPyXmlResourceHandler *) 0 ; + wxString const &arg2_defvalue = wxPyAnimationString ; + wxString *arg2 = (wxString *) &arg2_defvalue ; + wxAnimation result; + void *argp1 = 0 ; + int res1 = 0 ; + bool temp2 = false ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char * kwnames[] = { + (char *) "self",(char *) "param", NULL + }; + + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:XmlResourceHandler_GetAnimation",kwnames,&obj0,&obj1)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPyXmlResourceHandler, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "XmlResourceHandler_GetAnimation" "', expected argument " "1"" of type '" "wxPyXmlResourceHandler *""'"); + } + arg1 = reinterpret_cast< wxPyXmlResourceHandler * >(argp1); + if (obj1) { + { + arg2 = wxString_in_helper(obj1); + if (arg2 == NULL) SWIG_fail; + temp2 = true; + } + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (arg1)->GetAnimation((wxString const &)*arg2); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_NewPointerObj((new wxAnimation(static_cast< const wxAnimation& >(result))), SWIGTYPE_p_wxAnimation, SWIG_POINTER_OWN | 0 ); + { + if (temp2) + delete arg2; + } + return resultobj; +fail: + { + if (temp2) + delete arg2; + } + return NULL; +} + + SWIGINTERN PyObject *_wrap_XmlResourceHandler_SetupWindow(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxPyXmlResourceHandler *arg1 = (wxPyXmlResourceHandler *) 0 ; @@ -8672,6 +8774,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"new_XmlResource", (PyCFunction) _wrap_new_XmlResource, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"new_EmptyXmlResource", (PyCFunction) _wrap_new_EmptyXmlResource, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"delete_XmlResource", (PyCFunction)_wrap_delete_XmlResource, METH_O, NULL}, + { (char *)"XmlResource_GetFirstRoot", (PyCFunction)_wrap_XmlResource_GetFirstRoot, METH_O, NULL}, { (char *)"XmlResource_Load", (PyCFunction) _wrap_XmlResource_Load, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"XmlResource_LoadFromString", (PyCFunction) _wrap_XmlResource_LoadFromString, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"XmlResource_Unload", (PyCFunction) _wrap_XmlResource_Unload, METH_VARARGS | METH_KEYWORDS, NULL}, @@ -8798,6 +8901,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"XmlResourceHandler_GetBitmap", (PyCFunction) _wrap_XmlResourceHandler_GetBitmap, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"XmlResourceHandler_GetIcon", (PyCFunction) _wrap_XmlResourceHandler_GetIcon, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"XmlResourceHandler_GetFont", (PyCFunction) _wrap_XmlResourceHandler_GetFont, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"XmlResourceHandler_GetAnimation", (PyCFunction) _wrap_XmlResourceHandler_GetAnimation, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"XmlResourceHandler_SetupWindow", (PyCFunction) _wrap_XmlResourceHandler_SetupWindow, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"XmlResourceHandler_CreateChildren", (PyCFunction) _wrap_XmlResourceHandler_CreateChildren, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"XmlResourceHandler_CreateChildrenPrivately", (PyCFunction) _wrap_XmlResourceHandler_CreateChildrenPrivately, METH_VARARGS | METH_KEYWORDS, NULL}, @@ -8811,6 +8915,15 @@ static PyMethodDef SwigMethods[] = { /* -------- TYPE CONVERSION AND EQUIVALENCE RULES (BEGIN) -------- */ +static void *_p_wxControlTo_p_wxWindow(void *x) { + return (void *)((wxWindow *) ((wxControl *) x)); +} +static void *_p_wxControlWithItemsTo_p_wxWindow(void *x) { + return (void *)((wxWindow *) (wxControl *) ((wxControlWithItems *) x)); +} +static void *_p_wxMenuBarTo_p_wxWindow(void *x) { + return (void *)((wxWindow *) ((wxMenuBar *) x)); +} static void *_p_wxLayoutConstraintsTo_p_wxObject(void *x) { return (void *)((wxObject *) ((wxLayoutConstraints *) x)); } @@ -9054,21 +9167,13 @@ static void *_p_wxPyValidatorTo_p_wxObject(void *x) { static void *_p_wxValidatorTo_p_wxObject(void *x) { return (void *)((wxObject *) (wxEvtHandler *) ((wxValidator *) x)); } -static void *_p_wxControlTo_p_wxWindow(void *x) { - return (void *)((wxWindow *) ((wxControl *) x)); -} -static void *_p_wxControlWithItemsTo_p_wxWindow(void *x) { - return (void *)((wxWindow *) (wxControl *) ((wxControlWithItems *) x)); -} -static void *_p_wxMenuBarTo_p_wxWindow(void *x) { - return (void *)((wxWindow *) ((wxMenuBar *) x)); -} static swig_type_info _swigt__p_char = {"_p_char", "char *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_form_ops_t = {"_p_form_ops_t", "enum form_ops_t *|form_ops_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_int = {"_p_int", "int *|wxEventType *", 0, 0, (void*)0, 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_wxAnimation = {"_p_wxAnimation", "wxAnimation *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_wxArtClient = {"_p_wxArtClient", "wxArtClient *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_wxBitmap = {"_p_wxBitmap", "wxBitmap *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_wxColour = {"_p_wxColour", "wxColour *", 0, 0, (void*)0, 0}; @@ -9179,6 +9284,7 @@ static swig_type_info *swig_type_initial[] = { &_swigt__p_wxANIHandler, &_swigt__p_wxAcceleratorTable, &_swigt__p_wxActivateEvent, + &_swigt__p_wxAnimation, &_swigt__p_wxArtClient, &_swigt__p_wxBMPHandler, &_swigt__p_wxBitmap, @@ -9283,6 +9389,7 @@ static swig_cast_info _swigc__p_int[] = { {&_swigt__p_int, 0, 0, 0},{0, 0, 0, 0 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_wxAnimation[] = { {&_swigt__p_wxAnimation, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxArtClient[] = { {&_swigt__p_wxArtClient, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxBitmap[] = { {&_swigt__p_wxBitmap, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxColour[] = { {&_swigt__p_wxColour, 0, 0, 0},{0, 0, 0, 0}}; @@ -9393,6 +9500,7 @@ static swig_cast_info *swig_cast_initial[] = { _swigc__p_wxANIHandler, _swigc__p_wxAcceleratorTable, _swigc__p_wxActivateEvent, + _swigc__p_wxAnimation, _swigc__p_wxArtClient, _swigc__p_wxBMPHandler, _swigc__p_wxBitmap, @@ -10000,6 +10108,7 @@ SWIGEXPORT void SWIG_init(void) { SWIG_addvarlink(SWIG_globals(),(char*)"BitmapString",BitmapString_get, BitmapString_set); SWIG_addvarlink(SWIG_globals(),(char*)"IconString",IconString_get, IconString_set); SWIG_addvarlink(SWIG_globals(),(char*)"FontString",FontString_get, FontString_set); + SWIG_addvarlink(SWIG_globals(),(char*)"AnimationString",AnimationString_get, AnimationString_set); SWIG_Python_SetConstant(d, "WX_XMLRES_CURRENT_VERSION_MAJOR",SWIG_From_int(static_cast< int >(WX_XMLRES_CURRENT_VERSION_MAJOR))); SWIG_Python_SetConstant(d, "WX_XMLRES_CURRENT_VERSION_MINOR",SWIG_From_int(static_cast< int >(WX_XMLRES_CURRENT_VERSION_MINOR))); SWIG_Python_SetConstant(d, "WX_XMLRES_CURRENT_VERSION_RELEASE",SWIG_From_int(static_cast< int >(WX_XMLRES_CURRENT_VERSION_RELEASE))); diff --git a/wxPython/src/msw/_gdi.py b/wxPython/src/msw/_gdi.py index 448ab56435..2ea7487ffd 100644 --- a/wxPython/src/msw/_gdi.py +++ b/wxPython/src/msw/_gdi.py @@ -5046,13 +5046,19 @@ class GraphicsContext(object): __repr__ = _swig_repr __swig_destroy__ = _gdi_.delete_GraphicsContext __del__ = lambda self : None; - def Create(*args, **kwargs): - """Create(WindowDC dc) -> GraphicsContext""" - val = _gdi_.GraphicsContext_Create(*args, **kwargs) - val.__dc = args[0] # save a ref so the other dc will not be deleted before self - return val + def Create(*args): + """ + Create(WindowDC dc) -> GraphicsContext + Create(Window window) -> GraphicsContext + """ + return _gdi_.GraphicsContext_Create(*args) Create = staticmethod(Create) + def CreateFromNative(*args, **kwargs): + """CreateFromNative(void context) -> GraphicsContext""" + return _gdi_.GraphicsContext_CreateFromNative(*args, **kwargs) + + CreateFromNative = staticmethod(CreateFromNative) def CreatePath(*args, **kwargs): """CreatePath(self) -> GraphicsPath""" return _gdi_.GraphicsContext_CreatePath(*args, **kwargs) @@ -5065,10 +5071,22 @@ class GraphicsContext(object): """PopState(self)""" return _gdi_.GraphicsContext_PopState(*args, **kwargs) + def ClipRegion(*args, **kwargs): + """ClipRegion(self, Region region)""" + return _gdi_.GraphicsContext_ClipRegion(*args, **kwargs) + def Clip(*args, **kwargs): - """Clip(self, Region region)""" + """Clip(self, Double x, Double y, Double w, Double h)""" return _gdi_.GraphicsContext_Clip(*args, **kwargs) + def ResetClip(*args, **kwargs): + """ResetClip(self)""" + return _gdi_.GraphicsContext_ResetClip(*args, **kwargs) + + def GetNativeContext(*args, **kwargs): + """GetNativeContext(self) -> void""" + return _gdi_.GraphicsContext_GetNativeContext(*args, **kwargs) + def Translate(*args, **kwargs): """Translate(self, Double dx, Double dy)""" return _gdi_.GraphicsContext_Translate(*args, **kwargs) @@ -5177,11 +5195,16 @@ class GraphicsContext(object): _gdi_.GraphicsContext_swigregister(GraphicsContext) -def GraphicsContext_Create(*args, **kwargs): - """GraphicsContext_Create(WindowDC dc) -> GraphicsContext""" - val = _gdi_.GraphicsContext_Create(*args, **kwargs) - val.__dc = args[0] # save a ref so the other dc will not be deleted before self - return val +def GraphicsContext_Create(*args): + """ + Create(WindowDC dc) -> GraphicsContext + GraphicsContext_Create(Window window) -> GraphicsContext + """ + return _gdi_.GraphicsContext_Create(*args) + +def GraphicsContext_CreateFromNative(*args, **kwargs): + """GraphicsContext_CreateFromNative(void context) -> GraphicsContext""" + return _gdi_.GraphicsContext_CreateFromNative(*args, **kwargs) class GCDC(DC): """Proxy of C++ GCDC class""" @@ -5194,10 +5217,15 @@ class GCDC(DC): __swig_destroy__ = _gdi_.delete_GCDC __del__ = lambda self : None; - def GetGraphicContext(*args, **kwargs): - """GetGraphicContext(self) -> GraphicsContext""" - return _gdi_.GCDC_GetGraphicContext(*args, **kwargs) + def GetGraphicsContext(*args, **kwargs): + """GetGraphicsContext(self) -> GraphicsContext""" + return _gdi_.GCDC_GetGraphicsContext(*args, **kwargs) + + def SetGraphicsContext(*args, **kwargs): + """SetGraphicsContext(self, GraphicsContext ctx)""" + return _gdi_.GCDC_SetGraphicsContext(*args, **kwargs) + GraphicsContext = property(GetGraphicsContext,SetGraphicsContext) _gdi_.GCDC_swigregister(GCDC) class Overlay(object): diff --git a/wxPython/src/msw/_gdi_wrap.cpp b/wxPython/src/msw/_gdi_wrap.cpp index 215cf03e8f..afcdddf893 100644 --- a/wxPython/src/msw/_gdi_wrap.cpp +++ b/wxPython/src/msw/_gdi_wrap.cpp @@ -2471,157 +2471,158 @@ SWIG_Python_MustGetPtr(PyObject *obj, swig_type_info *ty, int argnum, int flags) #define SWIGTYPE_p_unsigned_char swig_types[5] #define SWIGTYPE_p_unsigned_int swig_types[6] #define SWIGTYPE_p_unsigned_long swig_types[7] -#define SWIGTYPE_p_wxANIHandler swig_types[8] -#define SWIGTYPE_p_wxAcceleratorTable swig_types[9] -#define SWIGTYPE_p_wxActivateEvent swig_types[10] -#define SWIGTYPE_p_wxAlphaPixelData swig_types[11] -#define SWIGTYPE_p_wxAlphaPixelData_Accessor swig_types[12] -#define SWIGTYPE_p_wxAutoBufferedPaintDC swig_types[13] -#define SWIGTYPE_p_wxBMPHandler swig_types[14] -#define SWIGTYPE_p_wxBitmap swig_types[15] -#define SWIGTYPE_p_wxBoxSizer swig_types[16] -#define SWIGTYPE_p_wxBrush swig_types[17] -#define SWIGTYPE_p_wxBrushList swig_types[18] -#define SWIGTYPE_p_wxBufferedDC swig_types[19] -#define SWIGTYPE_p_wxBufferedPaintDC swig_types[20] -#define SWIGTYPE_p_wxCURHandler swig_types[21] -#define SWIGTYPE_p_wxChar swig_types[22] -#define SWIGTYPE_p_wxChildFocusEvent swig_types[23] -#define SWIGTYPE_p_wxClientDC swig_types[24] -#define SWIGTYPE_p_wxClipboardTextEvent swig_types[25] -#define SWIGTYPE_p_wxCloseEvent swig_types[26] -#define SWIGTYPE_p_wxColor swig_types[27] -#define SWIGTYPE_p_wxColour swig_types[28] -#define SWIGTYPE_p_wxColourDatabase swig_types[29] -#define SWIGTYPE_p_wxCommandEvent swig_types[30] -#define SWIGTYPE_p_wxContextMenuEvent swig_types[31] -#define SWIGTYPE_p_wxControl swig_types[32] -#define SWIGTYPE_p_wxControlWithItems swig_types[33] -#define SWIGTYPE_p_wxCursor swig_types[34] -#define SWIGTYPE_p_wxDC swig_types[35] -#define SWIGTYPE_p_wxDCOverlay swig_types[36] -#define SWIGTYPE_p_wxDash swig_types[37] -#define SWIGTYPE_p_wxDateEvent swig_types[38] -#define SWIGTYPE_p_wxDisplayChangedEvent swig_types[39] -#define SWIGTYPE_p_wxDropFilesEvent swig_types[40] -#define SWIGTYPE_p_wxDuplexMode swig_types[41] -#define SWIGTYPE_p_wxEffects swig_types[42] -#define SWIGTYPE_p_wxEncodingConverter swig_types[43] -#define SWIGTYPE_p_wxEraseEvent swig_types[44] -#define SWIGTYPE_p_wxEvent swig_types[45] -#define SWIGTYPE_p_wxEvtHandler swig_types[46] -#define SWIGTYPE_p_wxFSFile swig_types[47] -#define SWIGTYPE_p_wxFileSystem swig_types[48] -#define SWIGTYPE_p_wxFlexGridSizer swig_types[49] -#define SWIGTYPE_p_wxFocusEvent swig_types[50] -#define SWIGTYPE_p_wxFont swig_types[51] -#define SWIGTYPE_p_wxFontList swig_types[52] -#define SWIGTYPE_p_wxFontMapper swig_types[53] -#define SWIGTYPE_p_wxGBSizerItem swig_types[54] -#define SWIGTYPE_p_wxGCDC swig_types[55] -#define SWIGTYPE_p_wxGDIObjListBase swig_types[56] -#define SWIGTYPE_p_wxGDIObject swig_types[57] -#define SWIGTYPE_p_wxGIFHandler swig_types[58] -#define SWIGTYPE_p_wxGraphicsContext swig_types[59] -#define SWIGTYPE_p_wxGraphicsPath swig_types[60] -#define SWIGTYPE_p_wxGridBagSizer swig_types[61] -#define SWIGTYPE_p_wxGridSizer swig_types[62] -#define SWIGTYPE_p_wxHeaderButtonParams swig_types[63] -#define SWIGTYPE_p_wxICOHandler swig_types[64] -#define SWIGTYPE_p_wxIcon swig_types[65] -#define SWIGTYPE_p_wxIconBundle swig_types[66] -#define SWIGTYPE_p_wxIconLocation swig_types[67] -#define SWIGTYPE_p_wxIconizeEvent swig_types[68] -#define SWIGTYPE_p_wxIdleEvent swig_types[69] -#define SWIGTYPE_p_wxImage swig_types[70] -#define SWIGTYPE_p_wxImageHandler swig_types[71] -#define SWIGTYPE_p_wxImageList swig_types[72] -#define SWIGTYPE_p_wxIndividualLayoutConstraint swig_types[73] -#define SWIGTYPE_p_wxInitDialogEvent swig_types[74] -#define SWIGTYPE_p_wxJPEGHandler swig_types[75] -#define SWIGTYPE_p_wxKeyEvent swig_types[76] -#define SWIGTYPE_p_wxLanguageInfo swig_types[77] -#define SWIGTYPE_p_wxLayoutConstraints swig_types[78] -#define SWIGTYPE_p_wxLocale swig_types[79] -#define SWIGTYPE_p_wxMask swig_types[80] -#define SWIGTYPE_p_wxMaximizeEvent swig_types[81] -#define SWIGTYPE_p_wxMemoryDC swig_types[82] -#define SWIGTYPE_p_wxMenu swig_types[83] -#define SWIGTYPE_p_wxMenuBar swig_types[84] -#define SWIGTYPE_p_wxMenuEvent swig_types[85] -#define SWIGTYPE_p_wxMenuItem swig_types[86] -#define SWIGTYPE_p_wxMetaFile swig_types[87] -#define SWIGTYPE_p_wxMetaFileDC swig_types[88] -#define SWIGTYPE_p_wxMirrorDC swig_types[89] -#define SWIGTYPE_p_wxMouseCaptureChangedEvent swig_types[90] -#define SWIGTYPE_p_wxMouseCaptureLostEvent swig_types[91] -#define SWIGTYPE_p_wxMouseEvent swig_types[92] -#define SWIGTYPE_p_wxMoveEvent swig_types[93] -#define SWIGTYPE_p_wxNativeEncodingInfo swig_types[94] -#define SWIGTYPE_p_wxNativeFontInfo swig_types[95] -#define SWIGTYPE_p_wxNativePixelData swig_types[96] -#define SWIGTYPE_p_wxNativePixelData_Accessor swig_types[97] -#define SWIGTYPE_p_wxNavigationKeyEvent swig_types[98] -#define SWIGTYPE_p_wxNcPaintEvent swig_types[99] -#define SWIGTYPE_p_wxNotifyEvent swig_types[100] -#define SWIGTYPE_p_wxObject swig_types[101] -#define SWIGTYPE_p_wxOverlay swig_types[102] -#define SWIGTYPE_p_wxPCXHandler swig_types[103] -#define SWIGTYPE_p_wxPNGHandler swig_types[104] -#define SWIGTYPE_p_wxPNMHandler swig_types[105] -#define SWIGTYPE_p_wxPaintDC swig_types[106] -#define SWIGTYPE_p_wxPaintEvent swig_types[107] -#define SWIGTYPE_p_wxPalette swig_types[108] -#define SWIGTYPE_p_wxPaletteChangedEvent swig_types[109] -#define SWIGTYPE_p_wxPaperSize swig_types[110] -#define SWIGTYPE_p_wxPen swig_types[111] -#define SWIGTYPE_p_wxPenList swig_types[112] -#define SWIGTYPE_p_wxPixelDataBase swig_types[113] -#define SWIGTYPE_p_wxPoint swig_types[114] -#define SWIGTYPE_p_wxPoint2D swig_types[115] -#define SWIGTYPE_p_wxPostScriptDC swig_types[116] -#define SWIGTYPE_p_wxPrintData swig_types[117] -#define SWIGTYPE_p_wxPrinterDC swig_types[118] -#define SWIGTYPE_p_wxPseudoDC swig_types[119] -#define SWIGTYPE_p_wxPyApp swig_types[120] -#define SWIGTYPE_p_wxPyCommandEvent swig_types[121] -#define SWIGTYPE_p_wxPyEvent swig_types[122] -#define SWIGTYPE_p_wxPyFontEnumerator swig_types[123] -#define SWIGTYPE_p_wxPyImageHandler swig_types[124] -#define SWIGTYPE_p_wxPyLocale swig_types[125] -#define SWIGTYPE_p_wxPySizer swig_types[126] -#define SWIGTYPE_p_wxPyValidator swig_types[127] -#define SWIGTYPE_p_wxQueryNewPaletteEvent swig_types[128] -#define SWIGTYPE_p_wxRect swig_types[129] -#define SWIGTYPE_p_wxRegion swig_types[130] -#define SWIGTYPE_p_wxRegionIterator swig_types[131] -#define SWIGTYPE_p_wxRendererNative swig_types[132] -#define SWIGTYPE_p_wxRendererVersion swig_types[133] -#define SWIGTYPE_p_wxScreenDC swig_types[134] -#define SWIGTYPE_p_wxScrollEvent swig_types[135] -#define SWIGTYPE_p_wxScrollWinEvent swig_types[136] -#define SWIGTYPE_p_wxSetCursorEvent swig_types[137] -#define SWIGTYPE_p_wxShowEvent swig_types[138] -#define SWIGTYPE_p_wxSize swig_types[139] -#define SWIGTYPE_p_wxSizeEvent swig_types[140] -#define SWIGTYPE_p_wxSizer swig_types[141] -#define SWIGTYPE_p_wxSizerItem swig_types[142] -#define SWIGTYPE_p_wxSplitterRenderParams swig_types[143] -#define SWIGTYPE_p_wxStaticBoxSizer swig_types[144] -#define SWIGTYPE_p_wxStdDialogButtonSizer swig_types[145] -#define SWIGTYPE_p_wxStockGDI swig_types[146] -#define SWIGTYPE_p_wxString swig_types[147] -#define SWIGTYPE_p_wxSysColourChangedEvent swig_types[148] -#define SWIGTYPE_p_wxTIFFHandler swig_types[149] -#define SWIGTYPE_p_wxUpdateUIEvent swig_types[150] -#define SWIGTYPE_p_wxValidator swig_types[151] -#define SWIGTYPE_p_wxWindow swig_types[152] -#define SWIGTYPE_p_wxWindowCreateEvent swig_types[153] -#define SWIGTYPE_p_wxWindowDC swig_types[154] -#define SWIGTYPE_p_wxWindowDestroyEvent swig_types[155] -#define SWIGTYPE_p_wxXPMHandler swig_types[156] -static swig_type_info *swig_types[158]; -static swig_module_info swig_module = {swig_types, 157, 0, 0, 0, 0}; +#define SWIGTYPE_p_void swig_types[8] +#define SWIGTYPE_p_wxANIHandler swig_types[9] +#define SWIGTYPE_p_wxAcceleratorTable swig_types[10] +#define SWIGTYPE_p_wxActivateEvent swig_types[11] +#define SWIGTYPE_p_wxAlphaPixelData swig_types[12] +#define SWIGTYPE_p_wxAlphaPixelData_Accessor swig_types[13] +#define SWIGTYPE_p_wxAutoBufferedPaintDC swig_types[14] +#define SWIGTYPE_p_wxBMPHandler swig_types[15] +#define SWIGTYPE_p_wxBitmap swig_types[16] +#define SWIGTYPE_p_wxBoxSizer swig_types[17] +#define SWIGTYPE_p_wxBrush swig_types[18] +#define SWIGTYPE_p_wxBrushList swig_types[19] +#define SWIGTYPE_p_wxBufferedDC swig_types[20] +#define SWIGTYPE_p_wxBufferedPaintDC swig_types[21] +#define SWIGTYPE_p_wxCURHandler swig_types[22] +#define SWIGTYPE_p_wxChar swig_types[23] +#define SWIGTYPE_p_wxChildFocusEvent swig_types[24] +#define SWIGTYPE_p_wxClientDC swig_types[25] +#define SWIGTYPE_p_wxClipboardTextEvent swig_types[26] +#define SWIGTYPE_p_wxCloseEvent swig_types[27] +#define SWIGTYPE_p_wxColor swig_types[28] +#define SWIGTYPE_p_wxColour swig_types[29] +#define SWIGTYPE_p_wxColourDatabase swig_types[30] +#define SWIGTYPE_p_wxCommandEvent swig_types[31] +#define SWIGTYPE_p_wxContextMenuEvent swig_types[32] +#define SWIGTYPE_p_wxControl swig_types[33] +#define SWIGTYPE_p_wxControlWithItems swig_types[34] +#define SWIGTYPE_p_wxCursor swig_types[35] +#define SWIGTYPE_p_wxDC swig_types[36] +#define SWIGTYPE_p_wxDCOverlay swig_types[37] +#define SWIGTYPE_p_wxDash swig_types[38] +#define SWIGTYPE_p_wxDateEvent swig_types[39] +#define SWIGTYPE_p_wxDisplayChangedEvent swig_types[40] +#define SWIGTYPE_p_wxDropFilesEvent swig_types[41] +#define SWIGTYPE_p_wxDuplexMode swig_types[42] +#define SWIGTYPE_p_wxEffects swig_types[43] +#define SWIGTYPE_p_wxEncodingConverter swig_types[44] +#define SWIGTYPE_p_wxEraseEvent swig_types[45] +#define SWIGTYPE_p_wxEvent swig_types[46] +#define SWIGTYPE_p_wxEvtHandler swig_types[47] +#define SWIGTYPE_p_wxFSFile swig_types[48] +#define SWIGTYPE_p_wxFileSystem swig_types[49] +#define SWIGTYPE_p_wxFlexGridSizer swig_types[50] +#define SWIGTYPE_p_wxFocusEvent swig_types[51] +#define SWIGTYPE_p_wxFont swig_types[52] +#define SWIGTYPE_p_wxFontList swig_types[53] +#define SWIGTYPE_p_wxFontMapper swig_types[54] +#define SWIGTYPE_p_wxGBSizerItem swig_types[55] +#define SWIGTYPE_p_wxGCDC swig_types[56] +#define SWIGTYPE_p_wxGDIObjListBase swig_types[57] +#define SWIGTYPE_p_wxGDIObject swig_types[58] +#define SWIGTYPE_p_wxGIFHandler swig_types[59] +#define SWIGTYPE_p_wxGraphicsContext swig_types[60] +#define SWIGTYPE_p_wxGraphicsPath swig_types[61] +#define SWIGTYPE_p_wxGridBagSizer swig_types[62] +#define SWIGTYPE_p_wxGridSizer swig_types[63] +#define SWIGTYPE_p_wxHeaderButtonParams swig_types[64] +#define SWIGTYPE_p_wxICOHandler swig_types[65] +#define SWIGTYPE_p_wxIcon swig_types[66] +#define SWIGTYPE_p_wxIconBundle swig_types[67] +#define SWIGTYPE_p_wxIconLocation swig_types[68] +#define SWIGTYPE_p_wxIconizeEvent swig_types[69] +#define SWIGTYPE_p_wxIdleEvent swig_types[70] +#define SWIGTYPE_p_wxImage swig_types[71] +#define SWIGTYPE_p_wxImageHandler swig_types[72] +#define SWIGTYPE_p_wxImageList swig_types[73] +#define SWIGTYPE_p_wxIndividualLayoutConstraint swig_types[74] +#define SWIGTYPE_p_wxInitDialogEvent swig_types[75] +#define SWIGTYPE_p_wxJPEGHandler swig_types[76] +#define SWIGTYPE_p_wxKeyEvent swig_types[77] +#define SWIGTYPE_p_wxLanguageInfo swig_types[78] +#define SWIGTYPE_p_wxLayoutConstraints swig_types[79] +#define SWIGTYPE_p_wxLocale swig_types[80] +#define SWIGTYPE_p_wxMask swig_types[81] +#define SWIGTYPE_p_wxMaximizeEvent swig_types[82] +#define SWIGTYPE_p_wxMemoryDC swig_types[83] +#define SWIGTYPE_p_wxMenu swig_types[84] +#define SWIGTYPE_p_wxMenuBar swig_types[85] +#define SWIGTYPE_p_wxMenuEvent swig_types[86] +#define SWIGTYPE_p_wxMenuItem swig_types[87] +#define SWIGTYPE_p_wxMetaFile swig_types[88] +#define SWIGTYPE_p_wxMetaFileDC swig_types[89] +#define SWIGTYPE_p_wxMirrorDC swig_types[90] +#define SWIGTYPE_p_wxMouseCaptureChangedEvent swig_types[91] +#define SWIGTYPE_p_wxMouseCaptureLostEvent swig_types[92] +#define SWIGTYPE_p_wxMouseEvent swig_types[93] +#define SWIGTYPE_p_wxMoveEvent swig_types[94] +#define SWIGTYPE_p_wxNativeEncodingInfo swig_types[95] +#define SWIGTYPE_p_wxNativeFontInfo swig_types[96] +#define SWIGTYPE_p_wxNativePixelData swig_types[97] +#define SWIGTYPE_p_wxNativePixelData_Accessor swig_types[98] +#define SWIGTYPE_p_wxNavigationKeyEvent swig_types[99] +#define SWIGTYPE_p_wxNcPaintEvent swig_types[100] +#define SWIGTYPE_p_wxNotifyEvent swig_types[101] +#define SWIGTYPE_p_wxObject swig_types[102] +#define SWIGTYPE_p_wxOverlay swig_types[103] +#define SWIGTYPE_p_wxPCXHandler swig_types[104] +#define SWIGTYPE_p_wxPNGHandler swig_types[105] +#define SWIGTYPE_p_wxPNMHandler swig_types[106] +#define SWIGTYPE_p_wxPaintDC swig_types[107] +#define SWIGTYPE_p_wxPaintEvent swig_types[108] +#define SWIGTYPE_p_wxPalette swig_types[109] +#define SWIGTYPE_p_wxPaletteChangedEvent swig_types[110] +#define SWIGTYPE_p_wxPaperSize swig_types[111] +#define SWIGTYPE_p_wxPen swig_types[112] +#define SWIGTYPE_p_wxPenList swig_types[113] +#define SWIGTYPE_p_wxPixelDataBase swig_types[114] +#define SWIGTYPE_p_wxPoint swig_types[115] +#define SWIGTYPE_p_wxPoint2D swig_types[116] +#define SWIGTYPE_p_wxPostScriptDC swig_types[117] +#define SWIGTYPE_p_wxPrintData swig_types[118] +#define SWIGTYPE_p_wxPrinterDC swig_types[119] +#define SWIGTYPE_p_wxPseudoDC swig_types[120] +#define SWIGTYPE_p_wxPyApp swig_types[121] +#define SWIGTYPE_p_wxPyCommandEvent swig_types[122] +#define SWIGTYPE_p_wxPyEvent swig_types[123] +#define SWIGTYPE_p_wxPyFontEnumerator swig_types[124] +#define SWIGTYPE_p_wxPyImageHandler swig_types[125] +#define SWIGTYPE_p_wxPyLocale swig_types[126] +#define SWIGTYPE_p_wxPySizer swig_types[127] +#define SWIGTYPE_p_wxPyValidator swig_types[128] +#define SWIGTYPE_p_wxQueryNewPaletteEvent swig_types[129] +#define SWIGTYPE_p_wxRect swig_types[130] +#define SWIGTYPE_p_wxRegion swig_types[131] +#define SWIGTYPE_p_wxRegionIterator swig_types[132] +#define SWIGTYPE_p_wxRendererNative swig_types[133] +#define SWIGTYPE_p_wxRendererVersion swig_types[134] +#define SWIGTYPE_p_wxScreenDC swig_types[135] +#define SWIGTYPE_p_wxScrollEvent swig_types[136] +#define SWIGTYPE_p_wxScrollWinEvent swig_types[137] +#define SWIGTYPE_p_wxSetCursorEvent swig_types[138] +#define SWIGTYPE_p_wxShowEvent swig_types[139] +#define SWIGTYPE_p_wxSize swig_types[140] +#define SWIGTYPE_p_wxSizeEvent swig_types[141] +#define SWIGTYPE_p_wxSizer swig_types[142] +#define SWIGTYPE_p_wxSizerItem swig_types[143] +#define SWIGTYPE_p_wxSplitterRenderParams swig_types[144] +#define SWIGTYPE_p_wxStaticBoxSizer swig_types[145] +#define SWIGTYPE_p_wxStdDialogButtonSizer swig_types[146] +#define SWIGTYPE_p_wxStockGDI swig_types[147] +#define SWIGTYPE_p_wxString swig_types[148] +#define SWIGTYPE_p_wxSysColourChangedEvent swig_types[149] +#define SWIGTYPE_p_wxTIFFHandler swig_types[150] +#define SWIGTYPE_p_wxUpdateUIEvent swig_types[151] +#define SWIGTYPE_p_wxValidator swig_types[152] +#define SWIGTYPE_p_wxWindow swig_types[153] +#define SWIGTYPE_p_wxWindowCreateEvent swig_types[154] +#define SWIGTYPE_p_wxWindowDC swig_types[155] +#define SWIGTYPE_p_wxWindowDestroyEvent swig_types[156] +#define SWIGTYPE_p_wxXPMHandler swig_types[157] +static swig_type_info *swig_types[159]; +static swig_module_info swig_module = {swig_types, 158, 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) @@ -3670,6 +3671,9 @@ SWIGINTERN void wxGraphicsContext_StrokeLineSegements(wxGraphicsContext *self,Py delete [] endP; } +#include "wx/dcgraph.h" + + SWIGINTERN void wxColourDatabase_Append(wxColourDatabase *self,wxString const &name,int red,int green,int blue){ self->AddColour(name, wxColour(red, green, blue)); @@ -25791,19 +25795,15 @@ fail: } -SWIGINTERN PyObject *_wrap_GraphicsContext_Create(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { +SWIGINTERN PyObject *_wrap_GraphicsContext_Create__SWIG_0(PyObject *SWIGUNUSEDPARM(self), int nobjs, PyObject **swig_obj) { PyObject *resultobj = 0; wxWindowDC *arg1 = 0 ; wxGraphicsContext *result = 0 ; void *argp1 = 0 ; int res1 = 0 ; - PyObject * obj0 = 0 ; - char * kwnames[] = { - (char *) "dc", NULL - }; - if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:GraphicsContext_Create",kwnames,&obj0)) SWIG_fail; - res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_wxWindowDC, 0 | 0); + if ((nobjs < 1) || (nobjs > 1)) SWIG_fail; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1, SWIGTYPE_p_wxWindowDC, 0 | 0); if (!SWIG_IsOK(res1)) { SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GraphicsContext_Create" "', expected argument " "1"" of type '" "wxWindowDC const &""'"); } @@ -25822,6 +25822,83 @@ fail: } +SWIGINTERN PyObject *_wrap_GraphicsContext_Create__SWIG_1(PyObject *SWIGUNUSEDPARM(self), int nobjs, PyObject **swig_obj) { + PyObject *resultobj = 0; + wxWindow *arg1 = (wxWindow *) 0 ; + wxGraphicsContext *result = 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + + if ((nobjs < 1) || (nobjs > 1)) SWIG_fail; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxWindow, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GraphicsContext_Create" "', expected argument " "1"" of type '" "wxWindow *""'"); + } + arg1 = reinterpret_cast< wxWindow * >(argp1); + { + result = (wxGraphicsContext *)wxGraphicsContext::Create(arg1); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxGraphicsContext, 0 | 0 ); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_GraphicsContext_Create(PyObject *self, PyObject *args) { + int argc; + PyObject *argv[2]; + + if (!(argc = SWIG_Python_UnpackTuple(args,"GraphicsContext_Create",0,1,argv))) SWIG_fail; + --argc; + if (argc == 1) { + int _v = 0; + { + int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_wxWindowDC, 0); + _v = SWIG_CheckState(res); + } + if (!_v) goto check_1; + return _wrap_GraphicsContext_Create__SWIG_0(self, argc, argv); + } +check_1: + + if (argc == 1) { + return _wrap_GraphicsContext_Create__SWIG_1(self, argc, argv); + } + +fail: + SWIG_SetErrorMsg(PyExc_NotImplementedError,"No matching function for overloaded 'GraphicsContext_Create'"); + return NULL; +} + + +SWIGINTERN PyObject *_wrap_GraphicsContext_CreateFromNative(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { + PyObject *resultobj = 0; + void *arg1 = (void *) 0 ; + wxGraphicsContext *result = 0 ; + int res1 ; + PyObject * obj0 = 0 ; + char * kwnames[] = { + (char *) "context", NULL + }; + + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:GraphicsContext_CreateFromNative",kwnames,&obj0)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0,SWIG_as_voidptrptr(&arg1), 0, 0); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GraphicsContext_CreateFromNative" "', expected argument " "1"" of type '" "void *""'"); + } + { + result = (wxGraphicsContext *)wxGraphicsContext::CreateFromNative(arg1); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxGraphicsContext, 0 | 0 ); + return resultobj; +fail: + return NULL; +} + + SWIGINTERN PyObject *_wrap_GraphicsContext_CreatePath(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; wxGraphicsContext *arg1 = (wxGraphicsContext *) 0 ; @@ -25898,7 +25975,7 @@ fail: } -SWIGINTERN PyObject *_wrap_GraphicsContext_Clip(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { +SWIGINTERN PyObject *_wrap_GraphicsContext_ClipRegion(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxGraphicsContext *arg1 = (wxGraphicsContext *) 0 ; wxRegion *arg2 = 0 ; @@ -25912,18 +25989,18 @@ SWIGINTERN PyObject *_wrap_GraphicsContext_Clip(PyObject *SWIGUNUSEDPARM(self), (char *) "self",(char *) "region", NULL }; - if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:GraphicsContext_Clip",kwnames,&obj0,&obj1)) SWIG_fail; + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:GraphicsContext_ClipRegion",kwnames,&obj0,&obj1)) SWIG_fail; res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxGraphicsContext, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GraphicsContext_Clip" "', expected argument " "1"" of type '" "wxGraphicsContext *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GraphicsContext_ClipRegion" "', expected argument " "1"" of type '" "wxGraphicsContext *""'"); } arg1 = reinterpret_cast< wxGraphicsContext * >(argp1); res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_wxRegion, 0 | 0); if (!SWIG_IsOK(res2)) { - SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "GraphicsContext_Clip" "', expected argument " "2"" of type '" "wxRegion const &""'"); + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "GraphicsContext_ClipRegion" "', expected argument " "2"" of type '" "wxRegion const &""'"); } if (!argp2) { - SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "GraphicsContext_Clip" "', expected argument " "2"" of type '" "wxRegion const &""'"); + SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "GraphicsContext_ClipRegion" "', expected argument " "2"" of type '" "wxRegion const &""'"); } arg2 = reinterpret_cast< wxRegion * >(argp2); { @@ -25937,6 +26014,120 @@ fail: } +SWIGINTERN PyObject *_wrap_GraphicsContext_Clip(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { + PyObject *resultobj = 0; + wxGraphicsContext *arg1 = (wxGraphicsContext *) 0 ; + wxDouble arg2 ; + wxDouble arg3 ; + wxDouble arg4 ; + wxDouble arg5 ; + void *argp1 = 0 ; + int res1 = 0 ; + double val2 ; + int ecode2 = 0 ; + double val3 ; + int ecode3 = 0 ; + double val4 ; + int ecode4 = 0 ; + double val5 ; + int ecode5 = 0 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; + PyObject * obj4 = 0 ; + char * kwnames[] = { + (char *) "self",(char *) "x",(char *) "y",(char *) "w",(char *) "h", NULL + }; + + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:GraphicsContext_Clip",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxGraphicsContext, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GraphicsContext_Clip" "', expected argument " "1"" of type '" "wxGraphicsContext *""'"); + } + arg1 = reinterpret_cast< wxGraphicsContext * >(argp1); + ecode2 = SWIG_AsVal_double(obj1, &val2); + if (!SWIG_IsOK(ecode2)) { + SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "GraphicsContext_Clip" "', expected argument " "2"" of type '" "wxDouble""'"); + } + arg2 = static_cast< wxDouble >(val2); + ecode3 = SWIG_AsVal_double(obj2, &val3); + if (!SWIG_IsOK(ecode3)) { + SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "GraphicsContext_Clip" "', expected argument " "3"" of type '" "wxDouble""'"); + } + arg3 = static_cast< wxDouble >(val3); + ecode4 = SWIG_AsVal_double(obj3, &val4); + if (!SWIG_IsOK(ecode4)) { + SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "GraphicsContext_Clip" "', expected argument " "4"" of type '" "wxDouble""'"); + } + arg4 = static_cast< wxDouble >(val4); + ecode5 = SWIG_AsVal_double(obj4, &val5); + if (!SWIG_IsOK(ecode5)) { + SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "GraphicsContext_Clip" "', expected argument " "5"" of type '" "wxDouble""'"); + } + arg5 = static_cast< wxDouble >(val5); + { + (arg1)->Clip(arg2,arg3,arg4,arg5); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_Py_Void(); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_GraphicsContext_ResetClip(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + wxGraphicsContext *arg1 = (wxGraphicsContext *) 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject *swig_obj[1] ; + + if (!args) SWIG_fail; + swig_obj[0] = args; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxGraphicsContext, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GraphicsContext_ResetClip" "', expected argument " "1"" of type '" "wxGraphicsContext *""'"); + } + arg1 = reinterpret_cast< wxGraphicsContext * >(argp1); + { + (arg1)->ResetClip(); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_Py_Void(); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_GraphicsContext_GetNativeContext(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + wxGraphicsContext *arg1 = (wxGraphicsContext *) 0 ; + void *result = 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject *swig_obj[1] ; + + if (!args) SWIG_fail; + swig_obj[0] = args; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxGraphicsContext, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GraphicsContext_GetNativeContext" "', expected argument " "1"" of type '" "wxGraphicsContext *""'"); + } + arg1 = reinterpret_cast< wxGraphicsContext * >(argp1); + { + result = (void *)(arg1)->GetNativeContext(); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_void, 0 | 0 ); + return resultobj; +fail: + return NULL; +} + + SWIGINTERN PyObject *_wrap_GraphicsContext_Translate(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxGraphicsContext *arg1 = (wxGraphicsContext *) 0 ; @@ -27369,7 +27560,7 @@ fail: } -SWIGINTERN PyObject *_wrap_GCDC_GetGraphicContext(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { +SWIGINTERN PyObject *_wrap_GCDC_GetGraphicsContext(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; wxGCDC *arg1 = (wxGCDC *) 0 ; wxGraphicsContext *result = 0 ; @@ -27381,11 +27572,11 @@ SWIGINTERN PyObject *_wrap_GCDC_GetGraphicContext(PyObject *SWIGUNUSEDPARM(self) swig_obj[0] = args; res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxGCDC, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GCDC_GetGraphicContext" "', expected argument " "1"" of type '" "wxGCDC *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GCDC_GetGraphicsContext" "', expected argument " "1"" of type '" "wxGCDC *""'"); } arg1 = reinterpret_cast< wxGCDC * >(argp1); { - result = (wxGraphicsContext *)(arg1)->GetGraphicContext(); + result = (wxGraphicsContext *)(arg1)->GetGraphicsContext(); if (PyErr_Occurred()) SWIG_fail; } resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxGraphicsContext, 0 | 0 ); @@ -27395,6 +27586,42 @@ fail: } +SWIGINTERN PyObject *_wrap_GCDC_SetGraphicsContext(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { + PyObject *resultobj = 0; + wxGCDC *arg1 = (wxGCDC *) 0 ; + wxGraphicsContext *arg2 = (wxGraphicsContext *) 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + void *argp2 = 0 ; + int res2 = 0 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char * kwnames[] = { + (char *) "self",(char *) "ctx", NULL + }; + + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:GCDC_SetGraphicsContext",kwnames,&obj0,&obj1)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxGCDC, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GCDC_SetGraphicsContext" "', expected argument " "1"" of type '" "wxGCDC *""'"); + } + arg1 = reinterpret_cast< wxGCDC * >(argp1); + res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_wxGraphicsContext, 0 | 0 ); + if (!SWIG_IsOK(res2)) { + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "GCDC_SetGraphicsContext" "', expected argument " "2"" of type '" "wxGraphicsContext *""'"); + } + arg2 = reinterpret_cast< wxGraphicsContext * >(argp2); + { + (arg1)->SetGraphicsContext(arg2); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_Py_Void(); + return resultobj; +fail: + return NULL; +} + + SWIGINTERN PyObject *GCDC_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *obj; if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL; @@ -35752,11 +35979,15 @@ static PyMethodDef SwigMethods[] = { { (char *)"GraphicsPath_AddArcToPoint", (PyCFunction) _wrap_GraphicsPath_AddArcToPoint, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"GraphicsPath_swigregister", GraphicsPath_swigregister, METH_VARARGS, NULL}, { (char *)"delete_GraphicsContext", (PyCFunction)_wrap_delete_GraphicsContext, METH_O, NULL}, - { (char *)"GraphicsContext_Create", (PyCFunction) _wrap_GraphicsContext_Create, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"GraphicsContext_Create", _wrap_GraphicsContext_Create, METH_VARARGS, NULL}, + { (char *)"GraphicsContext_CreateFromNative", (PyCFunction) _wrap_GraphicsContext_CreateFromNative, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"GraphicsContext_CreatePath", (PyCFunction)_wrap_GraphicsContext_CreatePath, METH_O, NULL}, { (char *)"GraphicsContext_PushState", (PyCFunction)_wrap_GraphicsContext_PushState, METH_O, NULL}, { (char *)"GraphicsContext_PopState", (PyCFunction)_wrap_GraphicsContext_PopState, METH_O, NULL}, + { (char *)"GraphicsContext_ClipRegion", (PyCFunction) _wrap_GraphicsContext_ClipRegion, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"GraphicsContext_Clip", (PyCFunction) _wrap_GraphicsContext_Clip, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"GraphicsContext_ResetClip", (PyCFunction)_wrap_GraphicsContext_ResetClip, METH_O, NULL}, + { (char *)"GraphicsContext_GetNativeContext", (PyCFunction)_wrap_GraphicsContext_GetNativeContext, METH_O, NULL}, { (char *)"GraphicsContext_Translate", (PyCFunction) _wrap_GraphicsContext_Translate, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"GraphicsContext_Scale", (PyCFunction) _wrap_GraphicsContext_Scale, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"GraphicsContext_Rotate", (PyCFunction) _wrap_GraphicsContext_Rotate, METH_VARARGS | METH_KEYWORDS, NULL}, @@ -35785,7 +36016,8 @@ static PyMethodDef SwigMethods[] = { { (char *)"GraphicsContext_swigregister", GraphicsContext_swigregister, METH_VARARGS, NULL}, { (char *)"new_GCDC", (PyCFunction) _wrap_new_GCDC, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"delete_GCDC", (PyCFunction)_wrap_delete_GCDC, METH_O, NULL}, - { (char *)"GCDC_GetGraphicContext", (PyCFunction)_wrap_GCDC_GetGraphicContext, METH_O, NULL}, + { (char *)"GCDC_GetGraphicsContext", (PyCFunction)_wrap_GCDC_GetGraphicsContext, METH_O, NULL}, + { (char *)"GCDC_SetGraphicsContext", (PyCFunction) _wrap_GCDC_SetGraphicsContext, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"GCDC_swigregister", GCDC_swigregister, METH_VARARGS, NULL}, { (char *)"GCDC_swiginit", GCDC_swiginit, METH_VARARGS, NULL}, { (char *)"new_Overlay", (PyCFunction)_wrap_new_Overlay, METH_NOARGS, NULL}, @@ -36437,6 +36669,7 @@ static swig_type_info _swigt__p_int = {"_p_int", "int *", 0, 0, (void*)0, 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_void = {"_p_void", "void *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_wxAlphaPixelData = {"_p_wxAlphaPixelData", "wxAlphaPixelData *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_wxAlphaPixelData_Accessor = {"_p_wxAlphaPixelData_Accessor", "wxAlphaPixelData_Accessor *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_wxAutoBufferedPaintDC = {"_p_wxAutoBufferedPaintDC", "wxAutoBufferedPaintDC *", 0, 0, (void*)0, 0}; @@ -36596,6 +36829,7 @@ static swig_type_info *swig_type_initial[] = { &_swigt__p_unsigned_char, &_swigt__p_unsigned_int, &_swigt__p_unsigned_long, + &_swigt__p_void, &_swigt__p_wxANIHandler, &_swigt__p_wxAcceleratorTable, &_swigt__p_wxActivateEvent, @@ -36755,6 +36989,7 @@ static swig_cast_info _swigc__p_int[] = { {&_swigt__p_int, 0, 0, 0},{0, 0, 0, 0 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_void[] = { {&_swigt__p_void, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxAlphaPixelData[] = { {&_swigt__p_wxAlphaPixelData, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxAlphaPixelData_Accessor[] = { {&_swigt__p_wxAlphaPixelData_Accessor, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxAutoBufferedPaintDC[] = { {&_swigt__p_wxAutoBufferedPaintDC, 0, 0, 0},{0, 0, 0, 0}}; @@ -36914,6 +37149,7 @@ static swig_cast_info *swig_cast_initial[] = { _swigc__p_unsigned_char, _swigc__p_unsigned_int, _swigc__p_unsigned_long, + _swigc__p_void, _swigc__p_wxANIHandler, _swigc__p_wxAcceleratorTable, _swigc__p_wxActivateEvent, diff --git a/wxPython/src/msw/animate.py b/wxPython/src/msw/animate.py index a099b9bd89..1f82126f33 100644 --- a/wxPython/src/msw/animate.py +++ b/wxPython/src/msw/animate.py @@ -174,6 +174,15 @@ class AnimationCtrlBase(_core.Control): """IsPlaying(self) -> bool""" return _animate.AnimationCtrlBase_IsPlaying(*args, **kwargs) + def SetInactiveBitmap(*args, **kwargs): + """SetInactiveBitmap(self, Bitmap bmp)""" + return _animate.AnimationCtrlBase_SetInactiveBitmap(*args, **kwargs) + + def GetInactiveBitmap(*args, **kwargs): + """GetInactiveBitmap(self) -> Bitmap""" + return _animate.AnimationCtrlBase_GetInactiveBitmap(*args, **kwargs) + + InactiveBitmap = property(GetInactiveBitmap,SetInactiveBitmap) _animate.AnimationCtrlBase_swigregister(AnimationCtrlBase) NullAnimation = cvar.NullAnimation diff --git a/wxPython/src/msw/animate_wrap.cpp b/wxPython/src/msw/animate_wrap.cpp index 80f6c7f8f2..a6b96e5238 100644 --- a/wxPython/src/msw/animate_wrap.cpp +++ b/wxPython/src/msw/animate_wrap.cpp @@ -3661,6 +3661,75 @@ fail: } +SWIGINTERN PyObject *_wrap_AnimationCtrlBase_SetInactiveBitmap(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { + PyObject *resultobj = 0; + wxAnimationCtrlBase *arg1 = (wxAnimationCtrlBase *) 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:AnimationCtrlBase_SetInactiveBitmap",kwnames,&obj0,&obj1)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxAnimationCtrlBase, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AnimationCtrlBase_SetInactiveBitmap" "', expected argument " "1"" of type '" "wxAnimationCtrlBase *""'"); + } + arg1 = reinterpret_cast< wxAnimationCtrlBase * >(argp1); + res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_wxBitmap, 0 | 0); + if (!SWIG_IsOK(res2)) { + SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "AnimationCtrlBase_SetInactiveBitmap" "', expected argument " "2"" of type '" "wxBitmap const &""'"); + } + if (!argp2) { + SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "AnimationCtrlBase_SetInactiveBitmap" "', expected argument " "2"" of type '" "wxBitmap const &""'"); + } + arg2 = reinterpret_cast< wxBitmap * >(argp2); + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + (arg1)->SetInactiveBitmap((wxBitmap const &)*arg2); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_Py_Void(); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_AnimationCtrlBase_GetInactiveBitmap(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + wxAnimationCtrlBase *arg1 = (wxAnimationCtrlBase *) 0 ; + wxBitmap result; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject *swig_obj[1] ; + + if (!args) SWIG_fail; + swig_obj[0] = args; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxAnimationCtrlBase, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AnimationCtrlBase_GetInactiveBitmap" "', expected argument " "1"" of type '" "wxAnimationCtrlBase const *""'"); + } + arg1 = reinterpret_cast< wxAnimationCtrlBase * >(argp1); + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = ((wxAnimationCtrlBase const *)arg1)->GetInactiveBitmap(); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_NewPointerObj((new wxBitmap(static_cast< const wxBitmap& >(result))), SWIGTYPE_p_wxBitmap, SWIG_POINTER_OWN | 0 ); + return resultobj; +fail: + return NULL; +} + + SWIGINTERN PyObject *AnimationCtrlBase_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *obj; if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL; @@ -4090,6 +4159,8 @@ static PyMethodDef SwigMethods[] = { { (char *)"AnimationCtrlBase_Play", (PyCFunction)_wrap_AnimationCtrlBase_Play, METH_O, NULL}, { (char *)"AnimationCtrlBase_Stop", (PyCFunction)_wrap_AnimationCtrlBase_Stop, METH_O, NULL}, { (char *)"AnimationCtrlBase_IsPlaying", (PyCFunction)_wrap_AnimationCtrlBase_IsPlaying, METH_O, NULL}, + { (char *)"AnimationCtrlBase_SetInactiveBitmap", (PyCFunction) _wrap_AnimationCtrlBase_SetInactiveBitmap, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"AnimationCtrlBase_GetInactiveBitmap", (PyCFunction)_wrap_AnimationCtrlBase_GetInactiveBitmap, METH_O, NULL}, { (char *)"AnimationCtrlBase_swigregister", AnimationCtrlBase_swigregister, METH_VARARGS, NULL}, { (char *)"new_AnimationCtrl", (PyCFunction) _wrap_new_AnimationCtrl, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"new_PreAnimationCtrl", (PyCFunction)_wrap_new_PreAnimationCtrl, METH_NOARGS, NULL}, diff --git a/wxPython/src/msw/xrc.py b/wxPython/src/msw/xrc.py index 31946bfa96..cf28fe485f 100644 --- a/wxPython/src/msw/xrc.py +++ b/wxPython/src/msw/xrc.py @@ -79,6 +79,10 @@ class XmlResource(_core.Object): __swig_destroy__ = _xrc.delete_XmlResource __del__ = lambda self : None; + def GetFirstRoot(*args, **kwargs): + """GetFirstRoot(self) -> XmlNode""" + return _xrc.XmlResource_GetFirstRoot(*args, **kwargs) + def Load(*args, **kwargs): """Load(self, String filemask) -> bool""" return _xrc.XmlResource_Load(*args, **kwargs) @@ -223,6 +227,7 @@ PosString = cvar.PosString BitmapString = cvar.BitmapString IconString = cvar.IconString FontString = cvar.FontString +AnimationString = cvar.AnimationString def EmptyXmlResource(*args, **kwargs): """EmptyXmlResource(int flags=XRC_USE_LOCALE, String domain=wxEmptyString) -> XmlResource""" @@ -660,6 +665,10 @@ class XmlResourceHandler(_core.Object): """GetFont(self, String param=FontString) -> Font""" return _xrc.XmlResourceHandler_GetFont(*args, **kwargs) + def GetAnimation(*args, **kwargs): + """GetAnimation(self, String param=AnimationString) -> wxAnimation""" + return _xrc.XmlResourceHandler_GetAnimation(*args, **kwargs) + def SetupWindow(*args, **kwargs): """SetupWindow(self, Window wnd)""" return _xrc.XmlResourceHandler_SetupWindow(*args, **kwargs) diff --git a/wxPython/src/msw/xrc_wrap.cpp b/wxPython/src/msw/xrc_wrap.cpp index 79dff7afac..a7a4d7adfb 100644 --- a/wxPython/src/msw/xrc_wrap.cpp +++ b/wxPython/src/msw/xrc_wrap.cpp @@ -2472,104 +2472,105 @@ SWIG_Python_MustGetPtr(PyObject *obj, swig_type_info *ty, int argnum, int flags) #define SWIGTYPE_p_wxANIHandler swig_types[6] #define SWIGTYPE_p_wxAcceleratorTable swig_types[7] #define SWIGTYPE_p_wxActivateEvent swig_types[8] -#define SWIGTYPE_p_wxArtClient swig_types[9] -#define SWIGTYPE_p_wxBMPHandler swig_types[10] -#define SWIGTYPE_p_wxBitmap swig_types[11] -#define SWIGTYPE_p_wxBoxSizer swig_types[12] -#define SWIGTYPE_p_wxCURHandler swig_types[13] -#define SWIGTYPE_p_wxChildFocusEvent swig_types[14] -#define SWIGTYPE_p_wxClipboardTextEvent swig_types[15] -#define SWIGTYPE_p_wxCloseEvent swig_types[16] -#define SWIGTYPE_p_wxColour swig_types[17] -#define SWIGTYPE_p_wxCommandEvent swig_types[18] -#define SWIGTYPE_p_wxContextMenuEvent swig_types[19] -#define SWIGTYPE_p_wxControl swig_types[20] -#define SWIGTYPE_p_wxControlWithItems swig_types[21] -#define SWIGTYPE_p_wxDateEvent swig_types[22] -#define SWIGTYPE_p_wxDialog swig_types[23] -#define SWIGTYPE_p_wxDisplayChangedEvent swig_types[24] -#define SWIGTYPE_p_wxDropFilesEvent swig_types[25] -#define SWIGTYPE_p_wxDuplexMode swig_types[26] -#define SWIGTYPE_p_wxEraseEvent swig_types[27] -#define SWIGTYPE_p_wxEvent swig_types[28] -#define SWIGTYPE_p_wxEvtHandler swig_types[29] -#define SWIGTYPE_p_wxFSFile swig_types[30] -#define SWIGTYPE_p_wxFileSystem swig_types[31] -#define SWIGTYPE_p_wxFlexGridSizer swig_types[32] -#define SWIGTYPE_p_wxFocusEvent swig_types[33] -#define SWIGTYPE_p_wxFont swig_types[34] -#define SWIGTYPE_p_wxFrame swig_types[35] -#define SWIGTYPE_p_wxGBSizerItem swig_types[36] -#define SWIGTYPE_p_wxGIFHandler swig_types[37] -#define SWIGTYPE_p_wxGridBagSizer swig_types[38] -#define SWIGTYPE_p_wxGridSizer swig_types[39] -#define SWIGTYPE_p_wxICOHandler swig_types[40] -#define SWIGTYPE_p_wxIcon swig_types[41] -#define SWIGTYPE_p_wxIconizeEvent swig_types[42] -#define SWIGTYPE_p_wxIdleEvent swig_types[43] -#define SWIGTYPE_p_wxImage swig_types[44] -#define SWIGTYPE_p_wxImageHandler swig_types[45] -#define SWIGTYPE_p_wxIndividualLayoutConstraint swig_types[46] -#define SWIGTYPE_p_wxInitDialogEvent swig_types[47] -#define SWIGTYPE_p_wxInputStream swig_types[48] -#define SWIGTYPE_p_wxJPEGHandler swig_types[49] -#define SWIGTYPE_p_wxKeyEvent swig_types[50] -#define SWIGTYPE_p_wxLayoutConstraints swig_types[51] -#define SWIGTYPE_p_wxMaximizeEvent swig_types[52] -#define SWIGTYPE_p_wxMenu swig_types[53] -#define SWIGTYPE_p_wxMenuBar swig_types[54] -#define SWIGTYPE_p_wxMenuEvent swig_types[55] -#define SWIGTYPE_p_wxMenuItem swig_types[56] -#define SWIGTYPE_p_wxMouseCaptureChangedEvent swig_types[57] -#define SWIGTYPE_p_wxMouseCaptureLostEvent swig_types[58] -#define SWIGTYPE_p_wxMouseEvent swig_types[59] -#define SWIGTYPE_p_wxMoveEvent swig_types[60] -#define SWIGTYPE_p_wxNavigationKeyEvent swig_types[61] -#define SWIGTYPE_p_wxNcPaintEvent swig_types[62] -#define SWIGTYPE_p_wxNotifyEvent swig_types[63] -#define SWIGTYPE_p_wxObject swig_types[64] -#define SWIGTYPE_p_wxOutputStream swig_types[65] -#define SWIGTYPE_p_wxPCXHandler swig_types[66] -#define SWIGTYPE_p_wxPNGHandler swig_types[67] -#define SWIGTYPE_p_wxPNMHandler swig_types[68] -#define SWIGTYPE_p_wxPaintEvent swig_types[69] -#define SWIGTYPE_p_wxPaletteChangedEvent swig_types[70] -#define SWIGTYPE_p_wxPanel swig_types[71] -#define SWIGTYPE_p_wxPaperSize swig_types[72] -#define SWIGTYPE_p_wxPoint swig_types[73] -#define SWIGTYPE_p_wxPyApp swig_types[74] -#define SWIGTYPE_p_wxPyCommandEvent swig_types[75] -#define SWIGTYPE_p_wxPyEvent swig_types[76] -#define SWIGTYPE_p_wxPyImageHandler swig_types[77] -#define SWIGTYPE_p_wxPySizer swig_types[78] -#define SWIGTYPE_p_wxPyValidator swig_types[79] -#define SWIGTYPE_p_wxPyXmlResourceHandler swig_types[80] -#define SWIGTYPE_p_wxPyXmlSubclassFactory swig_types[81] -#define SWIGTYPE_p_wxQueryNewPaletteEvent swig_types[82] -#define SWIGTYPE_p_wxScrollEvent swig_types[83] -#define SWIGTYPE_p_wxScrollWinEvent swig_types[84] -#define SWIGTYPE_p_wxSetCursorEvent swig_types[85] -#define SWIGTYPE_p_wxShowEvent swig_types[86] -#define SWIGTYPE_p_wxSize swig_types[87] -#define SWIGTYPE_p_wxSizeEvent swig_types[88] -#define SWIGTYPE_p_wxSizer swig_types[89] -#define SWIGTYPE_p_wxSizerItem swig_types[90] -#define SWIGTYPE_p_wxStaticBoxSizer swig_types[91] -#define SWIGTYPE_p_wxStdDialogButtonSizer swig_types[92] -#define SWIGTYPE_p_wxSysColourChangedEvent swig_types[93] -#define SWIGTYPE_p_wxTIFFHandler swig_types[94] -#define SWIGTYPE_p_wxUpdateUIEvent swig_types[95] -#define SWIGTYPE_p_wxValidator swig_types[96] -#define SWIGTYPE_p_wxWindow swig_types[97] -#define SWIGTYPE_p_wxWindowCreateEvent swig_types[98] -#define SWIGTYPE_p_wxWindowDestroyEvent swig_types[99] -#define SWIGTYPE_p_wxXPMHandler swig_types[100] -#define SWIGTYPE_p_wxXmlDocument swig_types[101] -#define SWIGTYPE_p_wxXmlNode swig_types[102] -#define SWIGTYPE_p_wxXmlProperty swig_types[103] -#define SWIGTYPE_p_wxXmlResource swig_types[104] -static swig_type_info *swig_types[106]; -static swig_module_info swig_module = {swig_types, 105, 0, 0, 0, 0}; +#define SWIGTYPE_p_wxAnimation swig_types[9] +#define SWIGTYPE_p_wxArtClient swig_types[10] +#define SWIGTYPE_p_wxBMPHandler swig_types[11] +#define SWIGTYPE_p_wxBitmap swig_types[12] +#define SWIGTYPE_p_wxBoxSizer swig_types[13] +#define SWIGTYPE_p_wxCURHandler swig_types[14] +#define SWIGTYPE_p_wxChildFocusEvent swig_types[15] +#define SWIGTYPE_p_wxClipboardTextEvent swig_types[16] +#define SWIGTYPE_p_wxCloseEvent swig_types[17] +#define SWIGTYPE_p_wxColour swig_types[18] +#define SWIGTYPE_p_wxCommandEvent swig_types[19] +#define SWIGTYPE_p_wxContextMenuEvent swig_types[20] +#define SWIGTYPE_p_wxControl swig_types[21] +#define SWIGTYPE_p_wxControlWithItems swig_types[22] +#define SWIGTYPE_p_wxDateEvent swig_types[23] +#define SWIGTYPE_p_wxDialog swig_types[24] +#define SWIGTYPE_p_wxDisplayChangedEvent swig_types[25] +#define SWIGTYPE_p_wxDropFilesEvent swig_types[26] +#define SWIGTYPE_p_wxDuplexMode swig_types[27] +#define SWIGTYPE_p_wxEraseEvent swig_types[28] +#define SWIGTYPE_p_wxEvent swig_types[29] +#define SWIGTYPE_p_wxEvtHandler swig_types[30] +#define SWIGTYPE_p_wxFSFile swig_types[31] +#define SWIGTYPE_p_wxFileSystem swig_types[32] +#define SWIGTYPE_p_wxFlexGridSizer swig_types[33] +#define SWIGTYPE_p_wxFocusEvent swig_types[34] +#define SWIGTYPE_p_wxFont swig_types[35] +#define SWIGTYPE_p_wxFrame swig_types[36] +#define SWIGTYPE_p_wxGBSizerItem swig_types[37] +#define SWIGTYPE_p_wxGIFHandler swig_types[38] +#define SWIGTYPE_p_wxGridBagSizer swig_types[39] +#define SWIGTYPE_p_wxGridSizer swig_types[40] +#define SWIGTYPE_p_wxICOHandler swig_types[41] +#define SWIGTYPE_p_wxIcon swig_types[42] +#define SWIGTYPE_p_wxIconizeEvent swig_types[43] +#define SWIGTYPE_p_wxIdleEvent swig_types[44] +#define SWIGTYPE_p_wxImage swig_types[45] +#define SWIGTYPE_p_wxImageHandler swig_types[46] +#define SWIGTYPE_p_wxIndividualLayoutConstraint swig_types[47] +#define SWIGTYPE_p_wxInitDialogEvent swig_types[48] +#define SWIGTYPE_p_wxInputStream swig_types[49] +#define SWIGTYPE_p_wxJPEGHandler swig_types[50] +#define SWIGTYPE_p_wxKeyEvent swig_types[51] +#define SWIGTYPE_p_wxLayoutConstraints swig_types[52] +#define SWIGTYPE_p_wxMaximizeEvent swig_types[53] +#define SWIGTYPE_p_wxMenu swig_types[54] +#define SWIGTYPE_p_wxMenuBar swig_types[55] +#define SWIGTYPE_p_wxMenuEvent swig_types[56] +#define SWIGTYPE_p_wxMenuItem swig_types[57] +#define SWIGTYPE_p_wxMouseCaptureChangedEvent swig_types[58] +#define SWIGTYPE_p_wxMouseCaptureLostEvent swig_types[59] +#define SWIGTYPE_p_wxMouseEvent swig_types[60] +#define SWIGTYPE_p_wxMoveEvent swig_types[61] +#define SWIGTYPE_p_wxNavigationKeyEvent swig_types[62] +#define SWIGTYPE_p_wxNcPaintEvent swig_types[63] +#define SWIGTYPE_p_wxNotifyEvent swig_types[64] +#define SWIGTYPE_p_wxObject swig_types[65] +#define SWIGTYPE_p_wxOutputStream swig_types[66] +#define SWIGTYPE_p_wxPCXHandler swig_types[67] +#define SWIGTYPE_p_wxPNGHandler swig_types[68] +#define SWIGTYPE_p_wxPNMHandler swig_types[69] +#define SWIGTYPE_p_wxPaintEvent swig_types[70] +#define SWIGTYPE_p_wxPaletteChangedEvent swig_types[71] +#define SWIGTYPE_p_wxPanel swig_types[72] +#define SWIGTYPE_p_wxPaperSize swig_types[73] +#define SWIGTYPE_p_wxPoint swig_types[74] +#define SWIGTYPE_p_wxPyApp swig_types[75] +#define SWIGTYPE_p_wxPyCommandEvent swig_types[76] +#define SWIGTYPE_p_wxPyEvent swig_types[77] +#define SWIGTYPE_p_wxPyImageHandler swig_types[78] +#define SWIGTYPE_p_wxPySizer swig_types[79] +#define SWIGTYPE_p_wxPyValidator swig_types[80] +#define SWIGTYPE_p_wxPyXmlResourceHandler swig_types[81] +#define SWIGTYPE_p_wxPyXmlSubclassFactory swig_types[82] +#define SWIGTYPE_p_wxQueryNewPaletteEvent swig_types[83] +#define SWIGTYPE_p_wxScrollEvent swig_types[84] +#define SWIGTYPE_p_wxScrollWinEvent swig_types[85] +#define SWIGTYPE_p_wxSetCursorEvent swig_types[86] +#define SWIGTYPE_p_wxShowEvent swig_types[87] +#define SWIGTYPE_p_wxSize swig_types[88] +#define SWIGTYPE_p_wxSizeEvent swig_types[89] +#define SWIGTYPE_p_wxSizer swig_types[90] +#define SWIGTYPE_p_wxSizerItem swig_types[91] +#define SWIGTYPE_p_wxStaticBoxSizer swig_types[92] +#define SWIGTYPE_p_wxStdDialogButtonSizer swig_types[93] +#define SWIGTYPE_p_wxSysColourChangedEvent swig_types[94] +#define SWIGTYPE_p_wxTIFFHandler swig_types[95] +#define SWIGTYPE_p_wxUpdateUIEvent swig_types[96] +#define SWIGTYPE_p_wxValidator swig_types[97] +#define SWIGTYPE_p_wxWindow swig_types[98] +#define SWIGTYPE_p_wxWindowCreateEvent swig_types[99] +#define SWIGTYPE_p_wxWindowDestroyEvent swig_types[100] +#define SWIGTYPE_p_wxXPMHandler swig_types[101] +#define SWIGTYPE_p_wxXmlDocument swig_types[102] +#define SWIGTYPE_p_wxXmlNode swig_types[103] +#define SWIGTYPE_p_wxXmlProperty swig_types[104] +#define SWIGTYPE_p_wxXmlResource swig_types[105] +static swig_type_info *swig_types[107]; +static swig_module_info swig_module = {swig_types, 106, 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) @@ -2682,6 +2683,7 @@ namespace swig { static const wxString wxPyBitmapString(wxT("bitmap")); static const wxString wxPyIconString(wxT("icon")); static const wxString wxPyFontString(wxT("font")); + static const wxString wxPyAnimationString(wxT("animation")); #define SWIG_From_long PyInt_FromLong @@ -2854,6 +2856,9 @@ public: wxSize size = wxDefaultSize) { return wxXmlResourceHandler::GetIcon(param, defaultArtClient, size); } + wxAnimation GetAnimation(const wxString& param = wxT("animation")) + { return wxXmlResourceHandler::GetAnimation(param); } + wxFont GetFont(const wxString& param = wxT("font")) { return wxXmlResourceHandler::GetFont(param); } @@ -3042,6 +3047,26 @@ SWIGINTERN PyObject *FontString_get(void) { } +SWIGINTERN int AnimationString_set(PyObject *) { + SWIG_Error(SWIG_AttributeError,"Variable AnimationString is read-only."); + return 1; +} + + +SWIGINTERN PyObject *AnimationString_get(void) { + PyObject *pyobj = 0; + + { +#if wxUSE_UNICODE + pyobj = PyUnicode_FromWideChar((&wxPyAnimationString)->c_str(), (&wxPyAnimationString)->Len()); +#else + pyobj = PyString_FromStringAndSize((&wxPyAnimationString)->c_str(), (&wxPyAnimationString)->Len()); +#endif + } + return pyobj; +} + + SWIGINTERN PyObject *_wrap_new_XmlResource(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxString *arg1 = 0 ; @@ -3188,6 +3213,34 @@ fail: } +SWIGINTERN PyObject *_wrap_XmlResource_GetFirstRoot(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + wxXmlResource *arg1 = (wxXmlResource *) 0 ; + wxXmlNode *result = 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject *swig_obj[1] ; + + if (!args) SWIG_fail; + swig_obj[0] = args; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxXmlResource, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "XmlResource_GetFirstRoot" "', expected argument " "1"" of type '" "wxXmlResource *""'"); + } + arg1 = reinterpret_cast< wxXmlResource * >(argp1); + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (wxXmlNode *)(arg1)->GetFirstRoot(); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxXmlNode, 0 | 0 ); + return resultobj; +fail: + return NULL; +} + + SWIGINTERN PyObject *_wrap_XmlResource_Load(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxXmlResource *arg1 = (wxXmlResource *) 0 ; @@ -8429,6 +8482,55 @@ fail: } +SWIGINTERN PyObject *_wrap_XmlResourceHandler_GetAnimation(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { + PyObject *resultobj = 0; + wxPyXmlResourceHandler *arg1 = (wxPyXmlResourceHandler *) 0 ; + wxString const &arg2_defvalue = wxPyAnimationString ; + wxString *arg2 = (wxString *) &arg2_defvalue ; + wxAnimation result; + void *argp1 = 0 ; + int res1 = 0 ; + bool temp2 = false ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char * kwnames[] = { + (char *) "self",(char *) "param", NULL + }; + + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:XmlResourceHandler_GetAnimation",kwnames,&obj0,&obj1)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPyXmlResourceHandler, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "XmlResourceHandler_GetAnimation" "', expected argument " "1"" of type '" "wxPyXmlResourceHandler *""'"); + } + arg1 = reinterpret_cast< wxPyXmlResourceHandler * >(argp1); + if (obj1) { + { + arg2 = wxString_in_helper(obj1); + if (arg2 == NULL) SWIG_fail; + temp2 = true; + } + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (arg1)->GetAnimation((wxString const &)*arg2); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_NewPointerObj((new wxAnimation(static_cast< const wxAnimation& >(result))), SWIGTYPE_p_wxAnimation, SWIG_POINTER_OWN | 0 ); + { + if (temp2) + delete arg2; + } + return resultobj; +fail: + { + if (temp2) + delete arg2; + } + return NULL; +} + + SWIGINTERN PyObject *_wrap_XmlResourceHandler_SetupWindow(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { PyObject *resultobj = 0; wxPyXmlResourceHandler *arg1 = (wxPyXmlResourceHandler *) 0 ; @@ -8672,6 +8774,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"new_XmlResource", (PyCFunction) _wrap_new_XmlResource, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"new_EmptyXmlResource", (PyCFunction) _wrap_new_EmptyXmlResource, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"delete_XmlResource", (PyCFunction)_wrap_delete_XmlResource, METH_O, NULL}, + { (char *)"XmlResource_GetFirstRoot", (PyCFunction)_wrap_XmlResource_GetFirstRoot, METH_O, NULL}, { (char *)"XmlResource_Load", (PyCFunction) _wrap_XmlResource_Load, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"XmlResource_LoadFromString", (PyCFunction) _wrap_XmlResource_LoadFromString, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"XmlResource_Unload", (PyCFunction) _wrap_XmlResource_Unload, METH_VARARGS | METH_KEYWORDS, NULL}, @@ -8798,6 +8901,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"XmlResourceHandler_GetBitmap", (PyCFunction) _wrap_XmlResourceHandler_GetBitmap, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"XmlResourceHandler_GetIcon", (PyCFunction) _wrap_XmlResourceHandler_GetIcon, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"XmlResourceHandler_GetFont", (PyCFunction) _wrap_XmlResourceHandler_GetFont, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"XmlResourceHandler_GetAnimation", (PyCFunction) _wrap_XmlResourceHandler_GetAnimation, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"XmlResourceHandler_SetupWindow", (PyCFunction) _wrap_XmlResourceHandler_SetupWindow, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"XmlResourceHandler_CreateChildren", (PyCFunction) _wrap_XmlResourceHandler_CreateChildren, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"XmlResourceHandler_CreateChildrenPrivately", (PyCFunction) _wrap_XmlResourceHandler_CreateChildrenPrivately, METH_VARARGS | METH_KEYWORDS, NULL}, @@ -8811,6 +8915,15 @@ static PyMethodDef SwigMethods[] = { /* -------- TYPE CONVERSION AND EQUIVALENCE RULES (BEGIN) -------- */ +static void *_p_wxControlTo_p_wxWindow(void *x) { + return (void *)((wxWindow *) ((wxControl *) x)); +} +static void *_p_wxControlWithItemsTo_p_wxWindow(void *x) { + return (void *)((wxWindow *) (wxControl *) ((wxControlWithItems *) x)); +} +static void *_p_wxMenuBarTo_p_wxWindow(void *x) { + return (void *)((wxWindow *) ((wxMenuBar *) x)); +} static void *_p_wxLayoutConstraintsTo_p_wxObject(void *x) { return (void *)((wxObject *) ((wxLayoutConstraints *) x)); } @@ -9054,21 +9167,13 @@ static void *_p_wxPyValidatorTo_p_wxObject(void *x) { static void *_p_wxValidatorTo_p_wxObject(void *x) { return (void *)((wxObject *) (wxEvtHandler *) ((wxValidator *) x)); } -static void *_p_wxControlTo_p_wxWindow(void *x) { - return (void *)((wxWindow *) ((wxControl *) x)); -} -static void *_p_wxControlWithItemsTo_p_wxWindow(void *x) { - return (void *)((wxWindow *) (wxControl *) ((wxControlWithItems *) x)); -} -static void *_p_wxMenuBarTo_p_wxWindow(void *x) { - return (void *)((wxWindow *) ((wxMenuBar *) x)); -} static swig_type_info _swigt__p_char = {"_p_char", "char *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_form_ops_t = {"_p_form_ops_t", "enum form_ops_t *|form_ops_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_int = {"_p_int", "int *|wxEventType *", 0, 0, (void*)0, 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_wxAnimation = {"_p_wxAnimation", "wxAnimation *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_wxArtClient = {"_p_wxArtClient", "wxArtClient *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_wxBitmap = {"_p_wxBitmap", "wxBitmap *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_wxColour = {"_p_wxColour", "wxColour *", 0, 0, (void*)0, 0}; @@ -9179,6 +9284,7 @@ static swig_type_info *swig_type_initial[] = { &_swigt__p_wxANIHandler, &_swigt__p_wxAcceleratorTable, &_swigt__p_wxActivateEvent, + &_swigt__p_wxAnimation, &_swigt__p_wxArtClient, &_swigt__p_wxBMPHandler, &_swigt__p_wxBitmap, @@ -9283,6 +9389,7 @@ static swig_cast_info _swigc__p_int[] = { {&_swigt__p_int, 0, 0, 0},{0, 0, 0, 0 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_wxAnimation[] = { {&_swigt__p_wxAnimation, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxArtClient[] = { {&_swigt__p_wxArtClient, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxBitmap[] = { {&_swigt__p_wxBitmap, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_wxColour[] = { {&_swigt__p_wxColour, 0, 0, 0},{0, 0, 0, 0}}; @@ -9393,6 +9500,7 @@ static swig_cast_info *swig_cast_initial[] = { _swigc__p_wxANIHandler, _swigc__p_wxAcceleratorTable, _swigc__p_wxActivateEvent, + _swigc__p_wxAnimation, _swigc__p_wxArtClient, _swigc__p_wxBMPHandler, _swigc__p_wxBitmap, @@ -10000,6 +10108,7 @@ SWIGEXPORT void SWIG_init(void) { SWIG_addvarlink(SWIG_globals(),(char*)"BitmapString",BitmapString_get, BitmapString_set); SWIG_addvarlink(SWIG_globals(),(char*)"IconString",IconString_get, IconString_set); SWIG_addvarlink(SWIG_globals(),(char*)"FontString",FontString_get, FontString_set); + SWIG_addvarlink(SWIG_globals(),(char*)"AnimationString",AnimationString_get, AnimationString_set); SWIG_Python_SetConstant(d, "WX_XMLRES_CURRENT_VERSION_MAJOR",SWIG_From_int(static_cast< int >(WX_XMLRES_CURRENT_VERSION_MAJOR))); SWIG_Python_SetConstant(d, "WX_XMLRES_CURRENT_VERSION_MINOR",SWIG_From_int(static_cast< int >(WX_XMLRES_CURRENT_VERSION_MINOR))); SWIG_Python_SetConstant(d, "WX_XMLRES_CURRENT_VERSION_RELEASE",SWIG_From_int(static_cast< int >(WX_XMLRES_CURRENT_VERSION_RELEASE))); -- 2.45.2