From 32c988a34d4ce6b7ae079fe235853c495a38a3bc Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Thu, 4 Oct 2001 19:19:56 +0000 Subject: [PATCH] Fixed duplicate definition of wxWindow::SetAcceleratorTable, more swig code regenerated. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11839 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- wxPython/contrib/glcanvas/gtk/glcanvas.cpp | 451 +-------------------- wxPython/contrib/ogl/oglbasic.cpp | 12 + wxPython/contrib/ogl/oglcanvas.cpp | 18 + wxPython/contrib/ogl/oglshapes.cpp | 90 ++++ wxPython/contrib/ogl/oglshapes2.cpp | 54 +++ wxPython/contrib/stc/stc_.cpp | 21 + wxPython/contrib/xrc/xrc.cpp | 3 + wxPython/demo/Main.py | 1 - wxPython/src/gtk/calendar.cpp | 6 +- wxPython/src/gtk/cmndlgs.cpp | 112 ++--- wxPython/src/gtk/filesys.cpp | 2 + wxPython/src/gtk/help.cpp | 2 + wxPython/src/gtk/htmlhelp.cpp | 14 + wxPython/src/gtk/image.cpp | 2 + wxPython/src/gtk/mdi.cpp | 26 ++ wxPython/src/gtk/printfw.cpp | 40 +- wxPython/src/gtk/sizers.cpp | 2 + wxPython/src/gtk/stattool.cpp | 2 + wxPython/src/gtk/windows.cpp | 76 ++-- wxPython/src/gtk/windows.py | 6 +- wxPython/src/gtk/windows3.cpp | 2 + wxPython/src/gtk/wx.cpp | 38 ++ wxPython/src/gtk/wx.py | 40 +- wxPython/src/windows.i | 1 - 24 files changed, 463 insertions(+), 558 deletions(-) diff --git a/wxPython/contrib/glcanvas/gtk/glcanvas.cpp b/wxPython/contrib/glcanvas/gtk/glcanvas.cpp index c877e9db72..4285634e2d 100644 --- a/wxPython/contrib/glcanvas/gtk/glcanvas.cpp +++ b/wxPython/contrib/glcanvas/gtk/glcanvas.cpp @@ -63,25 +63,6 @@ extern PyObject *SWIG_newvarlink(void); #endif -static PyObject* l_output_helper(PyObject* target, PyObject* o) { - PyObject* o2; - if (!target) { - target = o; - } else if (target == Py_None) { - Py_DECREF(Py_None); - target = o; - } else { - if (!PyList_Check(target)) { - o2 = target; - target = PyList_New(0); - PyList_Append(target, o2); - Py_XDECREF(o2); - } - PyList_Append(target,o); - Py_XDECREF(o); - } - return target; -} static PyObject* t_output_helper(PyObject* target, PyObject* o) { PyObject* o2; @@ -697,22 +678,7 @@ static PyMethodDef glcanvascMethods[] = { * This table is used by the pointer type-checker */ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { - { "_wxAcceleratorTable","_class_wxAcceleratorTable",0}, - { "_wxEvent","_class_wxEvent",0}, - { "_class_wxActivateEvent","_wxActivateEvent",0}, { "_signed_long","_long",0}, - { "_wxMenuEvent","_class_wxMenuEvent",0}, - { "_class_wxProcessEvent","_wxProcessEvent",0}, - { "_class_wxJPEGHandler","_wxJPEGHandler",0}, - { "_class_wxFSFile","_wxFSFile",0}, - { "_wxPyBitmapDataObject","_class_wxPyBitmapDataObject",0}, - { "_wxBitmapDataObject","_class_wxBitmapDataObject",0}, - { "_class_wxPyCommandEvent","_wxPyCommandEvent",0}, - { "_wxBMPHandler","_class_wxBMPHandler",0}, - { "_wxImage","_class_wxImage",0}, - { "_wxFlexGridSizer","_class_wxFlexGridSizer",0}, - { "_wxWindowDisabler","_class_wxWindowDisabler",0}, - { "_class_wxDateTime","_wxDateTime",0}, { "_wxPrintQuality","_wxCoord",0}, { "_wxPrintQuality","_int",0}, { "_wxPrintQuality","_signed_int",0}, @@ -722,83 +688,15 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_wxPrintQuality","_EBool",0}, { "_wxPrintQuality","_size_t",0}, { "_wxPrintQuality","_time_t",0}, - { "_class_wxCustomDataObject","_wxCustomDataObject",0}, - { "_wxSpinCtrl","_class_wxSpinCtrl",0}, - { "_wxFontData","_class_wxFontData",0}, - { "_class_wxRegionIterator","_wxRegionIterator",0}, - { "_class_wxPyTextDropTarget","_wxPyTextDropTarget",0}, - { "_class_wxMenuBar","_wxMenuBar",0}, - { "_class_wxPyTreeItemData","_wxPyTreeItemData",0}, - { "_class_wxStaticBoxSizer","_wxStaticBoxSizer",0}, { "_class_wxEvtHandler","_class_wxGLCanvas",SwigwxGLCanvasTowxEvtHandler}, { "_class_wxEvtHandler","_wxGLCanvas",SwigwxGLCanvasTowxEvtHandler}, - { "_class_wxEvtHandler","_wxEvtHandler",0}, - { "_wxPaintEvent","_class_wxPaintEvent",0}, - { "_wxGIFHandler","_class_wxGIFHandler",0}, - { "_wxPySizer","_class_wxPySizer",0}, - { "_wxInternetFSHandler","_class_wxInternetFSHandler",0}, - { "_wxIndividualLayoutConstraint","_class_wxIndividualLayoutConstraint",0}, - { "_wxCursor","_class_wxCursor",0}, - { "_wxNotifyEvent","_class_wxNotifyEvent",0}, - { "_wxPyProcess","_class_wxPyProcess",0}, - { "_wxPyTreeCtrl","_class_wxPyTreeCtrl",0}, - { "_wxImageHandler","_class_wxImageHandler",0}, - { "_wxMutexGuiLocker","_class_wxMutexGuiLocker",0}, - { "_wxLog","_class_wxLog",0}, - { "_class_wxToolBarBase","_wxToolBarBase",0}, - { "_wxMask","_class_wxMask",0}, - { "_wxToolTip","_class_wxToolTip",0}, - { "_wxPNGHandler","_class_wxPNGHandler",0}, - { "_class_wxColourData","_wxColourData",0}, - { "_class_wxPageSetupDialogData","_wxPageSetupDialogData",0}, - { "_wxPrinter","_class_wxPrinter",0}, - { "_wxPen","_class_wxPen",0}, - { "_wxUpdateUIEvent","_class_wxUpdateUIEvent",0}, - { "_class_wxNotebookSizer","_wxNotebookSizer",0}, { "_byte","_unsigned_char",0}, - { "_wxDataObject","_class_wxDataObject",0}, - { "_class_wxPyFontEnumerator","_wxPyFontEnumerator",0}, - { "_wxStaticBox","_class_wxStaticBox",0}, - { "_wxColourDatabase","_class_wxColourDatabase",0}, - { "_wxPyDataObjectSimple","_class_wxPyDataObjectSimple",0}, - { "_wxPyDropSource","_class_wxPyDropSource",0}, - { "_wxChoice","_class_wxChoice",0}, - { "_wxSlider","_class_wxSlider",0}, - { "_wxNotebookEvent","_class_wxNotebookEvent",0}, - { "_wxPyPrintout","_class_wxPyPrintout",0}, { "_long","_unsigned_long",0}, { "_long","_signed_long",0}, - { "_wxImageList","_class_wxImageList",0}, - { "_wxDataObjectSimple","_class_wxDataObjectSimple",0}, - { "_wxDropFilesEvent","_class_wxDropFilesEvent",0}, - { "_wxBitmapButton","_class_wxBitmapButton",0}, - { "_wxSashWindow","_class_wxSashWindow",0}, - { "_class_wxSizer","_wxSizer",0}, - { "_class_wxTIFFHandler","_wxTIFFHandler",0}, - { "_class_wxPrintDialogData","_wxPrintDialogData",0}, - { "_wxGridSizer","_class_wxGridSizer",0}, - { "_wxGLContext","_class_wxGLContext",0}, - { "_class_wxAcceleratorTable","_wxAcceleratorTable",0}, - { "_class_wxClipboard","_wxClipboard",0}, - { "_class_wxGauge","_wxGauge",0}, - { "_class_wxSashEvent","_wxSashEvent",0}, - { "_wxGDIObject","_class_wxGDIObject",0}, - { "_wxDC","_class_wxDC",0}, - { "_wxSizerItem","_class_wxSizerItem",0}, - { "_class_wxBitmapDataObject","_wxBitmapDataObject",0}, - { "_wxListEvent","_class_wxListEvent",0}, - { "_class_wxSingleChoiceDialog","_wxSingleChoiceDialog",0}, - { "_wxProgressDialog","_class_wxProgressDialog",0}, - { "_class_wxBMPHandler","_wxBMPHandler",0}, - { "_wxPrintPreview","_class_wxPrintPreview",0}, - { "_class_wxFlexGridSizer","_wxFlexGridSizer",0}, { "_class_wxObject","_class_wxGLCanvas",SwigwxGLCanvasTowxObject}, { "_class_wxObject","_wxGLCanvas",SwigwxGLCanvasTowxObject}, { "_class_wxObject","_class_wxGLContext",SwigwxGLContextTowxObject}, { "_class_wxObject","_wxGLContext",SwigwxGLContextTowxObject}, - { "_class_wxObject","_wxObject",0}, - { "_wxSpinEvent","_class_wxSpinEvent",0}, - { "_wxSashLayoutWindow","_class_wxSashLayoutWindow",0}, { "_size_t","_wxCoord",0}, { "_size_t","_wxPrintQuality",0}, { "_size_t","_time_t",0}, @@ -806,54 +704,8 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_size_t","_int",0}, { "_size_t","_wxWindowID",0}, { "_size_t","_uint",0}, - { "_class_wxRealPoint","_wxRealPoint",0}, - { "_wxNavigationKeyEvent","_class_wxNavigationKeyEvent",0}, - { "_wxPNMHandler","_class_wxPNMHandler",0}, - { "_wxWindowCreateEvent","_class_wxWindowCreateEvent",0}, - { "_wxLogGui","_class_wxLogGui",0}, - { "_class_wxMenuItem","_wxMenuItem",0}, - { "_class_wxPaintEvent","_wxPaintEvent",0}, - { "_wxSysColourChangedEvent","_class_wxSysColourChangedEvent",0}, - { "_class_wxStatusBar","_wxStatusBar",0}, - { "_class_wxGIFHandler","_wxGIFHandler",0}, - { "_class_wxPySizer","_wxPySizer",0}, - { "_class_wxPostScriptDC","_wxPostScriptDC",0}, { "_wxPanel","_class_wxGLCanvas",SwigwxGLCanvasTowxPanel}, { "_wxPanel","_wxGLCanvas",SwigwxGLCanvasTowxPanel}, - { "_wxPanel","_class_wxPanel",0}, - { "_wxInitDialogEvent","_class_wxInitDialogEvent",0}, - { "_wxCheckBox","_class_wxCheckBox",0}, - { "_class_wxPyTreeCtrl","_wxPyTreeCtrl",0}, - { "_wxPyEvent","_class_wxPyEvent",0}, - { "_wxTextCtrl","_class_wxTextCtrl",0}, - { "_class_wxMask","_wxMask",0}, - { "_wxTextDataObject","_class_wxTextDataObject",0}, - { "_class_wxKeyEvent","_wxKeyEvent",0}, - { "_class_wxToolTip","_wxToolTip",0}, - { "_class_wxPNGHandler","_wxPNGHandler",0}, - { "_wxFileConfig","_class_wxFileConfig",0}, - { "_wxColour","_class_wxColour",0}, - { "_class_wxDialog","_wxDialog",0}, - { "_wxBusyCursor","_class_wxBusyCursor",0}, - { "_wxPageSetupDialog","_class_wxPageSetupDialog",0}, - { "_class_wxPrinter","_wxPrinter",0}, - { "_class_wxFileDataObject","_wxFileDataObject",0}, - { "_wxIdleEvent","_class_wxIdleEvent",0}, - { "_class_wxUpdateUIEvent","_wxUpdateUIEvent",0}, - { "_wxToolBar","_class_wxToolBar",0}, - { "_class_wxDataObject","_wxDataObject",0}, - { "_wxCaret","_class_wxCaret",0}, - { "_wxStaticLine","_class_wxStaticLine",0}, - { "_class_wxLayoutAlgorithm","_wxLayoutAlgorithm",0}, - { "_wxBrush","_class_wxBrush",0}, - { "_wxToggleButton","_class_wxToggleButton",0}, - { "_wxMiniFrame","_class_wxMiniFrame",0}, - { "_class_wxNotebookEvent","_wxNotebookEvent",0}, - { "_class_wxPyPrintout","_wxPyPrintout",0}, - { "_wxDataFormat","_class_wxDataFormat",0}, - { "_class_wxDataObjectSimple","_wxDataObjectSimple",0}, - { "_class_wxSashWindow","_wxSashWindow",0}, - { "_wxShowEvent","_class_wxShowEvent",0}, { "_uint","_wxCoord",0}, { "_uint","_wxPrintQuality",0}, { "_uint","_time_t",0}, @@ -862,197 +714,40 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_uint","_int",0}, { "_uint","_wxWindowID",0}, { "_wxChar","_char",0}, - { "_wxPyValidator","_class_wxPyValidator",0}, - { "_class_wxEvent","_wxEvent",0}, - { "_wxCheckListBox","_class_wxCheckListBox",0}, - { "_wxSplitterEvent","_class_wxSplitterEvent",0}, - { "_wxRect","_class_wxRect",0}, - { "_wxCommandEvent","_class_wxCommandEvent",0}, - { "_wxSizeEvent","_class_wxSizeEvent",0}, - { "_class_wxLogWindow","_wxLogWindow",0}, - { "_class_wxImage","_wxImage",0}, - { "_wxPoint","_class_wxPoint",0}, - { "_class_wxWindowDisabler","_wxWindowDisabler",0}, - { "_class_wxSashLayoutWindow","_wxSashLayoutWindow",0}, - { "_class_wxButton","_wxButton",0}, - { "_wxRadioBox","_class_wxRadioBox",0}, - { "_class_wxSpinCtrl","_wxSpinCtrl",0}, - { "_class_wxFontData","_wxFontData",0}, - { "_class_wxPNMHandler","_wxPNMHandler",0}, - { "_wxBoxSizer","_class_wxBoxSizer",0}, - { "_class_wxZipFSHandler","_wxZipFSHandler",0}, { "_char","_wxChar",0}, - { "_wxBitmap","_class_wxBitmap",0}, - { "_wxPenList","_class_wxPenList",0}, - { "_wxPrintDialog","_class_wxPrintDialog",0}, - { "_wxWindowDC","_class_wxWindowDC",0}, - { "_wxTimerEvent","_class_wxTimerEvent",0}, - { "_wxPyTimer","_class_wxPyTimer",0}, - { "_wxScrollBar","_class_wxScrollBar",0}, - { "_wxSpinButton","_class_wxSpinButton",0}, - { "_wxColourDialog","_class_wxColourDialog",0}, - { "_wxPrintData","_class_wxPrintData",0}, - { "_class_wxInternetFSHandler","_wxInternetFSHandler",0}, - { "_class_wxIndividualLayoutConstraint","_wxIndividualLayoutConstraint",0}, - { "_class_wxNotifyEvent","_wxNotifyEvent",0}, - { "_wxMessageDialog","_class_wxMessageDialog",0}, - { "_class_wxValidator","_wxValidator",0}, - { "_class_wxPyEvent","_wxPyEvent",0}, - { "_class_wxMutexGuiLocker","_wxMutexGuiLocker",0}, - { "_wxTextEntryDialog","_class_wxTextEntryDialog",0}, - { "_wxConfig","_class_wxConfig",0}, - { "_class_wxIconizeEvent","_wxIconizeEvent",0}, - { "_class_wxStaticBitmap","_wxStaticBitmap",0}, - { "_class_wxFileConfig","_wxFileConfig",0}, - { "_class_wxBusyCursor","_wxBusyCursor",0}, - { "_wxToolBarSimple","_class_wxToolBarSimple",0}, - { "_wxMDIChildFrame","_class_wxMDIChildFrame",0}, - { "_wxListItem","_class_wxListItem",0}, - { "_class_wxToolBar","_wxToolBar",0}, - { "_wxDropTarget","_class_wxDropTarget",0}, - { "_class_wxStaticLine","_wxStaticLine",0}, - { "_class_wxColourDatabase","_wxColourDatabase",0}, - { "_wxScrollEvent","_class_wxScrollEvent",0}, - { "_wxToolBarToolBase","_class_wxToolBarToolBase",0}, - { "_wxCalculateLayoutEvent","_class_wxCalculateLayoutEvent",0}, - { "_class_wxMemoryFSHandler","_wxMemoryFSHandler",0}, + { "_struct_wxNativeFontInfo","_wxNativeFontInfo",0}, { "_EBool","_wxCoord",0}, { "_EBool","_wxPrintQuality",0}, { "_EBool","_signed_int",0}, { "_EBool","_int",0}, { "_EBool","_wxWindowID",0}, - { "_class_wxRegion","_wxRegion",0}, - { "_class_wxDataFormat","_wxDataFormat",0}, - { "_class_wxDropFilesEvent","_wxDropFilesEvent",0}, - { "_wxWindowDestroyEvent","_class_wxWindowDestroyEvent",0}, - { "_class_wxPreviewFrame","_wxPreviewFrame",0}, - { "_wxStaticText","_class_wxStaticText",0}, - { "_wxFont","_class_wxFont",0}, - { "_class_wxPyDropTarget","_wxPyDropTarget",0}, - { "_wxCloseEvent","_class_wxCloseEvent",0}, - { "_class_wxSplitterEvent","_wxSplitterEvent",0}, - { "_wxProcessEvent","_class_wxProcessEvent",0}, - { "_wxNotebook","_class_wxNotebook",0}, - { "_wxFSFile","_class_wxFSFile",0}, { "_unsigned_long","_long",0}, - { "_class_wxRect","_wxRect",0}, - { "_class_wxDC","_wxDC",0}, - { "_wxScrollWinEvent","_class_wxScrollWinEvent",0}, - { "_wxGenericDragImage","_class_wxGenericDragImage",0}, - { "_class_wxProgressDialog","_wxProgressDialog",0}, - { "_class_wxBrushList","_wxBrushList",0}, - { "_wxQueryNewPaletteEvent","_class_wxQueryNewPaletteEvent",0}, - { "_wxPyInputStream","_class_wxPyInputStream",0}, - { "_wxPyApp","_class_wxPyApp",0}, - { "_class_wxPenList","_wxPenList",0}, - { "_class_wxWindowCreateEvent","_wxWindowCreateEvent",0}, - { "_class_wxOutputStream","_wxOutputStream",0}, - { "_wxLogTextCtrl","_class_wxLogTextCtrl",0}, - { "_wxMDIParentFrame","_class_wxMDIParentFrame",0}, - { "_class_wxTreeEvent","_wxTreeEvent",0}, - { "_class_wxDirDialog","_wxDirDialog",0}, - { "_wxTimeSpan","_class_wxTimeSpan",0}, - { "_wxFocusEvent","_class_wxFocusEvent",0}, - { "_wxMaximizeEvent","_class_wxMaximizeEvent",0}, - { "_class_wxTimerEvent","_wxTimerEvent",0}, - { "_class_wxPyTimer","_wxPyTimer",0}, - { "_class_wxSpinButton","_wxSpinButton",0}, - { "_wxAcceleratorEntry","_class_wxAcceleratorEntry",0}, + { "_wxNativeFontInfo","_struct_wxNativeFontInfo",0}, { "_class_wxPanel","_class_wxGLCanvas",SwigwxGLCanvasTowxPanel}, { "_class_wxPanel","_wxGLCanvas",SwigwxGLCanvasTowxPanel}, - { "_class_wxPanel","_wxPanel",0}, - { "_class_wxCheckBox","_wxCheckBox",0}, - { "_wxComboBox","_class_wxComboBox",0}, - { "_wxRadioButton","_class_wxRadioButton",0}, - { "_class_wxMessageDialog","_wxMessageDialog",0}, { "_signed_int","_wxCoord",0}, { "_signed_int","_wxPrintQuality",0}, { "_signed_int","_EBool",0}, { "_signed_int","_wxWindowID",0}, { "_signed_int","_int",0}, - { "_class_wxTextCtrl","_wxTextCtrl",0}, - { "_class_wxListItemAttr","_wxListItemAttr",0}, - { "_wxLayoutConstraints","_class_wxLayoutConstraints",0}, - { "_class_wxTextDataObject","_wxTextDataObject",0}, - { "_wxMenu","_class_wxMenu",0}, - { "_class_wxMoveEvent","_wxMoveEvent",0}, - { "_wxListBox","_class_wxListBox",0}, - { "_wxScreenDC","_class_wxScreenDC",0}, - { "_class_wxToolBarSimple","_wxToolBarSimple",0}, - { "_class_wxMDIChildFrame","_wxMDIChildFrame",0}, { "_WXTYPE","_wxDateTime_t",0}, { "_WXTYPE","_short",0}, { "_WXTYPE","_signed_short",0}, { "_WXTYPE","_unsigned_short",0}, - { "_wxFileDialog","_class_wxFileDialog",0}, - { "_class_wxDropTarget","_wxDropTarget",0}, - { "_class_wxCaret","_wxCaret",0}, - { "_class_wxMDIClientWindow","_wxMDIClientWindow",0}, - { "_class_wxBrush","_wxBrush",0}, - { "_wxTipProvider","_class_wxTipProvider",0}, { "_unsigned_short","_wxDateTime_t",0}, { "_unsigned_short","_WXTYPE",0}, { "_unsigned_short","_short",0}, { "_class_wxWindow","_class_wxGLCanvas",SwigwxGLCanvasTowxWindow}, { "_class_wxWindow","_wxGLCanvas",SwigwxGLCanvasTowxWindow}, - { "_class_wxWindow","_wxWindow",0}, - { "_class_wxLogStderr","_wxLogStderr",0}, - { "_wxSplitterWindow","_class_wxSplitterWindow",0}, - { "_wxDateSpan","_class_wxDateSpan",0}, - { "_class_wxStaticText","_wxStaticText",0}, - { "_wxPrintDialogData","_class_wxPrintDialogData",0}, - { "_class_wxFont","_wxFont",0}, - { "_wxClipboard","_class_wxClipboard",0}, - { "_class_wxPyValidator","_wxPyValidator",0}, - { "_class_wxCloseEvent","_wxCloseEvent",0}, - { "_wxSashEvent","_class_wxSashEvent",0}, - { "_wxBusyInfo","_class_wxBusyInfo",0}, - { "_wxFontList","_class_wxFontList",0}, - { "_class_wxMenuEvent","_wxMenuEvent",0}, - { "_wxPaletteChangedEvent","_class_wxPaletteChangedEvent",0}, - { "_class_wxPyBitmapDataObject","_wxPyBitmapDataObject",0}, - { "_wxClientDC","_class_wxClientDC",0}, - { "_wxMouseEvent","_class_wxMouseEvent",0}, - { "_class_wxGenericDragImage","_wxGenericDragImage",0}, - { "_wxListCtrl","_class_wxListCtrl",0}, - { "_wxSingleChoiceDialog","_class_wxSingleChoiceDialog",0}, - { "_wxGLCanvas","_class_wxGLCanvas",0}, { "_wxObject","_class_wxGLCanvas",SwigwxGLCanvasTowxObject}, { "_wxObject","_wxGLCanvas",SwigwxGLCanvasTowxObject}, { "_wxObject","_class_wxGLContext",SwigwxGLContextTowxObject}, { "_wxObject","_wxGLContext",SwigwxGLContextTowxObject}, - { "_wxObject","_class_wxObject",0}, - { "_class_wxPoint","_wxPoint",0}, - { "_class_wxPyInputStream","_wxPyInputStream",0}, - { "_wxRealPoint","_class_wxRealPoint",0}, - { "_class_wxRadioBox","_wxRadioBox",0}, - { "_class_wxBoxSizer","_wxBoxSizer",0}, { "_signed_short","_WXTYPE",0}, { "_signed_short","_short",0}, - { "_wxMemoryDC","_class_wxMemoryDC",0}, - { "_wxPyTextDataObject","_class_wxPyTextDataObject",0}, - { "_class_wxPrintDialog","_wxPrintDialog",0}, - { "_wxPyFileSystemHandler","_class_wxPyFileSystemHandler",0}, - { "_wxPaintDC","_class_wxPaintDC",0}, - { "_class_wxWindowDC","_wxWindowDC",0}, - { "_class_wxFocusEvent","_wxFocusEvent",0}, - { "_class_wxMaximizeEvent","_wxMaximizeEvent",0}, - { "_wxStatusBar","_class_wxStatusBar",0}, - { "_class_wxAcceleratorEntry","_wxAcceleratorEntry",0}, - { "_class_wxCursor","_wxCursor",0}, - { "_wxPostScriptDC","_class_wxPostScriptDC",0}, - { "_wxPyFileDropTarget","_class_wxPyFileDropTarget",0}, - { "_class_wxPyProcess","_wxPyProcess",0}, - { "_class_wxImageHandler","_wxImageHandler",0}, { "_wxScrolledWindow","_class_wxGLCanvas",SwigwxGLCanvasTowxScrolledWindow}, { "_wxScrolledWindow","_wxGLCanvas",SwigwxGLCanvasTowxScrolledWindow}, - { "_wxScrolledWindow","_class_wxScrolledWindow",0}, - { "_class_wxLog","_wxLog",0}, - { "_wxTreeItemId","_class_wxTreeItemId",0}, { "_unsigned_char","_byte",0}, - { "_class_wxMenu","_wxMenu",0}, - { "_wxControl","_class_wxControl",0}, - { "_class_wxListBox","_wxListBox",0}, { "_unsigned_int","_wxCoord",0}, { "_unsigned_int","_wxPrintQuality",0}, { "_unsigned_int","_time_t",0}, @@ -1060,37 +755,10 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_unsigned_int","_uint",0}, { "_unsigned_int","_wxWindowID",0}, { "_unsigned_int","_int",0}, - { "_wxIcon","_class_wxIcon",0}, - { "_wxDialog","_class_wxDialog",0}, - { "_class_wxListItem","_wxListItem",0}, - { "_class_wxPen","_wxPen",0}, - { "_class_wxFileDialog","_wxFileDialog",0}, - { "_wxQueryLayoutInfoEvent","_class_wxQueryLayoutInfoEvent",0}, - { "_wxConfigBase","_class_wxConfigBase",0}, { "_short","_wxDateTime_t",0}, { "_short","_WXTYPE",0}, { "_short","_unsigned_short",0}, { "_short","_signed_short",0}, - { "_class_wxStaticBox","_wxStaticBox",0}, - { "_wxLayoutAlgorithm","_class_wxLayoutAlgorithm",0}, - { "_class_wxPyDataObjectSimple","_wxPyDataObjectSimple",0}, - { "_class_wxPyDropSource","_wxPyDropSource",0}, - { "_class_wxScrollEvent","_wxScrollEvent",0}, - { "_wxJoystickEvent","_class_wxJoystickEvent",0}, - { "_class_wxChoice","_wxChoice",0}, - { "_class_wxSlider","_wxSlider",0}, - { "_class_wxCalculateLayoutEvent","_wxCalculateLayoutEvent",0}, - { "_class_wxImageList","_wxImageList",0}, - { "_class_wxBitmapButton","_wxBitmapButton",0}, - { "_wxFileSystemHandler","_class_wxFileSystemHandler",0}, - { "_wxPyTipProvider","_class_wxPyTipProvider",0}, - { "_wxFrame","_class_wxFrame",0}, - { "_wxPCXHandler","_class_wxPCXHandler",0}, - { "_class_wxGridSizer","_wxGridSizer",0}, - { "_class_wxGLContext","_wxGLContext",0}, - { "_class_wxPaletteChangedEvent","_wxPaletteChangedEvent",0}, - { "_class_wxNotebook","_wxNotebook",0}, - { "_wxJPEGHandler","_class_wxJPEGHandler",0}, { "_wxWindowID","_wxCoord",0}, { "_wxWindowID","_wxPrintQuality",0}, { "_wxWindowID","_time_t",0}, @@ -1100,9 +768,6 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_wxWindowID","_int",0}, { "_wxWindowID","_signed_int",0}, { "_wxWindowID","_unsigned_int",0}, - { "_class_wxGDIObject","_wxGDIObject",0}, - { "_class_wxScrollWinEvent","_wxScrollWinEvent",0}, - { "_class_wxSizerItem","_wxSizerItem",0}, { "_int","_wxCoord",0}, { "_int","_wxPrintQuality",0}, { "_int","_time_t",0}, @@ -1112,17 +777,9 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_int","_wxWindowID",0}, { "_int","_unsigned_int",0}, { "_int","_signed_int",0}, - { "_class_wxMouseEvent","_wxMouseEvent",0}, - { "_wxPyCommandEvent","_class_wxPyCommandEvent",0}, - { "_wxLogWindow","_class_wxLogWindow",0}, - { "_class_wxListEvent","_wxListEvent",0}, - { "_class_wxPrintPreview","_wxPrintPreview",0}, { "_wxDateTime_t","_unsigned_short",0}, { "_wxDateTime_t","_short",0}, { "_wxDateTime_t","_WXTYPE",0}, - { "_class_wxSpinEvent","_wxSpinEvent",0}, - { "_class_wxQueryNewPaletteEvent","_wxQueryNewPaletteEvent",0}, - { "_wxDateTime","_class_wxDateTime",0}, { "_time_t","_wxCoord",0}, { "_time_t","_wxPrintQuality",0}, { "_time_t","_unsigned_int",0}, @@ -1130,41 +787,6 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_time_t","_wxWindowID",0}, { "_time_t","_uint",0}, { "_time_t","_size_t",0}, - { "_class_wxNavigationKeyEvent","_wxNavigationKeyEvent",0}, - { "_wxLogNull","_class_wxLogNull",0}, - { "_wxButton","_class_wxButton",0}, - { "_wxZipFSHandler","_class_wxZipFSHandler",0}, - { "_class_wxPyApp","_wxPyApp",0}, - { "_wxSize","_class_wxSize",0}, - { "_wxRegionIterator","_class_wxRegionIterator",0}, - { "_class_wxPyTextDataObject","_wxPyTextDataObject",0}, - { "_class_wxLogTextCtrl","_wxLogTextCtrl",0}, - { "_class_wxLogGui","_wxLogGui",0}, - { "_class_wxMDIParentFrame","_wxMDIParentFrame",0}, - { "_wxPyTreeItemData","_class_wxPyTreeItemData",0}, - { "_wxStaticBoxSizer","_class_wxStaticBoxSizer",0}, - { "_class_wxTimeSpan","_wxTimeSpan",0}, - { "_class_wxPyFileSystemHandler","_wxPyFileSystemHandler",0}, - { "_class_wxPaintDC","_wxPaintDC",0}, - { "_class_wxSysColourChangedEvent","_wxSysColourChangedEvent",0}, - { "_class_wxPyFileDropTarget","_wxPyFileDropTarget",0}, - { "_class_wxInitDialogEvent","_wxInitDialogEvent",0}, - { "_class_wxComboBox","_wxComboBox",0}, - { "_class_wxRadioButton","_wxRadioButton",0}, - { "_wxValidator","_class_wxValidator",0}, - { "_wxToolBarBase","_class_wxToolBarBase",0}, - { "_class_wxTreeItemId","_wxTreeItemId",0}, - { "_class_wxLayoutConstraints","_wxLayoutConstraints",0}, - { "_wxIconizeEvent","_class_wxIconizeEvent",0}, - { "_class_wxControl","_wxControl",0}, - { "_wxStaticBitmap","_class_wxStaticBitmap",0}, - { "_class_wxIcon","_wxIcon",0}, - { "_class_wxColour","_wxColour",0}, - { "_class_wxScreenDC","_wxScreenDC",0}, - { "_class_wxPageSetupDialog","_wxPageSetupDialog",0}, - { "_wxPalette","_class_wxPalette",0}, - { "_class_wxIdleEvent","_wxIdleEvent",0}, - { "_class_wxConfigBase","_wxConfigBase",0}, { "_wxCoord","_int",0}, { "_wxCoord","_signed_int",0}, { "_wxCoord","_unsigned_int",0}, @@ -1174,81 +796,12 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_wxCoord","_size_t",0}, { "_wxCoord","_time_t",0}, { "_wxCoord","_wxPrintQuality",0}, - { "_wxEraseEvent","_class_wxEraseEvent",0}, - { "_wxDataObjectComposite","_class_wxDataObjectComposite",0}, - { "_class_wxJoystickEvent","_wxJoystickEvent",0}, - { "_class_wxTipProvider","_wxTipProvider",0}, - { "_class_wxToggleButton","_wxToggleButton",0}, - { "_class_wxMiniFrame","_wxMiniFrame",0}, - { "_wxFontDialog","_class_wxFontDialog",0}, - { "_wxMemoryFSHandler","_class_wxMemoryFSHandler",0}, - { "_wxRegion","_class_wxRegion",0}, - { "_class_wxSplitterWindow","_wxSplitterWindow",0}, - { "_wxPreviewFrame","_class_wxPreviewFrame",0}, - { "_wxSizer","_class_wxSizer",0}, - { "_class_wxDateSpan","_wxDateSpan",0}, - { "_wxFileSystem","_class_wxFileSystem",0}, - { "_class_wxShowEvent","_wxShowEvent",0}, - { "_class_wxPyTipProvider","_wxPyTipProvider",0}, - { "_class_wxPCXHandler","_wxPCXHandler",0}, - { "_wxTIFFHandler","_class_wxTIFFHandler",0}, - { "_wxPyDropTarget","_class_wxPyDropTarget",0}, - { "_wxActivateEvent","_class_wxActivateEvent",0}, - { "_wxGauge","_class_wxGauge",0}, - { "_class_wxCheckListBox","_wxCheckListBox",0}, - { "_class_wxBusyInfo","_wxBusyInfo",0}, - { "_class_wxFontList","_wxFontList",0}, - { "_class_wxCommandEvent","_wxCommandEvent",0}, - { "_class_wxClientDC","_wxClientDC",0}, - { "_class_wxSizeEvent","_wxSizeEvent",0}, - { "_class_wxListCtrl","_wxListCtrl",0}, - { "_class_wxGLCanvas","_wxGLCanvas",0}, - { "_wxBrushList","_class_wxBrushList",0}, - { "_wxCustomDataObject","_class_wxCustomDataObject",0}, - { "_class_wxLogNull","_wxLogNull",0}, - { "_class_wxSize","_wxSize",0}, - { "_class_wxBitmap","_wxBitmap",0}, - { "_class_wxMemoryDC","_wxMemoryDC",0}, - { "_wxPyTextDropTarget","_class_wxPyTextDropTarget",0}, - { "_wxMenuBar","_class_wxMenuBar",0}, - { "_wxOutputStream","_class_wxOutputStream",0}, - { "_wxTreeEvent","_class_wxTreeEvent",0}, - { "_wxDirDialog","_class_wxDirDialog",0}, { "_wxEvtHandler","_class_wxGLCanvas",SwigwxGLCanvasTowxEvtHandler}, { "_wxEvtHandler","_wxGLCanvas",SwigwxGLCanvasTowxEvtHandler}, - { "_wxEvtHandler","_class_wxEvtHandler",0}, - { "_wxMenuItem","_class_wxMenuItem",0}, - { "_class_wxScrollBar","_wxScrollBar",0}, - { "_class_wxColourDialog","_wxColourDialog",0}, - { "_class_wxPrintData","_wxPrintData",0}, { "_class_wxScrolledWindow","_class_wxGLCanvas",SwigwxGLCanvasTowxScrolledWindow}, { "_class_wxScrolledWindow","_wxGLCanvas",SwigwxGLCanvasTowxScrolledWindow}, - { "_class_wxScrolledWindow","_wxScrolledWindow",0}, - { "_wxListItemAttr","_class_wxListItemAttr",0}, - { "_class_wxTextEntryDialog","_wxTextEntryDialog",0}, - { "_class_wxConfig","_wxConfig",0}, - { "_wxKeyEvent","_class_wxKeyEvent",0}, - { "_wxMoveEvent","_class_wxMoveEvent",0}, - { "_wxColourData","_class_wxColourData",0}, - { "_wxPageSetupDialogData","_class_wxPageSetupDialogData",0}, - { "_class_wxPalette","_wxPalette",0}, - { "_wxFileDataObject","_class_wxFileDataObject",0}, - { "_class_wxQueryLayoutInfoEvent","_wxQueryLayoutInfoEvent",0}, - { "_wxNotebookSizer","_class_wxNotebookSizer",0}, - { "_class_wxEraseEvent","_wxEraseEvent",0}, - { "_wxPyFontEnumerator","_class_wxPyFontEnumerator",0}, - { "_wxMDIClientWindow","_class_wxMDIClientWindow",0}, - { "_class_wxDataObjectComposite","_wxDataObjectComposite",0}, - { "_class_wxToolBarToolBase","_wxToolBarToolBase",0}, - { "_class_wxFontDialog","_wxFontDialog",0}, { "_wxWindow","_class_wxGLCanvas",SwigwxGLCanvasTowxWindow}, { "_wxWindow","_wxGLCanvas",SwigwxGLCanvasTowxWindow}, - { "_wxWindow","_class_wxWindow",0}, - { "_class_wxWindowDestroyEvent","_wxWindowDestroyEvent",0}, - { "_wxLogStderr","_class_wxLogStderr",0}, - { "_class_wxFileSystemHandler","_wxFileSystemHandler",0}, - { "_class_wxFileSystem","_wxFileSystem",0}, - { "_class_wxFrame","_wxFrame",0}, {0,0,0}}; static PyObject *SWIG_globals; diff --git a/wxPython/contrib/ogl/oglbasic.cpp b/wxPython/contrib/ogl/oglbasic.cpp index 26037831b1..c01217015d 100644 --- a/wxPython/contrib/ogl/oglbasic.cpp +++ b/wxPython/contrib/ogl/oglbasic.cpp @@ -8363,6 +8363,12 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_byte","_unsigned_char",0}, { "_long","_unsigned_long",0}, { "_long","_signed_long",0}, + { "_class_wxObject","_class_wxPyShape",SwigwxPyShapeTowxObject}, + { "_class_wxObject","_wxPyShape",SwigwxPyShapeTowxObject}, + { "_class_wxObject","_class_wxPyShapeEvtHandler",SwigwxPyShapeEvtHandlerTowxObject}, + { "_class_wxObject","_wxPyShapeEvtHandler",SwigwxPyShapeEvtHandlerTowxObject}, + { "_class_wxObject","_class_wxShapeRegion",SwigwxShapeRegionTowxObject}, + { "_class_wxObject","_wxShapeRegion",SwigwxShapeRegionTowxObject}, { "_size_t","_wxCoord",0}, { "_size_t","_wxPrintQuality",0}, { "_size_t","_time_t",0}, @@ -8370,6 +8376,8 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_size_t","_int",0}, { "_size_t","_wxWindowID",0}, { "_size_t","_uint",0}, + { "_class_wxPyShapeEvtHandler","_class_wxPyShape",SwigwxPyShapeTowxPyShapeEvtHandler}, + { "_class_wxPyShapeEvtHandler","_wxPyShape",SwigwxPyShapeTowxPyShapeEvtHandler}, { "_uint","_wxCoord",0}, { "_uint","_wxPrintQuality",0}, { "_uint","_time_t",0}, @@ -8399,8 +8407,11 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_unsigned_short","_wxDateTime_t",0}, { "_unsigned_short","_WXTYPE",0}, { "_unsigned_short","_short",0}, + { "_wxObject","_class_wxPyShape",SwigwxPyShapeTowxObject}, { "_wxObject","_wxPyShape",SwigwxPyShapeTowxObject}, + { "_wxObject","_class_wxPyShapeEvtHandler",SwigwxPyShapeEvtHandlerTowxObject}, { "_wxObject","_wxPyShapeEvtHandler",SwigwxPyShapeEvtHandlerTowxObject}, + { "_wxObject","_class_wxShapeRegion",SwigwxShapeRegionTowxObject}, { "_wxObject","_wxShapeRegion",SwigwxShapeRegionTowxObject}, { "_signed_short","_WXTYPE",0}, { "_signed_short","_short",0}, @@ -8453,6 +8464,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_wxCoord","_size_t",0}, { "_wxCoord","_time_t",0}, { "_wxCoord","_wxPrintQuality",0}, + { "_wxPyShapeEvtHandler","_class_wxPyShape",SwigwxPyShapeTowxPyShapeEvtHandler}, { "_wxPyShapeEvtHandler","_wxPyShape",SwigwxPyShapeTowxPyShapeEvtHandler}, {0,0,0}}; diff --git a/wxPython/contrib/ogl/oglcanvas.cpp b/wxPython/contrib/ogl/oglcanvas.cpp index e91913d346..1948e49f81 100644 --- a/wxPython/contrib/ogl/oglcanvas.cpp +++ b/wxPython/contrib/ogl/oglcanvas.cpp @@ -1957,9 +1957,15 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_wxPrintQuality","_EBool",0}, { "_wxPrintQuality","_size_t",0}, { "_wxPrintQuality","_time_t",0}, + { "_class_wxEvtHandler","_class_wxPyShapeCanvas",SwigwxPyShapeCanvasTowxEvtHandler}, + { "_class_wxEvtHandler","_wxPyShapeCanvas",SwigwxPyShapeCanvasTowxEvtHandler}, { "_byte","_unsigned_char",0}, { "_long","_unsigned_long",0}, { "_long","_signed_long",0}, + { "_class_wxObject","_class_wxPyShapeCanvas",SwigwxPyShapeCanvasTowxObject}, + { "_class_wxObject","_wxPyShapeCanvas",SwigwxPyShapeCanvasTowxObject}, + { "_class_wxObject","_class_wxDiagram",SwigwxDiagramTowxObject}, + { "_class_wxObject","_wxDiagram",SwigwxDiagramTowxObject}, { "_size_t","_wxCoord",0}, { "_size_t","_wxPrintQuality",0}, { "_size_t","_time_t",0}, @@ -1967,6 +1973,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_size_t","_int",0}, { "_size_t","_wxWindowID",0}, { "_size_t","_uint",0}, + { "_wxPanel","_class_wxPyShapeCanvas",SwigwxPyShapeCanvasTowxPanel}, { "_wxPanel","_wxPyShapeCanvas",SwigwxPyShapeCanvasTowxPanel}, { "_uint","_wxCoord",0}, { "_uint","_wxPrintQuality",0}, @@ -1985,6 +1992,8 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_EBool","_wxWindowID",0}, { "_unsigned_long","_long",0}, { "_wxNativeFontInfo","_struct_wxNativeFontInfo",0}, + { "_class_wxPanel","_class_wxPyShapeCanvas",SwigwxPyShapeCanvasTowxPanel}, + { "_class_wxPanel","_wxPyShapeCanvas",SwigwxPyShapeCanvasTowxPanel}, { "_signed_int","_wxCoord",0}, { "_signed_int","_wxPrintQuality",0}, { "_signed_int","_EBool",0}, @@ -1997,10 +2006,15 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_unsigned_short","_wxDateTime_t",0}, { "_unsigned_short","_WXTYPE",0}, { "_unsigned_short","_short",0}, + { "_class_wxWindow","_class_wxPyShapeCanvas",SwigwxPyShapeCanvasTowxWindow}, + { "_class_wxWindow","_wxPyShapeCanvas",SwigwxPyShapeCanvasTowxWindow}, + { "_wxObject","_class_wxPyShapeCanvas",SwigwxPyShapeCanvasTowxObject}, { "_wxObject","_wxPyShapeCanvas",SwigwxPyShapeCanvasTowxObject}, + { "_wxObject","_class_wxDiagram",SwigwxDiagramTowxObject}, { "_wxObject","_wxDiagram",SwigwxDiagramTowxObject}, { "_signed_short","_WXTYPE",0}, { "_signed_short","_short",0}, + { "_wxScrolledWindow","_class_wxPyShapeCanvas",SwigwxPyShapeCanvasTowxScrolledWindow}, { "_wxScrolledWindow","_wxPyShapeCanvas",SwigwxPyShapeCanvasTowxScrolledWindow}, { "_unsigned_char","_byte",0}, { "_unsigned_int","_wxCoord",0}, @@ -2051,7 +2065,11 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_wxCoord","_size_t",0}, { "_wxCoord","_time_t",0}, { "_wxCoord","_wxPrintQuality",0}, + { "_wxEvtHandler","_class_wxPyShapeCanvas",SwigwxPyShapeCanvasTowxEvtHandler}, { "_wxEvtHandler","_wxPyShapeCanvas",SwigwxPyShapeCanvasTowxEvtHandler}, + { "_class_wxScrolledWindow","_class_wxPyShapeCanvas",SwigwxPyShapeCanvasTowxScrolledWindow}, + { "_class_wxScrolledWindow","_wxPyShapeCanvas",SwigwxPyShapeCanvasTowxScrolledWindow}, + { "_wxWindow","_class_wxPyShapeCanvas",SwigwxPyShapeCanvasTowxWindow}, { "_wxWindow","_wxPyShapeCanvas",SwigwxPyShapeCanvasTowxWindow}, {0,0,0}}; diff --git a/wxPython/contrib/ogl/oglshapes.cpp b/wxPython/contrib/ogl/oglshapes.cpp index ba964f5df2..54813b8a11 100644 --- a/wxPython/contrib/ogl/oglshapes.cpp +++ b/wxPython/contrib/ogl/oglshapes.cpp @@ -12584,10 +12584,41 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_wxPrintQuality","_EBool",0}, { "_wxPrintQuality","_size_t",0}, { "_wxPrintQuality","_time_t",0}, + { "_wxPyCompositeShape","_class_wxPyDivisionShape",SwigwxPyDivisionShapeTowxPyCompositeShape}, { "_wxPyCompositeShape","_wxPyDivisionShape",SwigwxPyDivisionShapeTowxPyCompositeShape}, + { "_class_wxPyRectangleShape","_class_wxPyDivisionShape",SwigwxPyDivisionShapeTowxPyRectangleShape}, + { "_class_wxPyRectangleShape","_wxPyDivisionShape",SwigwxPyDivisionShapeTowxPyRectangleShape}, + { "_class_wxPyRectangleShape","_class_wxPyDividedShape",SwigwxPyDividedShapeTowxPyRectangleShape}, + { "_class_wxPyRectangleShape","_wxPyDividedShape",SwigwxPyDividedShapeTowxPyRectangleShape}, + { "_class_wxPyRectangleShape","_class_wxPyCompositeShape",SwigwxPyCompositeShapeTowxPyRectangleShape}, + { "_class_wxPyRectangleShape","_wxPyCompositeShape",SwigwxPyCompositeShapeTowxPyRectangleShape}, + { "_class_wxPyRectangleShape","_class_wxPyDrawnShape",SwigwxPyDrawnShapeTowxPyRectangleShape}, + { "_class_wxPyRectangleShape","_wxPyDrawnShape",SwigwxPyDrawnShapeTowxPyRectangleShape}, + { "_class_wxPyRectangleShape","_class_wxPyBitmapShape",SwigwxPyBitmapShapeTowxPyRectangleShape}, + { "_class_wxPyRectangleShape","_wxPyBitmapShape",SwigwxPyBitmapShapeTowxPyRectangleShape}, + { "_class_wxPyRectangleShape","_class_wxPyControlPoint",SwigwxPyControlPointTowxPyRectangleShape}, + { "_class_wxPyRectangleShape","_wxPyControlPoint",SwigwxPyControlPointTowxPyRectangleShape}, { "_byte","_unsigned_char",0}, { "_long","_unsigned_long",0}, { "_long","_signed_long",0}, + { "_class_wxObject","_class_wxPyDivisionShape",SwigwxPyDivisionShapeTowxObject}, + { "_class_wxObject","_wxPyDivisionShape",SwigwxPyDivisionShapeTowxObject}, + { "_class_wxObject","_class_wxPyDividedShape",SwigwxPyDividedShapeTowxObject}, + { "_class_wxObject","_wxPyDividedShape",SwigwxPyDividedShapeTowxObject}, + { "_class_wxObject","_class_wxPyCompositeShape",SwigwxPyCompositeShapeTowxObject}, + { "_class_wxObject","_wxPyCompositeShape",SwigwxPyCompositeShapeTowxObject}, + { "_class_wxObject","_class_wxOGLConstraint",SwigwxOGLConstraintTowxObject}, + { "_class_wxObject","_wxOGLConstraint",SwigwxOGLConstraintTowxObject}, + { "_class_wxObject","_class_wxPyDrawnShape",SwigwxPyDrawnShapeTowxObject}, + { "_class_wxObject","_wxPyDrawnShape",SwigwxPyDrawnShapeTowxObject}, + { "_class_wxObject","_class_wxPyBitmapShape",SwigwxPyBitmapShapeTowxObject}, + { "_class_wxObject","_wxPyBitmapShape",SwigwxPyBitmapShapeTowxObject}, + { "_class_wxObject","_class_wxPyControlPoint",SwigwxPyControlPointTowxObject}, + { "_class_wxObject","_wxPyControlPoint",SwigwxPyControlPointTowxObject}, + { "_class_wxObject","_class_wxPyRectangleShape",SwigwxPyRectangleShapeTowxObject}, + { "_class_wxObject","_wxPyRectangleShape",SwigwxPyRectangleShapeTowxObject}, + { "_class_wxObject","_class_wxPseudoMetaFile",SwigwxPseudoMetaFileTowxObject}, + { "_class_wxObject","_wxPseudoMetaFile",SwigwxPseudoMetaFileTowxObject}, { "_size_t","_wxCoord",0}, { "_size_t","_wxPrintQuality",0}, { "_size_t","_time_t",0}, @@ -12595,6 +12626,22 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_size_t","_int",0}, { "_size_t","_wxWindowID",0}, { "_size_t","_uint",0}, + { "_class_wxPyShapeEvtHandler","_class_wxPyDivisionShape",SwigwxPyDivisionShapeTowxPyShapeEvtHandler}, + { "_class_wxPyShapeEvtHandler","_wxPyDivisionShape",SwigwxPyDivisionShapeTowxPyShapeEvtHandler}, + { "_class_wxPyShapeEvtHandler","_class_wxPyDividedShape",SwigwxPyDividedShapeTowxPyShapeEvtHandler}, + { "_class_wxPyShapeEvtHandler","_wxPyDividedShape",SwigwxPyDividedShapeTowxPyShapeEvtHandler}, + { "_class_wxPyShapeEvtHandler","_class_wxPyCompositeShape",SwigwxPyCompositeShapeTowxPyShapeEvtHandler}, + { "_class_wxPyShapeEvtHandler","_wxPyCompositeShape",SwigwxPyCompositeShapeTowxPyShapeEvtHandler}, + { "_class_wxPyShapeEvtHandler","_class_wxPyDrawnShape",SwigwxPyDrawnShapeTowxPyShapeEvtHandler}, + { "_class_wxPyShapeEvtHandler","_wxPyDrawnShape",SwigwxPyDrawnShapeTowxPyShapeEvtHandler}, + { "_class_wxPyShapeEvtHandler","_class_wxPyBitmapShape",SwigwxPyBitmapShapeTowxPyShapeEvtHandler}, + { "_class_wxPyShapeEvtHandler","_wxPyBitmapShape",SwigwxPyBitmapShapeTowxPyShapeEvtHandler}, + { "_class_wxPyShapeEvtHandler","_class_wxPyControlPoint",SwigwxPyControlPointTowxPyShapeEvtHandler}, + { "_class_wxPyShapeEvtHandler","_wxPyControlPoint",SwigwxPyControlPointTowxPyShapeEvtHandler}, + { "_class_wxPyShapeEvtHandler","_class_wxPyRectangleShape",SwigwxPyRectangleShapeTowxPyShapeEvtHandler}, + { "_class_wxPyShapeEvtHandler","_wxPyRectangleShape",SwigwxPyRectangleShapeTowxPyShapeEvtHandler}, + { "_class_wxPyCompositeShape","_class_wxPyDivisionShape",SwigwxPyDivisionShapeTowxPyCompositeShape}, + { "_class_wxPyCompositeShape","_wxPyDivisionShape",SwigwxPyDivisionShapeTowxPyCompositeShape}, { "_uint","_wxCoord",0}, { "_uint","_wxPrintQuality",0}, { "_uint","_time_t",0}, @@ -12624,23 +12671,39 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_unsigned_short","_wxDateTime_t",0}, { "_unsigned_short","_WXTYPE",0}, { "_unsigned_short","_short",0}, + { "_wxObject","_class_wxPyDivisionShape",SwigwxPyDivisionShapeTowxObject}, { "_wxObject","_wxPyDivisionShape",SwigwxPyDivisionShapeTowxObject}, + { "_wxObject","_class_wxPyDividedShape",SwigwxPyDividedShapeTowxObject}, { "_wxObject","_wxPyDividedShape",SwigwxPyDividedShapeTowxObject}, + { "_wxObject","_class_wxPyCompositeShape",SwigwxPyCompositeShapeTowxObject}, { "_wxObject","_wxPyCompositeShape",SwigwxPyCompositeShapeTowxObject}, + { "_wxObject","_class_wxOGLConstraint",SwigwxOGLConstraintTowxObject}, { "_wxObject","_wxOGLConstraint",SwigwxOGLConstraintTowxObject}, + { "_wxObject","_class_wxPyDrawnShape",SwigwxPyDrawnShapeTowxObject}, { "_wxObject","_wxPyDrawnShape",SwigwxPyDrawnShapeTowxObject}, + { "_wxObject","_class_wxPyBitmapShape",SwigwxPyBitmapShapeTowxObject}, { "_wxObject","_wxPyBitmapShape",SwigwxPyBitmapShapeTowxObject}, + { "_wxObject","_class_wxPyControlPoint",SwigwxPyControlPointTowxObject}, { "_wxObject","_wxPyControlPoint",SwigwxPyControlPointTowxObject}, + { "_wxObject","_class_wxPyRectangleShape",SwigwxPyRectangleShapeTowxObject}, { "_wxObject","_wxPyRectangleShape",SwigwxPyRectangleShapeTowxObject}, + { "_wxObject","_class_wxPseudoMetaFile",SwigwxPseudoMetaFileTowxObject}, { "_wxObject","_wxPseudoMetaFile",SwigwxPseudoMetaFileTowxObject}, { "_signed_short","_WXTYPE",0}, { "_signed_short","_short",0}, + { "_wxPyShape","_class_wxPyDivisionShape",SwigwxPyDivisionShapeTowxPyShape}, { "_wxPyShape","_wxPyDivisionShape",SwigwxPyDivisionShapeTowxPyShape}, + { "_wxPyShape","_class_wxPyDividedShape",SwigwxPyDividedShapeTowxPyShape}, { "_wxPyShape","_wxPyDividedShape",SwigwxPyDividedShapeTowxPyShape}, + { "_wxPyShape","_class_wxPyCompositeShape",SwigwxPyCompositeShapeTowxPyShape}, { "_wxPyShape","_wxPyCompositeShape",SwigwxPyCompositeShapeTowxPyShape}, + { "_wxPyShape","_class_wxPyDrawnShape",SwigwxPyDrawnShapeTowxPyShape}, { "_wxPyShape","_wxPyDrawnShape",SwigwxPyDrawnShapeTowxPyShape}, + { "_wxPyShape","_class_wxPyBitmapShape",SwigwxPyBitmapShapeTowxPyShape}, { "_wxPyShape","_wxPyBitmapShape",SwigwxPyBitmapShapeTowxPyShape}, + { "_wxPyShape","_class_wxPyControlPoint",SwigwxPyControlPointTowxPyShape}, { "_wxPyShape","_wxPyControlPoint",SwigwxPyControlPointTowxPyShape}, + { "_wxPyShape","_class_wxPyRectangleShape",SwigwxPyRectangleShapeTowxPyShape}, { "_wxPyShape","_wxPyRectangleShape",SwigwxPyRectangleShapeTowxPyShape}, { "_unsigned_char","_byte",0}, { "_unsigned_int","_wxCoord",0}, @@ -12682,6 +12745,20 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_time_t","_wxWindowID",0}, { "_time_t","_uint",0}, { "_time_t","_size_t",0}, + { "_class_wxPyShape","_class_wxPyDivisionShape",SwigwxPyDivisionShapeTowxPyShape}, + { "_class_wxPyShape","_wxPyDivisionShape",SwigwxPyDivisionShapeTowxPyShape}, + { "_class_wxPyShape","_class_wxPyDividedShape",SwigwxPyDividedShapeTowxPyShape}, + { "_class_wxPyShape","_wxPyDividedShape",SwigwxPyDividedShapeTowxPyShape}, + { "_class_wxPyShape","_class_wxPyCompositeShape",SwigwxPyCompositeShapeTowxPyShape}, + { "_class_wxPyShape","_wxPyCompositeShape",SwigwxPyCompositeShapeTowxPyShape}, + { "_class_wxPyShape","_class_wxPyDrawnShape",SwigwxPyDrawnShapeTowxPyShape}, + { "_class_wxPyShape","_wxPyDrawnShape",SwigwxPyDrawnShapeTowxPyShape}, + { "_class_wxPyShape","_class_wxPyBitmapShape",SwigwxPyBitmapShapeTowxPyShape}, + { "_class_wxPyShape","_wxPyBitmapShape",SwigwxPyBitmapShapeTowxPyShape}, + { "_class_wxPyShape","_class_wxPyControlPoint",SwigwxPyControlPointTowxPyShape}, + { "_class_wxPyShape","_wxPyControlPoint",SwigwxPyControlPointTowxPyShape}, + { "_class_wxPyShape","_class_wxPyRectangleShape",SwigwxPyRectangleShapeTowxPyShape}, + { "_class_wxPyShape","_wxPyRectangleShape",SwigwxPyRectangleShapeTowxPyShape}, { "_wxCoord","_int",0}, { "_wxCoord","_signed_int",0}, { "_wxCoord","_unsigned_int",0}, @@ -12691,18 +12768,31 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_wxCoord","_size_t",0}, { "_wxCoord","_time_t",0}, { "_wxCoord","_wxPrintQuality",0}, + { "_wxPyShapeEvtHandler","_class_wxPyDivisionShape",SwigwxPyDivisionShapeTowxPyShapeEvtHandler}, { "_wxPyShapeEvtHandler","_wxPyDivisionShape",SwigwxPyDivisionShapeTowxPyShapeEvtHandler}, + { "_wxPyShapeEvtHandler","_class_wxPyDividedShape",SwigwxPyDividedShapeTowxPyShapeEvtHandler}, { "_wxPyShapeEvtHandler","_wxPyDividedShape",SwigwxPyDividedShapeTowxPyShapeEvtHandler}, + { "_wxPyShapeEvtHandler","_class_wxPyCompositeShape",SwigwxPyCompositeShapeTowxPyShapeEvtHandler}, { "_wxPyShapeEvtHandler","_wxPyCompositeShape",SwigwxPyCompositeShapeTowxPyShapeEvtHandler}, + { "_wxPyShapeEvtHandler","_class_wxPyDrawnShape",SwigwxPyDrawnShapeTowxPyShapeEvtHandler}, { "_wxPyShapeEvtHandler","_wxPyDrawnShape",SwigwxPyDrawnShapeTowxPyShapeEvtHandler}, + { "_wxPyShapeEvtHandler","_class_wxPyBitmapShape",SwigwxPyBitmapShapeTowxPyShapeEvtHandler}, { "_wxPyShapeEvtHandler","_wxPyBitmapShape",SwigwxPyBitmapShapeTowxPyShapeEvtHandler}, + { "_wxPyShapeEvtHandler","_class_wxPyControlPoint",SwigwxPyControlPointTowxPyShapeEvtHandler}, { "_wxPyShapeEvtHandler","_wxPyControlPoint",SwigwxPyControlPointTowxPyShapeEvtHandler}, + { "_wxPyShapeEvtHandler","_class_wxPyRectangleShape",SwigwxPyRectangleShapeTowxPyShapeEvtHandler}, { "_wxPyShapeEvtHandler","_wxPyRectangleShape",SwigwxPyRectangleShapeTowxPyShapeEvtHandler}, + { "_wxPyRectangleShape","_class_wxPyDivisionShape",SwigwxPyDivisionShapeTowxPyRectangleShape}, { "_wxPyRectangleShape","_wxPyDivisionShape",SwigwxPyDivisionShapeTowxPyRectangleShape}, + { "_wxPyRectangleShape","_class_wxPyDividedShape",SwigwxPyDividedShapeTowxPyRectangleShape}, { "_wxPyRectangleShape","_wxPyDividedShape",SwigwxPyDividedShapeTowxPyRectangleShape}, + { "_wxPyRectangleShape","_class_wxPyCompositeShape",SwigwxPyCompositeShapeTowxPyRectangleShape}, { "_wxPyRectangleShape","_wxPyCompositeShape",SwigwxPyCompositeShapeTowxPyRectangleShape}, + { "_wxPyRectangleShape","_class_wxPyDrawnShape",SwigwxPyDrawnShapeTowxPyRectangleShape}, { "_wxPyRectangleShape","_wxPyDrawnShape",SwigwxPyDrawnShapeTowxPyRectangleShape}, + { "_wxPyRectangleShape","_class_wxPyBitmapShape",SwigwxPyBitmapShapeTowxPyRectangleShape}, { "_wxPyRectangleShape","_wxPyBitmapShape",SwigwxPyBitmapShapeTowxPyRectangleShape}, + { "_wxPyRectangleShape","_class_wxPyControlPoint",SwigwxPyControlPointTowxPyRectangleShape}, { "_wxPyRectangleShape","_wxPyControlPoint",SwigwxPyControlPointTowxPyRectangleShape}, {0,0,0}}; diff --git a/wxPython/contrib/ogl/oglshapes2.cpp b/wxPython/contrib/ogl/oglshapes2.cpp index 1695056250..17694194ca 100644 --- a/wxPython/contrib/ogl/oglshapes2.cpp +++ b/wxPython/contrib/ogl/oglshapes2.cpp @@ -7930,9 +7930,25 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_wxPrintQuality","_EBool",0}, { "_wxPrintQuality","_size_t",0}, { "_wxPrintQuality","_time_t",0}, + { "_class_wxPyRectangleShape","_class_wxPyTextShape",SwigwxPyTextShapeTowxPyRectangleShape}, + { "_class_wxPyRectangleShape","_wxPyTextShape",SwigwxPyTextShapeTowxPyRectangleShape}, { "_byte","_unsigned_char",0}, { "_long","_unsigned_long",0}, { "_long","_signed_long",0}, + { "_class_wxObject","_class_wxPyTextShape",SwigwxPyTextShapeTowxObject}, + { "_class_wxObject","_wxPyTextShape",SwigwxPyTextShapeTowxObject}, + { "_class_wxObject","_class_wxPyPolygonShape",SwigwxPyPolygonShapeTowxObject}, + { "_class_wxObject","_wxPyPolygonShape",SwigwxPyPolygonShapeTowxObject}, + { "_class_wxObject","_class_wxPyLineShape",SwigwxPyLineShapeTowxObject}, + { "_class_wxObject","_wxPyLineShape",SwigwxPyLineShapeTowxObject}, + { "_class_wxObject","_class_wxArrowHead",SwigwxArrowHeadTowxObject}, + { "_class_wxObject","_wxArrowHead",SwigwxArrowHeadTowxObject}, + { "_class_wxObject","_class_wxPyCircleShape",SwigwxPyCircleShapeTowxObject}, + { "_class_wxObject","_wxPyCircleShape",SwigwxPyCircleShapeTowxObject}, + { "_class_wxObject","_class_wxPyEllipseShape",SwigwxPyEllipseShapeTowxObject}, + { "_class_wxObject","_wxPyEllipseShape",SwigwxPyEllipseShapeTowxObject}, + { "_class_wxPyEllipseShape","_class_wxPyCircleShape",SwigwxPyCircleShapeTowxPyEllipseShape}, + { "_class_wxPyEllipseShape","_wxPyCircleShape",SwigwxPyCircleShapeTowxPyEllipseShape}, { "_size_t","_wxCoord",0}, { "_size_t","_wxPrintQuality",0}, { "_size_t","_time_t",0}, @@ -7940,6 +7956,16 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_size_t","_int",0}, { "_size_t","_wxWindowID",0}, { "_size_t","_uint",0}, + { "_class_wxPyShapeEvtHandler","_class_wxPyTextShape",SwigwxPyTextShapeTowxPyShapeEvtHandler}, + { "_class_wxPyShapeEvtHandler","_wxPyTextShape",SwigwxPyTextShapeTowxPyShapeEvtHandler}, + { "_class_wxPyShapeEvtHandler","_class_wxPyPolygonShape",SwigwxPyPolygonShapeTowxPyShapeEvtHandler}, + { "_class_wxPyShapeEvtHandler","_wxPyPolygonShape",SwigwxPyPolygonShapeTowxPyShapeEvtHandler}, + { "_class_wxPyShapeEvtHandler","_class_wxPyLineShape",SwigwxPyLineShapeTowxPyShapeEvtHandler}, + { "_class_wxPyShapeEvtHandler","_wxPyLineShape",SwigwxPyLineShapeTowxPyShapeEvtHandler}, + { "_class_wxPyShapeEvtHandler","_class_wxPyCircleShape",SwigwxPyCircleShapeTowxPyShapeEvtHandler}, + { "_class_wxPyShapeEvtHandler","_wxPyCircleShape",SwigwxPyCircleShapeTowxPyShapeEvtHandler}, + { "_class_wxPyShapeEvtHandler","_class_wxPyEllipseShape",SwigwxPyEllipseShapeTowxPyShapeEvtHandler}, + { "_class_wxPyShapeEvtHandler","_wxPyEllipseShape",SwigwxPyEllipseShapeTowxPyShapeEvtHandler}, { "_uint","_wxCoord",0}, { "_uint","_wxPrintQuality",0}, { "_uint","_time_t",0}, @@ -7969,18 +7995,29 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_unsigned_short","_wxDateTime_t",0}, { "_unsigned_short","_WXTYPE",0}, { "_unsigned_short","_short",0}, + { "_wxObject","_class_wxPyTextShape",SwigwxPyTextShapeTowxObject}, { "_wxObject","_wxPyTextShape",SwigwxPyTextShapeTowxObject}, + { "_wxObject","_class_wxPyPolygonShape",SwigwxPyPolygonShapeTowxObject}, { "_wxObject","_wxPyPolygonShape",SwigwxPyPolygonShapeTowxObject}, + { "_wxObject","_class_wxPyLineShape",SwigwxPyLineShapeTowxObject}, { "_wxObject","_wxPyLineShape",SwigwxPyLineShapeTowxObject}, + { "_wxObject","_class_wxArrowHead",SwigwxArrowHeadTowxObject}, { "_wxObject","_wxArrowHead",SwigwxArrowHeadTowxObject}, + { "_wxObject","_class_wxPyCircleShape",SwigwxPyCircleShapeTowxObject}, { "_wxObject","_wxPyCircleShape",SwigwxPyCircleShapeTowxObject}, + { "_wxObject","_class_wxPyEllipseShape",SwigwxPyEllipseShapeTowxObject}, { "_wxObject","_wxPyEllipseShape",SwigwxPyEllipseShapeTowxObject}, { "_signed_short","_WXTYPE",0}, { "_signed_short","_short",0}, + { "_wxPyShape","_class_wxPyTextShape",SwigwxPyTextShapeTowxPyShape}, { "_wxPyShape","_wxPyTextShape",SwigwxPyTextShapeTowxPyShape}, + { "_wxPyShape","_class_wxPyPolygonShape",SwigwxPyPolygonShapeTowxPyShape}, { "_wxPyShape","_wxPyPolygonShape",SwigwxPyPolygonShapeTowxPyShape}, + { "_wxPyShape","_class_wxPyLineShape",SwigwxPyLineShapeTowxPyShape}, { "_wxPyShape","_wxPyLineShape",SwigwxPyLineShapeTowxPyShape}, + { "_wxPyShape","_class_wxPyCircleShape",SwigwxPyCircleShapeTowxPyShape}, { "_wxPyShape","_wxPyCircleShape",SwigwxPyCircleShapeTowxPyShape}, + { "_wxPyShape","_class_wxPyEllipseShape",SwigwxPyEllipseShapeTowxPyShape}, { "_wxPyShape","_wxPyEllipseShape",SwigwxPyEllipseShapeTowxPyShape}, { "_unsigned_char","_byte",0}, { "_unsigned_int","_wxCoord",0}, @@ -8022,6 +8059,16 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_time_t","_wxWindowID",0}, { "_time_t","_uint",0}, { "_time_t","_size_t",0}, + { "_class_wxPyShape","_class_wxPyTextShape",SwigwxPyTextShapeTowxPyShape}, + { "_class_wxPyShape","_wxPyTextShape",SwigwxPyTextShapeTowxPyShape}, + { "_class_wxPyShape","_class_wxPyPolygonShape",SwigwxPyPolygonShapeTowxPyShape}, + { "_class_wxPyShape","_wxPyPolygonShape",SwigwxPyPolygonShapeTowxPyShape}, + { "_class_wxPyShape","_class_wxPyLineShape",SwigwxPyLineShapeTowxPyShape}, + { "_class_wxPyShape","_wxPyLineShape",SwigwxPyLineShapeTowxPyShape}, + { "_class_wxPyShape","_class_wxPyCircleShape",SwigwxPyCircleShapeTowxPyShape}, + { "_class_wxPyShape","_wxPyCircleShape",SwigwxPyCircleShapeTowxPyShape}, + { "_class_wxPyShape","_class_wxPyEllipseShape",SwigwxPyEllipseShapeTowxPyShape}, + { "_class_wxPyShape","_wxPyEllipseShape",SwigwxPyEllipseShapeTowxPyShape}, { "_wxCoord","_int",0}, { "_wxCoord","_signed_int",0}, { "_wxCoord","_unsigned_int",0}, @@ -8031,12 +8078,19 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_wxCoord","_size_t",0}, { "_wxCoord","_time_t",0}, { "_wxCoord","_wxPrintQuality",0}, + { "_wxPyEllipseShape","_class_wxPyCircleShape",SwigwxPyCircleShapeTowxPyEllipseShape}, { "_wxPyEllipseShape","_wxPyCircleShape",SwigwxPyCircleShapeTowxPyEllipseShape}, + { "_wxPyShapeEvtHandler","_class_wxPyTextShape",SwigwxPyTextShapeTowxPyShapeEvtHandler}, { "_wxPyShapeEvtHandler","_wxPyTextShape",SwigwxPyTextShapeTowxPyShapeEvtHandler}, + { "_wxPyShapeEvtHandler","_class_wxPyPolygonShape",SwigwxPyPolygonShapeTowxPyShapeEvtHandler}, { "_wxPyShapeEvtHandler","_wxPyPolygonShape",SwigwxPyPolygonShapeTowxPyShapeEvtHandler}, + { "_wxPyShapeEvtHandler","_class_wxPyLineShape",SwigwxPyLineShapeTowxPyShapeEvtHandler}, { "_wxPyShapeEvtHandler","_wxPyLineShape",SwigwxPyLineShapeTowxPyShapeEvtHandler}, + { "_wxPyShapeEvtHandler","_class_wxPyCircleShape",SwigwxPyCircleShapeTowxPyShapeEvtHandler}, { "_wxPyShapeEvtHandler","_wxPyCircleShape",SwigwxPyCircleShapeTowxPyShapeEvtHandler}, + { "_wxPyShapeEvtHandler","_class_wxPyEllipseShape",SwigwxPyEllipseShapeTowxPyShapeEvtHandler}, { "_wxPyShapeEvtHandler","_wxPyEllipseShape",SwigwxPyEllipseShapeTowxPyShapeEvtHandler}, + { "_wxPyRectangleShape","_class_wxPyTextShape",SwigwxPyTextShapeTowxPyRectangleShape}, { "_wxPyRectangleShape","_wxPyTextShape",SwigwxPyTextShapeTowxPyRectangleShape}, {0,0,0}}; diff --git a/wxPython/contrib/stc/stc_.cpp b/wxPython/contrib/stc/stc_.cpp index 1ad2814880..67ba91300c 100644 --- a/wxPython/contrib/stc/stc_.cpp +++ b/wxPython/contrib/stc/stc_.cpp @@ -10119,6 +10119,7 @@ static PyMethodDef stc_cMethods[] = { * This table is used by the pointer type-checker */ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { + { "_wxEvent","_class_wxStyledTextEvent",SwigwxStyledTextEventTowxEvent}, { "_wxEvent","_wxStyledTextEvent",SwigwxStyledTextEventTowxEvent}, { "_signed_long","_long",0}, { "_wxPrintQuality","_wxCoord",0}, @@ -10130,9 +10131,15 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_wxPrintQuality","_EBool",0}, { "_wxPrintQuality","_size_t",0}, { "_wxPrintQuality","_time_t",0}, + { "_class_wxEvtHandler","_class_wxStyledTextCtrl",SwigwxStyledTextCtrlTowxEvtHandler}, + { "_class_wxEvtHandler","_wxStyledTextCtrl",SwigwxStyledTextCtrlTowxEvtHandler}, { "_byte","_unsigned_char",0}, { "_long","_unsigned_long",0}, { "_long","_signed_long",0}, + { "_class_wxObject","_class_wxStyledTextEvent",SwigwxStyledTextEventTowxObject}, + { "_class_wxObject","_wxStyledTextEvent",SwigwxStyledTextEventTowxObject}, + { "_class_wxObject","_class_wxStyledTextCtrl",SwigwxStyledTextCtrlTowxObject}, + { "_class_wxObject","_wxStyledTextCtrl",SwigwxStyledTextCtrlTowxObject}, { "_size_t","_wxCoord",0}, { "_size_t","_wxPrintQuality",0}, { "_size_t","_time_t",0}, @@ -10148,6 +10155,9 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_uint","_int",0}, { "_uint","_wxWindowID",0}, { "_wxChar","_char",0}, + { "_class_wxEvent","_class_wxStyledTextEvent",SwigwxStyledTextEventTowxEvent}, + { "_class_wxEvent","_wxStyledTextEvent",SwigwxStyledTextEventTowxEvent}, + { "_wxCommandEvent","_class_wxStyledTextEvent",SwigwxStyledTextEventTowxCommandEvent}, { "_wxCommandEvent","_wxStyledTextEvent",SwigwxStyledTextEventTowxCommandEvent}, { "_char","_wxChar",0}, { "_struct_wxNativeFontInfo","_wxNativeFontInfo",0}, @@ -10170,11 +10180,16 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_unsigned_short","_wxDateTime_t",0}, { "_unsigned_short","_WXTYPE",0}, { "_unsigned_short","_short",0}, + { "_class_wxWindow","_class_wxStyledTextCtrl",SwigwxStyledTextCtrlTowxWindow}, + { "_class_wxWindow","_wxStyledTextCtrl",SwigwxStyledTextCtrlTowxWindow}, + { "_wxObject","_class_wxStyledTextEvent",SwigwxStyledTextEventTowxObject}, { "_wxObject","_wxStyledTextEvent",SwigwxStyledTextEventTowxObject}, + { "_wxObject","_class_wxStyledTextCtrl",SwigwxStyledTextCtrlTowxObject}, { "_wxObject","_wxStyledTextCtrl",SwigwxStyledTextCtrlTowxObject}, { "_signed_short","_WXTYPE",0}, { "_signed_short","_short",0}, { "_unsigned_char","_byte",0}, + { "_wxControl","_class_wxStyledTextCtrl",SwigwxStyledTextCtrlTowxControl}, { "_wxControl","_wxStyledTextCtrl",SwigwxStyledTextCtrlTowxControl}, { "_unsigned_int","_wxCoord",0}, { "_unsigned_int","_wxPrintQuality",0}, @@ -10215,6 +10230,8 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_time_t","_wxWindowID",0}, { "_time_t","_uint",0}, { "_time_t","_size_t",0}, + { "_class_wxControl","_class_wxStyledTextCtrl",SwigwxStyledTextCtrlTowxControl}, + { "_class_wxControl","_wxStyledTextCtrl",SwigwxStyledTextCtrlTowxControl}, { "_wxCoord","_int",0}, { "_wxCoord","_signed_int",0}, { "_wxCoord","_unsigned_int",0}, @@ -10224,7 +10241,11 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_wxCoord","_size_t",0}, { "_wxCoord","_time_t",0}, { "_wxCoord","_wxPrintQuality",0}, + { "_class_wxCommandEvent","_class_wxStyledTextEvent",SwigwxStyledTextEventTowxCommandEvent}, + { "_class_wxCommandEvent","_wxStyledTextEvent",SwigwxStyledTextEventTowxCommandEvent}, + { "_wxEvtHandler","_class_wxStyledTextCtrl",SwigwxStyledTextCtrlTowxEvtHandler}, { "_wxEvtHandler","_wxStyledTextCtrl",SwigwxStyledTextCtrlTowxEvtHandler}, + { "_wxWindow","_class_wxStyledTextCtrl",SwigwxStyledTextCtrlTowxWindow}, { "_wxWindow","_wxStyledTextCtrl",SwigwxStyledTextCtrlTowxWindow}, {0,0,0}}; diff --git a/wxPython/contrib/xrc/xrc.cpp b/wxPython/contrib/xrc/xrc.cpp index 08f29cf8d3..fe59e6ea96 100644 --- a/wxPython/contrib/xrc/xrc.cpp +++ b/wxPython/contrib/xrc/xrc.cpp @@ -1167,6 +1167,8 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_byte","_unsigned_char",0}, { "_long","_unsigned_long",0}, { "_long","_signed_long",0}, + { "_class_wxObject","_class_wxXmlResource",SwigwxXmlResourceTowxObject}, + { "_class_wxObject","_wxXmlResource",SwigwxXmlResourceTowxObject}, { "_size_t","_wxCoord",0}, { "_size_t","_wxPrintQuality",0}, { "_size_t","_time_t",0}, @@ -1203,6 +1205,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_unsigned_short","_wxDateTime_t",0}, { "_unsigned_short","_WXTYPE",0}, { "_unsigned_short","_short",0}, + { "_wxObject","_class_wxXmlResource",SwigwxXmlResourceTowxObject}, { "_wxObject","_wxXmlResource",SwigwxXmlResourceTowxObject}, { "_signed_short","_WXTYPE",0}, { "_signed_short","_short",0}, diff --git a/wxPython/demo/Main.py b/wxPython/demo/Main.py index edcd378ee6..aa32a418d0 100644 --- a/wxPython/demo/Main.py +++ b/wxPython/demo/Main.py @@ -195,7 +195,6 @@ class wxPythonDemo(wxFrame): else: # hopefully I can remove this hacky code soon, see bug #216861 panel = wxPanel(self.nb, -1, style=wxCLIP_CHILDREN) self.ovr = wxHtmlWindow(panel, -1, size=(400, 400)) - self.ovr.SetFonts("", "", [7, 8, 10, 12, 16, 22, 30]) self.nb.AddPage(panel, "Overview") def OnOvrSize(evt, ovr=self.ovr): diff --git a/wxPython/src/gtk/calendar.cpp b/wxPython/src/gtk/calendar.cpp index a2d1aa8960..837e84d2bb 100644 --- a/wxPython/src/gtk/calendar.cpp +++ b/wxPython/src/gtk/calendar.cpp @@ -901,7 +901,7 @@ static PyObject *_wrap_new_wxCalendarCtrl(PyObject *self, PyObject *args, PyObje wxDateTime * _arg2 = (wxDateTime *) &wxDefaultDateTime; wxPoint * _arg3 = (wxPoint *) &wxDefaultPosition; wxSize * _arg4 = (wxSize *) &wxDefaultSize; - long _arg5 = (long ) (wxCAL_SHOW_HOLIDAYS); + long _arg5 = (long ) (wxCAL_SHOW_HOLIDAYS)|wxWANTS_CHARS; char * _arg6 = (char *) "calendar"; PyObject * _argo0 = 0; PyObject * _argo2 = 0; @@ -993,7 +993,7 @@ static PyObject *_wrap_wxCalendarCtrl_Create(PyObject *self, PyObject *args, PyO wxDateTime * _arg3 = (wxDateTime *) &wxDefaultDateTime; wxPoint * _arg4 = (wxPoint *) &wxDefaultPosition; wxSize * _arg5 = (wxSize *) &wxDefaultSize; - long _arg6 = (long ) (wxCAL_SHOW_HOLIDAYS); + long _arg6 = (long ) (wxCAL_SHOW_HOLIDAYS)|wxWANTS_CHARS; char * _arg7 = (char *) "calendar"; PyObject * _argo0 = 0; PyObject * _argo1 = 0; @@ -1845,12 +1845,14 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_wxCommandEvent","_class_wxCalendarEvent",SwigwxCalendarEventTowxCommandEvent}, { "_wxCommandEvent","_wxCalendarEvent",SwigwxCalendarEventTowxCommandEvent}, { "_char","_wxChar",0}, + { "_struct_wxNativeFontInfo","_wxNativeFontInfo",0}, { "_EBool","_wxCoord",0}, { "_EBool","_wxPrintQuality",0}, { "_EBool","_signed_int",0}, { "_EBool","_int",0}, { "_EBool","_wxWindowID",0}, { "_unsigned_long","_long",0}, + { "_wxNativeFontInfo","_struct_wxNativeFontInfo",0}, { "_signed_int","_wxCoord",0}, { "_signed_int","_wxPrintQuality",0}, { "_signed_int","_EBool",0}, diff --git a/wxPython/src/gtk/cmndlgs.cpp b/wxPython/src/gtk/cmndlgs.cpp index 5aacee4060..c76b75813c 100644 --- a/wxPython/src/gtk/cmndlgs.cpp +++ b/wxPython/src/gtk/cmndlgs.cpp @@ -357,11 +357,11 @@ static void *SwigwxColourDialogTowxDialog(void *ptr) { return (void *) dest; } -static void *SwigwxColourDialogTowxPanel(void *ptr) { +static void *SwigwxColourDialogTowxTopLevelWindow(void *ptr) { wxColourDialog *src; - wxPanel *dest; + wxTopLevelWindow *dest; src = (wxColourDialog *) ptr; - dest = (wxPanel *) src; + dest = (wxTopLevelWindow *) src; return (void *) dest; } @@ -505,11 +505,11 @@ static void *SwigwxDirDialogTowxDialog(void *ptr) { return (void *) dest; } -static void *SwigwxDirDialogTowxPanel(void *ptr) { +static void *SwigwxDirDialogTowxTopLevelWindow(void *ptr) { wxDirDialog *src; - wxPanel *dest; + wxTopLevelWindow *dest; src = (wxDirDialog *) ptr; - dest = (wxPanel *) src; + dest = (wxTopLevelWindow *) src; return (void *) dest; } @@ -818,11 +818,11 @@ static void *SwigwxFileDialogTowxDialog(void *ptr) { return (void *) dest; } -static void *SwigwxFileDialogTowxPanel(void *ptr) { +static void *SwigwxFileDialogTowxTopLevelWindow(void *ptr) { wxFileDialog *src; - wxPanel *dest; + wxTopLevelWindow *dest; src = (wxFileDialog *) ptr; - dest = (wxPanel *) src; + dest = (wxTopLevelWindow *) src; return (void *) dest; } @@ -1554,11 +1554,11 @@ static void *SwigwxSingleChoiceDialogTowxDialog(void *ptr) { return (void *) dest; } -static void *SwigwxSingleChoiceDialogTowxPanel(void *ptr) { +static void *SwigwxSingleChoiceDialogTowxTopLevelWindow(void *ptr) { wxSingleChoiceDialog *src; - wxPanel *dest; + wxTopLevelWindow *dest; src = (wxSingleChoiceDialog *) ptr; - dest = (wxPanel *) src; + dest = (wxTopLevelWindow *) src; return (void *) dest; } @@ -1830,11 +1830,11 @@ static void *SwigwxTextEntryDialogTowxDialog(void *ptr) { return (void *) dest; } -static void *SwigwxTextEntryDialogTowxPanel(void *ptr) { +static void *SwigwxTextEntryDialogTowxTopLevelWindow(void *ptr) { wxTextEntryDialog *src; - wxPanel *dest; + wxTopLevelWindow *dest; src = (wxTextEntryDialog *) ptr; - dest = (wxPanel *) src; + dest = (wxTopLevelWindow *) src; return (void *) dest; } @@ -2500,11 +2500,11 @@ static void *SwigwxFontDialogTowxDialog(void *ptr) { return (void *) dest; } -static void *SwigwxFontDialogTowxPanel(void *ptr) { +static void *SwigwxFontDialogTowxTopLevelWindow(void *ptr) { wxFontDialog *src; - wxPanel *dest; + wxTopLevelWindow *dest; src = (wxFontDialog *) ptr; - dest = (wxPanel *) src; + dest = (wxTopLevelWindow *) src; return (void *) dest; } @@ -2648,11 +2648,11 @@ static void *SwigwxMessageDialogTowxDialog(void *ptr) { return (void *) dest; } -static void *SwigwxMessageDialogTowxPanel(void *ptr) { +static void *SwigwxMessageDialogTowxTopLevelWindow(void *ptr) { wxMessageDialog *src; - wxPanel *dest; + wxTopLevelWindow *dest; src = (wxMessageDialog *) ptr; - dest = (wxPanel *) src; + dest = (wxTopLevelWindow *) src; return (void *) dest; } @@ -2763,6 +2763,14 @@ static void *SwigwxProgressDialogTowxFrame(void *ptr) { return (void *) dest; } +static void *SwigwxProgressDialogTowxTopLevelWindow(void *ptr) { + wxProgressDialog *src; + wxTopLevelWindow *dest; + src = (wxProgressDialog *) ptr; + dest = (wxTopLevelWindow *) src; + return (void *) dest; +} + static void *SwigwxProgressDialogTowxWindow(void *ptr) { wxProgressDialog *src; wxWindow *dest; @@ -3064,20 +3072,22 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_size_t","_int",0}, { "_size_t","_wxWindowID",0}, { "_size_t","_uint",0}, - { "_wxPanel","_class_wxMessageDialog",SwigwxMessageDialogTowxPanel}, - { "_wxPanel","_wxMessageDialog",SwigwxMessageDialogTowxPanel}, - { "_wxPanel","_class_wxFontDialog",SwigwxFontDialogTowxPanel}, - { "_wxPanel","_wxFontDialog",SwigwxFontDialogTowxPanel}, - { "_wxPanel","_class_wxTextEntryDialog",SwigwxTextEntryDialogTowxPanel}, - { "_wxPanel","_wxTextEntryDialog",SwigwxTextEntryDialogTowxPanel}, - { "_wxPanel","_class_wxSingleChoiceDialog",SwigwxSingleChoiceDialogTowxPanel}, - { "_wxPanel","_wxSingleChoiceDialog",SwigwxSingleChoiceDialogTowxPanel}, - { "_wxPanel","_class_wxFileDialog",SwigwxFileDialogTowxPanel}, - { "_wxPanel","_wxFileDialog",SwigwxFileDialogTowxPanel}, - { "_wxPanel","_class_wxDirDialog",SwigwxDirDialogTowxPanel}, - { "_wxPanel","_wxDirDialog",SwigwxDirDialogTowxPanel}, - { "_wxPanel","_class_wxColourDialog",SwigwxColourDialogTowxPanel}, - { "_wxPanel","_wxColourDialog",SwigwxColourDialogTowxPanel}, + { "_wxTopLevelWindow","_class_wxProgressDialog",SwigwxProgressDialogTowxTopLevelWindow}, + { "_wxTopLevelWindow","_wxProgressDialog",SwigwxProgressDialogTowxTopLevelWindow}, + { "_wxTopLevelWindow","_class_wxMessageDialog",SwigwxMessageDialogTowxTopLevelWindow}, + { "_wxTopLevelWindow","_wxMessageDialog",SwigwxMessageDialogTowxTopLevelWindow}, + { "_wxTopLevelWindow","_class_wxFontDialog",SwigwxFontDialogTowxTopLevelWindow}, + { "_wxTopLevelWindow","_wxFontDialog",SwigwxFontDialogTowxTopLevelWindow}, + { "_wxTopLevelWindow","_class_wxTextEntryDialog",SwigwxTextEntryDialogTowxTopLevelWindow}, + { "_wxTopLevelWindow","_wxTextEntryDialog",SwigwxTextEntryDialogTowxTopLevelWindow}, + { "_wxTopLevelWindow","_class_wxSingleChoiceDialog",SwigwxSingleChoiceDialogTowxTopLevelWindow}, + { "_wxTopLevelWindow","_wxSingleChoiceDialog",SwigwxSingleChoiceDialogTowxTopLevelWindow}, + { "_wxTopLevelWindow","_class_wxFileDialog",SwigwxFileDialogTowxTopLevelWindow}, + { "_wxTopLevelWindow","_wxFileDialog",SwigwxFileDialogTowxTopLevelWindow}, + { "_wxTopLevelWindow","_class_wxDirDialog",SwigwxDirDialogTowxTopLevelWindow}, + { "_wxTopLevelWindow","_wxDirDialog",SwigwxDirDialogTowxTopLevelWindow}, + { "_wxTopLevelWindow","_class_wxColourDialog",SwigwxColourDialogTowxTopLevelWindow}, + { "_wxTopLevelWindow","_wxColourDialog",SwigwxColourDialogTowxTopLevelWindow}, { "_class_wxDialog","_class_wxMessageDialog",SwigwxMessageDialogTowxDialog}, { "_class_wxDialog","_wxMessageDialog",SwigwxMessageDialogTowxDialog}, { "_class_wxDialog","_class_wxFontDialog",SwigwxFontDialogTowxDialog}, @@ -3101,31 +3111,35 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_uint","_wxWindowID",0}, { "_wxChar","_char",0}, { "_char","_wxChar",0}, + { "_struct_wxNativeFontInfo","_wxNativeFontInfo",0}, { "_EBool","_wxCoord",0}, { "_EBool","_wxPrintQuality",0}, { "_EBool","_signed_int",0}, { "_EBool","_int",0}, { "_EBool","_wxWindowID",0}, { "_unsigned_long","_long",0}, - { "_class_wxPanel","_class_wxMessageDialog",SwigwxMessageDialogTowxPanel}, - { "_class_wxPanel","_wxMessageDialog",SwigwxMessageDialogTowxPanel}, - { "_class_wxPanel","_class_wxFontDialog",SwigwxFontDialogTowxPanel}, - { "_class_wxPanel","_wxFontDialog",SwigwxFontDialogTowxPanel}, - { "_class_wxPanel","_class_wxTextEntryDialog",SwigwxTextEntryDialogTowxPanel}, - { "_class_wxPanel","_wxTextEntryDialog",SwigwxTextEntryDialogTowxPanel}, - { "_class_wxPanel","_class_wxSingleChoiceDialog",SwigwxSingleChoiceDialogTowxPanel}, - { "_class_wxPanel","_wxSingleChoiceDialog",SwigwxSingleChoiceDialogTowxPanel}, - { "_class_wxPanel","_class_wxFileDialog",SwigwxFileDialogTowxPanel}, - { "_class_wxPanel","_wxFileDialog",SwigwxFileDialogTowxPanel}, - { "_class_wxPanel","_class_wxDirDialog",SwigwxDirDialogTowxPanel}, - { "_class_wxPanel","_wxDirDialog",SwigwxDirDialogTowxPanel}, - { "_class_wxPanel","_class_wxColourDialog",SwigwxColourDialogTowxPanel}, - { "_class_wxPanel","_wxColourDialog",SwigwxColourDialogTowxPanel}, + { "_wxNativeFontInfo","_struct_wxNativeFontInfo",0}, { "_signed_int","_wxCoord",0}, { "_signed_int","_wxPrintQuality",0}, { "_signed_int","_EBool",0}, { "_signed_int","_wxWindowID",0}, { "_signed_int","_int",0}, + { "_class_wxTopLevelWindow","_class_wxProgressDialog",SwigwxProgressDialogTowxTopLevelWindow}, + { "_class_wxTopLevelWindow","_wxProgressDialog",SwigwxProgressDialogTowxTopLevelWindow}, + { "_class_wxTopLevelWindow","_class_wxMessageDialog",SwigwxMessageDialogTowxTopLevelWindow}, + { "_class_wxTopLevelWindow","_wxMessageDialog",SwigwxMessageDialogTowxTopLevelWindow}, + { "_class_wxTopLevelWindow","_class_wxFontDialog",SwigwxFontDialogTowxTopLevelWindow}, + { "_class_wxTopLevelWindow","_wxFontDialog",SwigwxFontDialogTowxTopLevelWindow}, + { "_class_wxTopLevelWindow","_class_wxTextEntryDialog",SwigwxTextEntryDialogTowxTopLevelWindow}, + { "_class_wxTopLevelWindow","_wxTextEntryDialog",SwigwxTextEntryDialogTowxTopLevelWindow}, + { "_class_wxTopLevelWindow","_class_wxSingleChoiceDialog",SwigwxSingleChoiceDialogTowxTopLevelWindow}, + { "_class_wxTopLevelWindow","_wxSingleChoiceDialog",SwigwxSingleChoiceDialogTowxTopLevelWindow}, + { "_class_wxTopLevelWindow","_class_wxFileDialog",SwigwxFileDialogTowxTopLevelWindow}, + { "_class_wxTopLevelWindow","_wxFileDialog",SwigwxFileDialogTowxTopLevelWindow}, + { "_class_wxTopLevelWindow","_class_wxDirDialog",SwigwxDirDialogTowxTopLevelWindow}, + { "_class_wxTopLevelWindow","_wxDirDialog",SwigwxDirDialogTowxTopLevelWindow}, + { "_class_wxTopLevelWindow","_class_wxColourDialog",SwigwxColourDialogTowxTopLevelWindow}, + { "_class_wxTopLevelWindow","_wxColourDialog",SwigwxColourDialogTowxTopLevelWindow}, { "_WXTYPE","_short",0}, { "_WXTYPE","_signed_short",0}, { "_WXTYPE","_unsigned_short",0}, diff --git a/wxPython/src/gtk/filesys.cpp b/wxPython/src/gtk/filesys.cpp index 75c9884867..9b9e4def3d 100644 --- a/wxPython/src/gtk/filesys.cpp +++ b/wxPython/src/gtk/filesys.cpp @@ -2229,12 +2229,14 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_uint","_wxWindowID",0}, { "_wxChar","_char",0}, { "_char","_wxChar",0}, + { "_struct_wxNativeFontInfo","_wxNativeFontInfo",0}, { "_EBool","_wxCoord",0}, { "_EBool","_wxPrintQuality",0}, { "_EBool","_signed_int",0}, { "_EBool","_int",0}, { "_EBool","_wxWindowID",0}, { "_unsigned_long","_long",0}, + { "_wxNativeFontInfo","_struct_wxNativeFontInfo",0}, { "_signed_int","_wxCoord",0}, { "_signed_int","_wxPrintQuality",0}, { "_signed_int","_EBool",0}, diff --git a/wxPython/src/gtk/help.cpp b/wxPython/src/gtk/help.cpp index 17141bf5c4..3ff2894dee 100644 --- a/wxPython/src/gtk/help.cpp +++ b/wxPython/src/gtk/help.cpp @@ -1171,12 +1171,14 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_char","_wxChar",0}, { "_wxHelpProvider","_class_wxSimpleHelpProvider",SwigwxSimpleHelpProviderTowxHelpProvider}, { "_wxHelpProvider","_wxSimpleHelpProvider",SwigwxSimpleHelpProviderTowxHelpProvider}, + { "_struct_wxNativeFontInfo","_wxNativeFontInfo",0}, { "_EBool","_wxCoord",0}, { "_EBool","_wxPrintQuality",0}, { "_EBool","_signed_int",0}, { "_EBool","_int",0}, { "_EBool","_wxWindowID",0}, { "_unsigned_long","_long",0}, + { "_wxNativeFontInfo","_struct_wxNativeFontInfo",0}, { "_signed_int","_wxCoord",0}, { "_signed_int","_wxPrintQuality",0}, { "_signed_int","_EBool",0}, diff --git a/wxPython/src/gtk/htmlhelp.cpp b/wxPython/src/gtk/htmlhelp.cpp index 960d4a74ad..372b9744ae 100644 --- a/wxPython/src/gtk/htmlhelp.cpp +++ b/wxPython/src/gtk/htmlhelp.cpp @@ -1261,6 +1261,14 @@ static void *SwigwxHtmlHelpFrameTowxFrame(void *ptr) { return (void *) dest; } +static void *SwigwxHtmlHelpFrameTowxTopLevelWindow(void *ptr) { + wxHtmlHelpFrame *src; + wxTopLevelWindow *dest; + src = (wxHtmlHelpFrame *) ptr; + dest = (wxTopLevelWindow *) src; + return (void *) dest; +} + static void *SwigwxHtmlHelpFrameTowxWindow(void *ptr) { wxHtmlHelpFrame *src; wxWindow *dest; @@ -2528,6 +2536,8 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_size_t","_int",0}, { "_size_t","_wxWindowID",0}, { "_size_t","_uint",0}, + { "_wxTopLevelWindow","_class_wxHtmlHelpFrame",SwigwxHtmlHelpFrameTowxTopLevelWindow}, + { "_wxTopLevelWindow","_wxHtmlHelpFrame",SwigwxHtmlHelpFrameTowxTopLevelWindow}, { "_uint","_wxCoord",0}, { "_uint","_wxPrintQuality",0}, { "_uint","_time_t",0}, @@ -2537,17 +2547,21 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_uint","_wxWindowID",0}, { "_wxChar","_char",0}, { "_char","_wxChar",0}, + { "_struct_wxNativeFontInfo","_wxNativeFontInfo",0}, { "_EBool","_wxCoord",0}, { "_EBool","_wxPrintQuality",0}, { "_EBool","_signed_int",0}, { "_EBool","_int",0}, { "_EBool","_wxWindowID",0}, { "_unsigned_long","_long",0}, + { "_wxNativeFontInfo","_struct_wxNativeFontInfo",0}, { "_signed_int","_wxCoord",0}, { "_signed_int","_wxPrintQuality",0}, { "_signed_int","_EBool",0}, { "_signed_int","_wxWindowID",0}, { "_signed_int","_int",0}, + { "_class_wxTopLevelWindow","_class_wxHtmlHelpFrame",SwigwxHtmlHelpFrameTowxTopLevelWindow}, + { "_class_wxTopLevelWindow","_wxHtmlHelpFrame",SwigwxHtmlHelpFrameTowxTopLevelWindow}, { "_WXTYPE","_wxDateTime_t",0}, { "_WXTYPE","_short",0}, { "_WXTYPE","_signed_short",0}, diff --git a/wxPython/src/gtk/image.cpp b/wxPython/src/gtk/image.cpp index 0f91fae2a8..c0d209fadb 100644 --- a/wxPython/src/gtk/image.cpp +++ b/wxPython/src/gtk/image.cpp @@ -2485,12 +2485,14 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_uint","_wxWindowID",0}, { "_wxChar","_char",0}, { "_char","_wxChar",0}, + { "_struct_wxNativeFontInfo","_wxNativeFontInfo",0}, { "_EBool","_wxCoord",0}, { "_EBool","_wxPrintQuality",0}, { "_EBool","_signed_int",0}, { "_EBool","_int",0}, { "_EBool","_wxWindowID",0}, { "_unsigned_long","_long",0}, + { "_wxNativeFontInfo","_struct_wxNativeFontInfo",0}, { "_signed_int","_wxCoord",0}, { "_signed_int","_wxPrintQuality",0}, { "_signed_int","_EBool",0}, diff --git a/wxPython/src/gtk/mdi.cpp b/wxPython/src/gtk/mdi.cpp index af70097457..f34e58c452 100644 --- a/wxPython/src/gtk/mdi.cpp +++ b/wxPython/src/gtk/mdi.cpp @@ -100,6 +100,14 @@ static void *SwigwxMDIParentFrameTowxFrame(void *ptr) { return (void *) dest; } +static void *SwigwxMDIParentFrameTowxTopLevelWindow(void *ptr) { + wxMDIParentFrame *src; + wxTopLevelWindow *dest; + src = (wxMDIParentFrame *) ptr; + dest = (wxTopLevelWindow *) src; + return (void *) dest; +} + static void *SwigwxMDIParentFrameTowxWindow(void *ptr) { wxMDIParentFrame *src; wxWindow *dest; @@ -544,6 +552,14 @@ static void *SwigwxMDIChildFrameTowxFrame(void *ptr) { return (void *) dest; } +static void *SwigwxMDIChildFrameTowxTopLevelWindow(void *ptr) { + wxMDIChildFrame *src; + wxTopLevelWindow *dest; + src = (wxMDIChildFrame *) ptr; + dest = (wxTopLevelWindow *) src; + return (void *) dest; +} + static void *SwigwxMDIChildFrameTowxWindow(void *ptr) { wxMDIChildFrame *src; wxWindow *dest; @@ -1029,6 +1045,10 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_size_t","_int",0}, { "_size_t","_wxWindowID",0}, { "_size_t","_uint",0}, + { "_wxTopLevelWindow","_class_wxMDIChildFrame",SwigwxMDIChildFrameTowxTopLevelWindow}, + { "_wxTopLevelWindow","_wxMDIChildFrame",SwigwxMDIChildFrameTowxTopLevelWindow}, + { "_wxTopLevelWindow","_class_wxMDIParentFrame",SwigwxMDIParentFrameTowxTopLevelWindow}, + { "_wxTopLevelWindow","_wxMDIParentFrame",SwigwxMDIParentFrameTowxTopLevelWindow}, { "_uint","_wxCoord",0}, { "_uint","_wxPrintQuality",0}, { "_uint","_time_t",0}, @@ -1038,17 +1058,23 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_uint","_wxWindowID",0}, { "_wxChar","_char",0}, { "_char","_wxChar",0}, + { "_struct_wxNativeFontInfo","_wxNativeFontInfo",0}, { "_EBool","_wxCoord",0}, { "_EBool","_wxPrintQuality",0}, { "_EBool","_signed_int",0}, { "_EBool","_int",0}, { "_EBool","_wxWindowID",0}, { "_unsigned_long","_long",0}, + { "_wxNativeFontInfo","_struct_wxNativeFontInfo",0}, { "_signed_int","_wxCoord",0}, { "_signed_int","_wxPrintQuality",0}, { "_signed_int","_EBool",0}, { "_signed_int","_wxWindowID",0}, { "_signed_int","_int",0}, + { "_class_wxTopLevelWindow","_class_wxMDIChildFrame",SwigwxMDIChildFrameTowxTopLevelWindow}, + { "_class_wxTopLevelWindow","_wxMDIChildFrame",SwigwxMDIChildFrameTowxTopLevelWindow}, + { "_class_wxTopLevelWindow","_class_wxMDIParentFrame",SwigwxMDIParentFrameTowxTopLevelWindow}, + { "_class_wxTopLevelWindow","_wxMDIParentFrame",SwigwxMDIParentFrameTowxTopLevelWindow}, { "_WXTYPE","_short",0}, { "_WXTYPE","_signed_short",0}, { "_WXTYPE","_unsigned_short",0}, diff --git a/wxPython/src/gtk/printfw.cpp b/wxPython/src/gtk/printfw.cpp index 8d1240b77c..59bf2bf229 100644 --- a/wxPython/src/gtk/printfw.cpp +++ b/wxPython/src/gtk/printfw.cpp @@ -2488,11 +2488,11 @@ static void *SwigwxPageSetupDialogTowxDialog(void *ptr) { return (void *) dest; } -static void *SwigwxPageSetupDialogTowxPanel(void *ptr) { +static void *SwigwxPageSetupDialogTowxTopLevelWindow(void *ptr) { wxPageSetupDialog *src; - wxPanel *dest; + wxTopLevelWindow *dest; src = (wxPageSetupDialog *) ptr; - dest = (wxPanel *) src; + dest = (wxTopLevelWindow *) src; return (void *) dest; } @@ -3358,11 +3358,11 @@ static void *SwigwxPrintDialogTowxDialog(void *ptr) { return (void *) dest; } -static void *SwigwxPrintDialogTowxPanel(void *ptr) { +static void *SwigwxPrintDialogTowxTopLevelWindow(void *ptr) { wxPrintDialog *src; - wxPanel *dest; + wxTopLevelWindow *dest; src = (wxPrintDialog *) ptr; - dest = (wxPanel *) src; + dest = (wxTopLevelWindow *) src; return (void *) dest; } @@ -4992,6 +4992,14 @@ static void *SwigwxPreviewFrameTowxFrame(void *ptr) { return (void *) dest; } +static void *SwigwxPreviewFrameTowxTopLevelWindow(void *ptr) { + wxPreviewFrame *src; + wxTopLevelWindow *dest; + src = (wxPreviewFrame *) ptr; + dest = (wxTopLevelWindow *) src; + return (void *) dest; +} + static void *SwigwxPreviewFrameTowxWindow(void *ptr) { wxPreviewFrame *src; wxWindow *dest; @@ -5332,10 +5340,12 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_size_t","_int",0}, { "_size_t","_wxWindowID",0}, { "_size_t","_uint",0}, - { "_wxPanel","_class_wxPrintDialog",SwigwxPrintDialogTowxPanel}, - { "_wxPanel","_wxPrintDialog",SwigwxPrintDialogTowxPanel}, - { "_wxPanel","_class_wxPageSetupDialog",SwigwxPageSetupDialogTowxPanel}, - { "_wxPanel","_wxPageSetupDialog",SwigwxPageSetupDialogTowxPanel}, + { "_wxTopLevelWindow","_class_wxPreviewFrame",SwigwxPreviewFrameTowxTopLevelWindow}, + { "_wxTopLevelWindow","_wxPreviewFrame",SwigwxPreviewFrameTowxTopLevelWindow}, + { "_wxTopLevelWindow","_class_wxPrintDialog",SwigwxPrintDialogTowxTopLevelWindow}, + { "_wxTopLevelWindow","_wxPrintDialog",SwigwxPrintDialogTowxTopLevelWindow}, + { "_wxTopLevelWindow","_class_wxPageSetupDialog",SwigwxPageSetupDialogTowxTopLevelWindow}, + { "_wxTopLevelWindow","_wxPageSetupDialog",SwigwxPageSetupDialogTowxTopLevelWindow}, { "_class_wxDialog","_class_wxPrintDialog",SwigwxPrintDialogTowxDialog}, { "_class_wxDialog","_wxPrintDialog",SwigwxPrintDialogTowxDialog}, { "_class_wxDialog","_class_wxPageSetupDialog",SwigwxPageSetupDialogTowxDialog}, @@ -5357,15 +5367,17 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_EBool","_wxWindowID",0}, { "_unsigned_long","_long",0}, { "_wxNativeFontInfo","_struct_wxNativeFontInfo",0}, - { "_class_wxPanel","_class_wxPrintDialog",SwigwxPrintDialogTowxPanel}, - { "_class_wxPanel","_wxPrintDialog",SwigwxPrintDialogTowxPanel}, - { "_class_wxPanel","_class_wxPageSetupDialog",SwigwxPageSetupDialogTowxPanel}, - { "_class_wxPanel","_wxPageSetupDialog",SwigwxPageSetupDialogTowxPanel}, { "_signed_int","_wxCoord",0}, { "_signed_int","_wxPrintQuality",0}, { "_signed_int","_EBool",0}, { "_signed_int","_wxWindowID",0}, { "_signed_int","_int",0}, + { "_class_wxTopLevelWindow","_class_wxPreviewFrame",SwigwxPreviewFrameTowxTopLevelWindow}, + { "_class_wxTopLevelWindow","_wxPreviewFrame",SwigwxPreviewFrameTowxTopLevelWindow}, + { "_class_wxTopLevelWindow","_class_wxPrintDialog",SwigwxPrintDialogTowxTopLevelWindow}, + { "_class_wxTopLevelWindow","_wxPrintDialog",SwigwxPrintDialogTowxTopLevelWindow}, + { "_class_wxTopLevelWindow","_class_wxPageSetupDialog",SwigwxPageSetupDialogTowxTopLevelWindow}, + { "_class_wxTopLevelWindow","_wxPageSetupDialog",SwigwxPageSetupDialogTowxTopLevelWindow}, { "_WXTYPE","_short",0}, { "_WXTYPE","_signed_short",0}, { "_WXTYPE","_unsigned_short",0}, diff --git a/wxPython/src/gtk/sizers.cpp b/wxPython/src/gtk/sizers.cpp index 462a15f2ad..c50cbc2989 100644 --- a/wxPython/src/gtk/sizers.cpp +++ b/wxPython/src/gtk/sizers.cpp @@ -3005,12 +3005,14 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_wxBoxSizer","_class_wxStaticBoxSizer",SwigwxStaticBoxSizerTowxBoxSizer}, { "_wxBoxSizer","_wxStaticBoxSizer",SwigwxStaticBoxSizerTowxBoxSizer}, { "_char","_wxChar",0}, + { "_struct_wxNativeFontInfo","_wxNativeFontInfo",0}, { "_EBool","_wxCoord",0}, { "_EBool","_wxPrintQuality",0}, { "_EBool","_signed_int",0}, { "_EBool","_int",0}, { "_EBool","_wxWindowID",0}, { "_unsigned_long","_long",0}, + { "_wxNativeFontInfo","_struct_wxNativeFontInfo",0}, { "_signed_int","_wxCoord",0}, { "_signed_int","_wxPrintQuality",0}, { "_signed_int","_EBool",0}, diff --git a/wxPython/src/gtk/stattool.cpp b/wxPython/src/gtk/stattool.cpp index 01bd1654f9..cfc6f690f4 100644 --- a/wxPython/src/gtk/stattool.cpp +++ b/wxPython/src/gtk/stattool.cpp @@ -3595,12 +3595,14 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_uint","_wxWindowID",0}, { "_wxChar","_char",0}, { "_char","_wxChar",0}, + { "_struct_wxNativeFontInfo","_wxNativeFontInfo",0}, { "_EBool","_wxCoord",0}, { "_EBool","_wxPrintQuality",0}, { "_EBool","_signed_int",0}, { "_EBool","_int",0}, { "_EBool","_wxWindowID",0}, { "_unsigned_long","_long",0}, + { "_wxNativeFontInfo","_struct_wxNativeFontInfo",0}, { "_signed_int","_wxCoord",0}, { "_signed_int","_wxPrintQuality",0}, { "_signed_int","_EBool",0}, diff --git a/wxPython/src/gtk/windows.cpp b/wxPython/src/gtk/windows.cpp index 441f6121a6..9c8bd1639e 100644 --- a/wxPython/src/gtk/windows.cpp +++ b/wxPython/src/gtk/windows.cpp @@ -3642,43 +3642,6 @@ static PyObject *_wrap_wxWindow_ScrollWindow(PyObject *self, PyObject *args, PyO return _resultobj; } -#define wxWindow_SetAcceleratorTable(_swigobj,_swigarg0) (_swigobj->SetAcceleratorTable(_swigarg0)) -static PyObject *_wrap_wxWindow_SetAcceleratorTable(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject * _resultobj; - wxWindow * _arg0; - wxAcceleratorTable * _arg1; - PyObject * _argo0 = 0; - PyObject * _argo1 = 0; - char *_kwnames[] = { "self","accel", NULL }; - - self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxWindow_SetAcceleratorTable",_kwnames,&_argo0,&_argo1)) - return NULL; - if (_argo0) { - if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_SetAcceleratorTable. Expected _wxWindow_p."); - return NULL; - } - } - if (_argo1) { - if (_argo1 == Py_None) { _arg1 = NULL; } - else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxAcceleratorTable_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxWindow_SetAcceleratorTable. Expected _wxAcceleratorTable_p."); - return NULL; - } - } -{ - wxPy_BEGIN_ALLOW_THREADS; - wxWindow_SetAcceleratorTable(_arg0,*_arg1); - - wxPy_END_ALLOW_THREADS; - if (PyErr_Occurred()) return NULL; -} Py_INCREF(Py_None); - _resultobj = Py_None; - return _resultobj; -} - #define wxWindow_SetAutoLayout(_swigobj,_swigarg0) (_swigobj->SetAutoLayout(_swigarg0)) static PyObject *_wrap_wxWindow_SetAutoLayout(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; @@ -5658,6 +5621,43 @@ static PyObject *_wrap_wxWindow_PrevControlId(PyObject *self, PyObject *args, Py return _resultobj; } +#define wxWindow_SetAcceleratorTable(_swigobj,_swigarg0) (_swigobj->SetAcceleratorTable(_swigarg0)) +static PyObject *_wrap_wxWindow_SetAcceleratorTable(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxWindow * _arg0; + wxAcceleratorTable * _arg1; + PyObject * _argo0 = 0; + PyObject * _argo1 = 0; + char *_kwnames[] = { "self","accel", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxWindow_SetAcceleratorTable",_kwnames,&_argo0,&_argo1)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_SetAcceleratorTable. Expected _wxWindow_p."); + return NULL; + } + } + if (_argo1) { + if (_argo1 == Py_None) { _arg1 = NULL; } + else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxAcceleratorTable_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxWindow_SetAcceleratorTable. Expected _wxAcceleratorTable_p."); + return NULL; + } + } +{ + wxPy_BEGIN_ALLOW_THREADS; + wxWindow_SetAcceleratorTable(_arg0,*_arg1); + + wxPy_END_ALLOW_THREADS; + if (PyErr_Occurred()) return NULL; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + #define wxWindow_GetAcceleratorTable(_swigobj) (_swigobj->GetAcceleratorTable()) static PyObject *_wrap_wxWindow_GetAcceleratorTable(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; @@ -10009,6 +10009,7 @@ static PyMethodDef windowscMethods[] = { { "new_wxPrePanel", (PyCFunction) _wrap_new_wxPrePanel, METH_VARARGS | METH_KEYWORDS }, { "new_wxPanel", (PyCFunction) _wrap_new_wxPanel, METH_VARARGS | METH_KEYWORDS }, { "wxWindow_GetAcceleratorTable", (PyCFunction) _wrap_wxWindow_GetAcceleratorTable, METH_VARARGS | METH_KEYWORDS }, + { "wxWindow_SetAcceleratorTable", (PyCFunction) _wrap_wxWindow_SetAcceleratorTable, METH_VARARGS | METH_KEYWORDS }, { "wxWindow_PrevControlId", (PyCFunction) _wrap_wxWindow_PrevControlId, METH_VARARGS | METH_KEYWORDS }, { "wxWindow_NextControlId", (PyCFunction) _wrap_wxWindow_NextControlId, METH_VARARGS | METH_KEYWORDS }, { "wxWindow_NewControlId", (PyCFunction) _wrap_wxWindow_NewControlId, METH_VARARGS | METH_KEYWORDS }, @@ -10071,7 +10072,6 @@ static PyMethodDef windowscMethods[] = { { "wxWindow_SetBackgroundColour", (PyCFunction) _wrap_wxWindow_SetBackgroundColour, METH_VARARGS | METH_KEYWORDS }, { "wxWindow_GetAutoLayout", (PyCFunction) _wrap_wxWindow_GetAutoLayout, METH_VARARGS | METH_KEYWORDS }, { "wxWindow_SetAutoLayout", (PyCFunction) _wrap_wxWindow_SetAutoLayout, METH_VARARGS | METH_KEYWORDS }, - { "wxWindow_SetAcceleratorTable", (PyCFunction) _wrap_wxWindow_SetAcceleratorTable, METH_VARARGS | METH_KEYWORDS }, { "wxWindow_ScrollWindow", (PyCFunction) _wrap_wxWindow_ScrollWindow, METH_VARARGS | METH_KEYWORDS }, { "wxWindow_ScreenToClient", (PyCFunction) _wrap_wxWindow_ScreenToClient, METH_VARARGS | METH_KEYWORDS }, { "wxWindow_ScreenToClientXY", (PyCFunction) _wrap_wxWindow_ScreenToClientXY, METH_VARARGS | METH_KEYWORDS }, diff --git a/wxPython/src/gtk/windows.py b/wxPython/src/gtk/windows.py index cfd53cea77..3baf0c4dc7 100644 --- a/wxPython/src/gtk/windows.py +++ b/wxPython/src/gtk/windows.py @@ -357,9 +357,6 @@ class wxWindowPtr(wxEvtHandlerPtr): def ScrollWindow(self, *_args, **_kwargs): val = apply(windowsc.wxWindow_ScrollWindow,(self,) + _args, _kwargs) return val - def SetAcceleratorTable(self, *_args, **_kwargs): - val = apply(windowsc.wxWindow_SetAcceleratorTable,(self,) + _args, _kwargs) - return val def SetAutoLayout(self, *_args, **_kwargs): val = apply(windowsc.wxWindow_SetAutoLayout,(self,) + _args, _kwargs) return val @@ -544,6 +541,9 @@ class wxWindowPtr(wxEvtHandlerPtr): def PageDown(self, *_args, **_kwargs): val = apply(windowsc.wxWindow_PageDown,(self,) + _args, _kwargs) return val + def SetAcceleratorTable(self, *_args, **_kwargs): + val = apply(windowsc.wxWindow_SetAcceleratorTable,(self,) + _args, _kwargs) + return val def GetAcceleratorTable(self, *_args, **_kwargs): val = apply(windowsc.wxWindow_GetAcceleratorTable,(self,) + _args, _kwargs) if val: val = wxAcceleratorTablePtr(val) diff --git a/wxPython/src/gtk/windows3.cpp b/wxPython/src/gtk/windows3.cpp index 0089a37627..937d1dc3cf 100644 --- a/wxPython/src/gtk/windows3.cpp +++ b/wxPython/src/gtk/windows3.cpp @@ -2137,12 +2137,14 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_wxCommandEvent","_class_wxSashEvent",SwigwxSashEventTowxCommandEvent}, { "_wxCommandEvent","_wxSashEvent",SwigwxSashEventTowxCommandEvent}, { "_char","_wxChar",0}, + { "_struct_wxNativeFontInfo","_wxNativeFontInfo",0}, { "_EBool","_wxCoord",0}, { "_EBool","_wxPrintQuality",0}, { "_EBool","_signed_int",0}, { "_EBool","_int",0}, { "_EBool","_wxWindowID",0}, { "_unsigned_long","_long",0}, + { "_wxNativeFontInfo","_struct_wxNativeFontInfo",0}, { "_signed_int","_wxCoord",0}, { "_signed_int","_wxPrintQuality",0}, { "_signed_int","_EBool",0}, diff --git a/wxPython/src/gtk/wx.cpp b/wxPython/src/gtk/wx.cpp index d32db341e8..582d40aa17 100644 --- a/wxPython/src/gtk/wx.cpp +++ b/wxPython/src/gtk/wx.cpp @@ -2116,6 +2116,16 @@ SWIGEXPORT(void) initwxc() { PyDict_SetItemString(d,"wxJOY_BUTTON4", PyInt_FromLong((long) wxJOY_BUTTON4)); PyDict_SetItemString(d,"wxJOY_BUTTON_ANY", PyInt_FromLong((long) wxJOY_BUTTON_ANY)); PyDict_SetItemString(d,"wxWS_EX_VALIDATE_RECURSIVELY", PyInt_FromLong((long) wxWS_EX_VALIDATE_RECURSIVELY)); + PyDict_SetItemString(d,"wxMM_TEXT", PyInt_FromLong((long) wxMM_TEXT)); + PyDict_SetItemString(d,"wxMM_LOMETRIC", PyInt_FromLong((long) wxMM_LOMETRIC)); + PyDict_SetItemString(d,"wxMM_HIMETRIC", PyInt_FromLong((long) wxMM_HIMETRIC)); + PyDict_SetItemString(d,"wxMM_LOENGLISH", PyInt_FromLong((long) wxMM_LOENGLISH)); + PyDict_SetItemString(d,"wxMM_HIENGLISH", PyInt_FromLong((long) wxMM_HIENGLISH)); + PyDict_SetItemString(d,"wxMM_TWIPS", PyInt_FromLong((long) wxMM_TWIPS)); + PyDict_SetItemString(d,"wxMM_ISOTROPIC", PyInt_FromLong((long) wxMM_ISOTROPIC)); + PyDict_SetItemString(d,"wxMM_ANISOTROPIC", PyInt_FromLong((long) wxMM_ANISOTROPIC)); + PyDict_SetItemString(d,"wxMM_POINTS", PyInt_FromLong((long) wxMM_POINTS)); + PyDict_SetItemString(d,"wxMM_METRIC", PyInt_FromLong((long) wxMM_METRIC)); PyDict_SetItemString(d,"wxDEFAULT", PyInt_FromLong((long) wxDEFAULT)); PyDict_SetItemString(d,"wxDECORATIVE", PyInt_FromLong((long) wxDECORATIVE)); PyDict_SetItemString(d,"wxROMAN", PyInt_FromLong((long) wxROMAN)); @@ -2179,6 +2189,7 @@ SWIGEXPORT(void) initwxc() { PyDict_SetItemString(d,"WXK_MBUTTON", PyInt_FromLong((long) WXK_MBUTTON)); PyDict_SetItemString(d,"WXK_CLEAR", PyInt_FromLong((long) WXK_CLEAR)); PyDict_SetItemString(d,"WXK_SHIFT", PyInt_FromLong((long) WXK_SHIFT)); + PyDict_SetItemString(d,"WXK_ALT", PyInt_FromLong((long) WXK_ALT)); PyDict_SetItemString(d,"WXK_CONTROL", PyInt_FromLong((long) WXK_CONTROL)); PyDict_SetItemString(d,"WXK_MENU", PyInt_FromLong((long) WXK_MENU)); PyDict_SetItemString(d,"WXK_PAUSE", PyInt_FromLong((long) WXK_PAUSE)); @@ -2241,6 +2252,33 @@ SWIGEXPORT(void) initwxc() { PyDict_SetItemString(d,"WXK_SCROLL", PyInt_FromLong((long) WXK_SCROLL)); PyDict_SetItemString(d,"WXK_PAGEUP", PyInt_FromLong((long) WXK_PAGEUP)); PyDict_SetItemString(d,"WXK_PAGEDOWN", PyInt_FromLong((long) WXK_PAGEDOWN)); + PyDict_SetItemString(d,"WXK_NUMPAD_SPACE", PyInt_FromLong((long) WXK_NUMPAD_SPACE)); + PyDict_SetItemString(d,"WXK_NUMPAD_TAB", PyInt_FromLong((long) WXK_NUMPAD_TAB)); + PyDict_SetItemString(d,"WXK_NUMPAD_ENTER", PyInt_FromLong((long) WXK_NUMPAD_ENTER)); + PyDict_SetItemString(d,"WXK_NUMPAD_F1", PyInt_FromLong((long) WXK_NUMPAD_F1)); + PyDict_SetItemString(d,"WXK_NUMPAD_F2", PyInt_FromLong((long) WXK_NUMPAD_F2)); + PyDict_SetItemString(d,"WXK_NUMPAD_F3", PyInt_FromLong((long) WXK_NUMPAD_F3)); + PyDict_SetItemString(d,"WXK_NUMPAD_F4", PyInt_FromLong((long) WXK_NUMPAD_F4)); + PyDict_SetItemString(d,"WXK_NUMPAD_HOME", PyInt_FromLong((long) WXK_NUMPAD_HOME)); + PyDict_SetItemString(d,"WXK_NUMPAD_LEFT", PyInt_FromLong((long) WXK_NUMPAD_LEFT)); + PyDict_SetItemString(d,"WXK_NUMPAD_UP", PyInt_FromLong((long) WXK_NUMPAD_UP)); + PyDict_SetItemString(d,"WXK_NUMPAD_RIGHT", PyInt_FromLong((long) WXK_NUMPAD_RIGHT)); + PyDict_SetItemString(d,"WXK_NUMPAD_DOWN", PyInt_FromLong((long) WXK_NUMPAD_DOWN)); + PyDict_SetItemString(d,"WXK_NUMPAD_PRIOR", PyInt_FromLong((long) WXK_NUMPAD_PRIOR)); + PyDict_SetItemString(d,"WXK_NUMPAD_PAGEUP", PyInt_FromLong((long) WXK_NUMPAD_PAGEUP)); + PyDict_SetItemString(d,"WXK_NUMPAD_NEXT", PyInt_FromLong((long) WXK_NUMPAD_NEXT)); + PyDict_SetItemString(d,"WXK_NUMPAD_PAGEDOWN", PyInt_FromLong((long) WXK_NUMPAD_PAGEDOWN)); + PyDict_SetItemString(d,"WXK_NUMPAD_END", PyInt_FromLong((long) WXK_NUMPAD_END)); + PyDict_SetItemString(d,"WXK_NUMPAD_BEGIN", PyInt_FromLong((long) WXK_NUMPAD_BEGIN)); + PyDict_SetItemString(d,"WXK_NUMPAD_INSERT", PyInt_FromLong((long) WXK_NUMPAD_INSERT)); + PyDict_SetItemString(d,"WXK_NUMPAD_DELETE", PyInt_FromLong((long) WXK_NUMPAD_DELETE)); + PyDict_SetItemString(d,"WXK_NUMPAD_EQUAL", PyInt_FromLong((long) WXK_NUMPAD_EQUAL)); + PyDict_SetItemString(d,"WXK_NUMPAD_MULTIPLY", PyInt_FromLong((long) WXK_NUMPAD_MULTIPLY)); + PyDict_SetItemString(d,"WXK_NUMPAD_ADD", PyInt_FromLong((long) WXK_NUMPAD_ADD)); + PyDict_SetItemString(d,"WXK_NUMPAD_SEPARATOR", PyInt_FromLong((long) WXK_NUMPAD_SEPARATOR)); + PyDict_SetItemString(d,"WXK_NUMPAD_SUBTRACT", PyInt_FromLong((long) WXK_NUMPAD_SUBTRACT)); + PyDict_SetItemString(d,"WXK_NUMPAD_DECIMAL", PyInt_FromLong((long) WXK_NUMPAD_DECIMAL)); + PyDict_SetItemString(d,"WXK_NUMPAD_DIVIDE", PyInt_FromLong((long) WXK_NUMPAD_DIVIDE)); PyDict_SetItemString(d,"wxBITMAP_TYPE_INVALID", PyInt_FromLong((long) wxBITMAP_TYPE_INVALID)); PyDict_SetItemString(d,"wxBITMAP_TYPE_BMP", PyInt_FromLong((long) wxBITMAP_TYPE_BMP)); PyDict_SetItemString(d,"wxBITMAP_TYPE_BMP_RESOURCE", PyInt_FromLong((long) wxBITMAP_TYPE_BMP_RESOURCE)); diff --git a/wxPython/src/gtk/wx.py b/wxPython/src/gtk/wx.py index 85298b7917..f2d1fc0077 100644 --- a/wxPython/src/gtk/wx.py +++ b/wxPython/src/gtk/wx.py @@ -428,6 +428,16 @@ wxJOY_BUTTON3 = wxc.wxJOY_BUTTON3 wxJOY_BUTTON4 = wxc.wxJOY_BUTTON4 wxJOY_BUTTON_ANY = wxc.wxJOY_BUTTON_ANY wxWS_EX_VALIDATE_RECURSIVELY = wxc.wxWS_EX_VALIDATE_RECURSIVELY +wxMM_TEXT = wxc.wxMM_TEXT +wxMM_LOMETRIC = wxc.wxMM_LOMETRIC +wxMM_HIMETRIC = wxc.wxMM_HIMETRIC +wxMM_LOENGLISH = wxc.wxMM_LOENGLISH +wxMM_HIENGLISH = wxc.wxMM_HIENGLISH +wxMM_TWIPS = wxc.wxMM_TWIPS +wxMM_ISOTROPIC = wxc.wxMM_ISOTROPIC +wxMM_ANISOTROPIC = wxc.wxMM_ANISOTROPIC +wxMM_POINTS = wxc.wxMM_POINTS +wxMM_METRIC = wxc.wxMM_METRIC wxDEFAULT = wxc.wxDEFAULT wxDECORATIVE = wxc.wxDECORATIVE wxROMAN = wxc.wxROMAN @@ -491,6 +501,7 @@ WXK_CANCEL = wxc.WXK_CANCEL WXK_MBUTTON = wxc.WXK_MBUTTON WXK_CLEAR = wxc.WXK_CLEAR WXK_SHIFT = wxc.WXK_SHIFT +WXK_ALT = wxc.WXK_ALT WXK_CONTROL = wxc.WXK_CONTROL WXK_MENU = wxc.WXK_MENU WXK_PAUSE = wxc.WXK_PAUSE @@ -553,6 +564,33 @@ WXK_NUMLOCK = wxc.WXK_NUMLOCK WXK_SCROLL = wxc.WXK_SCROLL WXK_PAGEUP = wxc.WXK_PAGEUP WXK_PAGEDOWN = wxc.WXK_PAGEDOWN +WXK_NUMPAD_SPACE = wxc.WXK_NUMPAD_SPACE +WXK_NUMPAD_TAB = wxc.WXK_NUMPAD_TAB +WXK_NUMPAD_ENTER = wxc.WXK_NUMPAD_ENTER +WXK_NUMPAD_F1 = wxc.WXK_NUMPAD_F1 +WXK_NUMPAD_F2 = wxc.WXK_NUMPAD_F2 +WXK_NUMPAD_F3 = wxc.WXK_NUMPAD_F3 +WXK_NUMPAD_F4 = wxc.WXK_NUMPAD_F4 +WXK_NUMPAD_HOME = wxc.WXK_NUMPAD_HOME +WXK_NUMPAD_LEFT = wxc.WXK_NUMPAD_LEFT +WXK_NUMPAD_UP = wxc.WXK_NUMPAD_UP +WXK_NUMPAD_RIGHT = wxc.WXK_NUMPAD_RIGHT +WXK_NUMPAD_DOWN = wxc.WXK_NUMPAD_DOWN +WXK_NUMPAD_PRIOR = wxc.WXK_NUMPAD_PRIOR +WXK_NUMPAD_PAGEUP = wxc.WXK_NUMPAD_PAGEUP +WXK_NUMPAD_NEXT = wxc.WXK_NUMPAD_NEXT +WXK_NUMPAD_PAGEDOWN = wxc.WXK_NUMPAD_PAGEDOWN +WXK_NUMPAD_END = wxc.WXK_NUMPAD_END +WXK_NUMPAD_BEGIN = wxc.WXK_NUMPAD_BEGIN +WXK_NUMPAD_INSERT = wxc.WXK_NUMPAD_INSERT +WXK_NUMPAD_DELETE = wxc.WXK_NUMPAD_DELETE +WXK_NUMPAD_EQUAL = wxc.WXK_NUMPAD_EQUAL +WXK_NUMPAD_MULTIPLY = wxc.WXK_NUMPAD_MULTIPLY +WXK_NUMPAD_ADD = wxc.WXK_NUMPAD_ADD +WXK_NUMPAD_SEPARATOR = wxc.WXK_NUMPAD_SEPARATOR +WXK_NUMPAD_SUBTRACT = wxc.WXK_NUMPAD_SUBTRACT +WXK_NUMPAD_DECIMAL = wxc.WXK_NUMPAD_DECIMAL +WXK_NUMPAD_DIVIDE = wxc.WXK_NUMPAD_DIVIDE wxBITMAP_TYPE_INVALID = wxc.wxBITMAP_TYPE_INVALID wxBITMAP_TYPE_BMP = wxc.wxBITMAP_TYPE_BMP wxBITMAP_TYPE_BMP_RESOURCE = wxc.wxBITMAP_TYPE_BMP_RESOURCE @@ -1393,7 +1431,7 @@ NULL = None # For backwards compatibility only. You should really be wxColor = wxColour wxNamedColor = wxNamedColour - +wxPen = wxPyPen # backwards compatibility wxNoRefBitmap = wxBitmap diff --git a/wxPython/src/windows.i b/wxPython/src/windows.i index 4905945433..68734a57dd 100644 --- a/wxPython/src/windows.i +++ b/wxPython/src/windows.i @@ -279,7 +279,6 @@ public: wxPoint ScreenToClient(const wxPoint& pt); void ScrollWindow(int dx, int dy, const wxRect* rect = NULL); - void SetAcceleratorTable(const wxAcceleratorTable& accel); void SetAutoLayout(bool autoLayout); bool GetAutoLayout(); void SetBackgroundColour(const wxColour& colour); -- 2.45.2