Added patch to wxPoint_LIST_helper from Tim Hochberg that should make
it gobs faster in certain situations. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9638 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -56,7 +56,12 @@ extern PyObject *SWIG_newvarlink(void);
|
||||
#define SWIG_name "glcanvasc"
|
||||
|
||||
#include "export.h"
|
||||
#ifdef __WXMSW__
|
||||
#include "myglcanvas.h"
|
||||
#else
|
||||
#include <wx/glcanvas.h>
|
||||
#endif
|
||||
|
||||
|
||||
static PyObject* l_output_helper(PyObject* target, PyObject* o) {
|
||||
PyObject* o2;
|
||||
|
@@ -8510,6 +8510,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
|
||||
{ "_wxPNMHandler","_class_wxPNMHandler",0},
|
||||
{ "_wxWindowCreateEvent","_class_wxWindowCreateEvent",0},
|
||||
{ "_wxLogGui","_class_wxLogGui",0},
|
||||
{ "_wxPrinterDC","_class_wxPrinterDC",0},
|
||||
{ "_class_wxPyShapeEvtHandler","_class_wxPyShape",SwigwxPyShapeTowxPyShapeEvtHandler},
|
||||
{ "_class_wxPyShapeEvtHandler","_wxPyShape",SwigwxPyShapeTowxPyShapeEvtHandler},
|
||||
{ "_class_wxPyShapeEvtHandler","_wxPyShapeEvtHandler",0},
|
||||
@@ -8519,7 +8520,6 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
|
||||
{ "_class_wxStatusBar","_wxStatusBar",0},
|
||||
{ "_class_wxGIFHandler","_wxGIFHandler",0},
|
||||
{ "_class_wxPySizer","_wxPySizer",0},
|
||||
{ "_class_wxPostScriptDC","_wxPostScriptDC",0},
|
||||
{ "_wxPanel","_class_wxPanel",0},
|
||||
{ "_wxInitDialogEvent","_class_wxInitDialogEvent",0},
|
||||
{ "_wxCheckBox","_class_wxCheckBox",0},
|
||||
@@ -8583,6 +8583,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
|
||||
{ "_char","_wxChar",0},
|
||||
{ "_wxBitmap","_class_wxBitmap",0},
|
||||
{ "_wxPenList","_class_wxPenList",0},
|
||||
{ "_wxTaskBarIcon","_class_wxTaskBarIcon",0},
|
||||
{ "_wxPrintDialog","_class_wxPrintDialog",0},
|
||||
{ "_wxWindowDC","_class_wxWindowDC",0},
|
||||
{ "_wxTimerEvent","_class_wxTimerEvent",0},
|
||||
@@ -8671,6 +8672,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
|
||||
{ "_class_wxTextCtrl","_wxTextCtrl",0},
|
||||
{ "_class_wxListItemAttr","_wxListItemAttr",0},
|
||||
{ "_wxLayoutConstraints","_class_wxLayoutConstraints",0},
|
||||
{ "_wxMetaFileDC","_class_wxMetaFileDC",0},
|
||||
{ "_class_wxTextDataObject","_wxTextDataObject",0},
|
||||
{ "_wxMenu","_class_wxMenu",0},
|
||||
{ "_class_wxMoveEvent","_wxMoveEvent",0},
|
||||
@@ -8706,6 +8708,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
|
||||
{ "_wxFontList","_class_wxFontList",0},
|
||||
{ "_class_wxMenuEvent","_wxMenuEvent",0},
|
||||
{ "_wxPaletteChangedEvent","_class_wxPaletteChangedEvent",0},
|
||||
{ "_wxJoystick","_class_wxJoystick",0},
|
||||
{ "_class_wxPyBitmapDataObject","_wxPyBitmapDataObject",0},
|
||||
{ "_wxClientDC","_class_wxClientDC",0},
|
||||
{ "_wxMouseEvent","_class_wxMouseEvent",0},
|
||||
@@ -8721,6 +8724,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
|
||||
{ "_signed_short","_short",0},
|
||||
{ "_wxMemoryDC","_class_wxMemoryDC",0},
|
||||
{ "_wxPyTextDataObject","_class_wxPyTextDataObject",0},
|
||||
{ "_class_wxTaskBarIcon","_wxTaskBarIcon",0},
|
||||
{ "_class_wxPrintDialog","_wxPrintDialog",0},
|
||||
{ "_wxPyFileSystemHandler","_class_wxPyFileSystemHandler",0},
|
||||
{ "_wxPaintDC","_class_wxPaintDC",0},
|
||||
@@ -8730,7 +8734,6 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
|
||||
{ "_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},
|
||||
@@ -8739,6 +8742,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
|
||||
{ "_class_wxLog","_wxLog",0},
|
||||
{ "_wxTreeItemId","_class_wxTreeItemId",0},
|
||||
{ "_unsigned_char","_byte",0},
|
||||
{ "_class_wxMetaFileDC","_wxMetaFileDC",0},
|
||||
{ "_class_wxMenu","_wxMenu",0},
|
||||
{ "_wxControl","_class_wxControl",0},
|
||||
{ "_class_wxListBox","_wxListBox",0},
|
||||
@@ -8829,6 +8833,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
|
||||
{ "_class_wxLogGui","_wxLogGui",0},
|
||||
{ "_class_wxMDIParentFrame","_wxMDIParentFrame",0},
|
||||
{ "_wxPyTreeItemData","_class_wxPyTreeItemData",0},
|
||||
{ "_class_wxPrinterDC","_wxPrinterDC",0},
|
||||
{ "_wxStaticBoxSizer","_class_wxStaticBoxSizer",0},
|
||||
{ "_class_wxTimeSpan","_wxTimeSpan",0},
|
||||
{ "_class_wxPyFileSystemHandler","_wxPyFileSystemHandler",0},
|
||||
@@ -8885,6 +8890,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
|
||||
{ "_class_wxCheckListBox","_wxCheckListBox",0},
|
||||
{ "_class_wxBusyInfo","_wxBusyInfo",0},
|
||||
{ "_class_wxFontList","_wxFontList",0},
|
||||
{ "_class_wxJoystick","_wxJoystick",0},
|
||||
{ "_class_wxCommandEvent","_wxCommandEvent",0},
|
||||
{ "_class_wxClientDC","_wxClientDC",0},
|
||||
{ "_class_wxSizeEvent","_wxSizeEvent",0},
|
||||
|
@@ -1273,6 +1273,7 @@ static PyObject *_wrap_wxPseudoMetaFile_DrawLines(PyObject *self, PyObject *args
|
||||
int _arg1;
|
||||
wxPoint * _arg2;
|
||||
PyObject * _argo0 = 0;
|
||||
int NPOINTS;
|
||||
PyObject * _obj2 = 0;
|
||||
char *_kwnames[] = { "self","points", NULL };
|
||||
|
||||
@@ -1288,18 +1289,13 @@ static PyObject *_wrap_wxPseudoMetaFile_DrawLines(PyObject *self, PyObject *args
|
||||
}
|
||||
if (_obj2)
|
||||
{
|
||||
_arg2 = wxPoint_LIST_helper(_obj2);
|
||||
if (_arg2 == NULL) {
|
||||
return NULL;
|
||||
}
|
||||
_arg2 = wxPoint_LIST_helper(_obj2, &NPOINTS);
|
||||
if (_arg2 == NULL) {
|
||||
return NULL;
|
||||
}
|
||||
}
|
||||
{
|
||||
if (_obj2) {
|
||||
_arg1 = PyList_Size(_obj2);
|
||||
}
|
||||
else {
|
||||
_arg1 = 0;
|
||||
}
|
||||
_arg1 = NPOINTS;
|
||||
}
|
||||
{
|
||||
wxPy_BEGIN_ALLOW_THREADS;
|
||||
@@ -1322,6 +1318,7 @@ static PyObject *_wrap_wxPseudoMetaFile_DrawPolygon(PyObject *self, PyObject *ar
|
||||
wxPoint * _arg2;
|
||||
int _arg3 = (int ) 0;
|
||||
PyObject * _argo0 = 0;
|
||||
int NPOINTS;
|
||||
PyObject * _obj2 = 0;
|
||||
char *_kwnames[] = { "self","points","flags", NULL };
|
||||
|
||||
@@ -1337,18 +1334,13 @@ static PyObject *_wrap_wxPseudoMetaFile_DrawPolygon(PyObject *self, PyObject *ar
|
||||
}
|
||||
if (_obj2)
|
||||
{
|
||||
_arg2 = wxPoint_LIST_helper(_obj2);
|
||||
if (_arg2 == NULL) {
|
||||
return NULL;
|
||||
}
|
||||
_arg2 = wxPoint_LIST_helper(_obj2, &NPOINTS);
|
||||
if (_arg2 == NULL) {
|
||||
return NULL;
|
||||
}
|
||||
}
|
||||
{
|
||||
if (_obj2) {
|
||||
_arg1 = PyList_Size(_obj2);
|
||||
}
|
||||
else {
|
||||
_arg1 = 0;
|
||||
}
|
||||
_arg1 = NPOINTS;
|
||||
}
|
||||
{
|
||||
wxPy_BEGIN_ALLOW_THREADS;
|
||||
@@ -1370,6 +1362,7 @@ static PyObject *_wrap_wxPseudoMetaFile_DrawSpline(PyObject *self, PyObject *arg
|
||||
int _arg1;
|
||||
wxPoint * _arg2;
|
||||
PyObject * _argo0 = 0;
|
||||
int NPOINTS;
|
||||
PyObject * _obj2 = 0;
|
||||
char *_kwnames[] = { "self","points", NULL };
|
||||
|
||||
@@ -1385,18 +1378,13 @@ static PyObject *_wrap_wxPseudoMetaFile_DrawSpline(PyObject *self, PyObject *arg
|
||||
}
|
||||
if (_obj2)
|
||||
{
|
||||
_arg2 = wxPoint_LIST_helper(_obj2);
|
||||
if (_arg2 == NULL) {
|
||||
return NULL;
|
||||
}
|
||||
_arg2 = wxPoint_LIST_helper(_obj2, &NPOINTS);
|
||||
if (_arg2 == NULL) {
|
||||
return NULL;
|
||||
}
|
||||
}
|
||||
{
|
||||
if (_obj2) {
|
||||
_arg1 = PyList_Size(_obj2);
|
||||
}
|
||||
else {
|
||||
_arg1 = 0;
|
||||
}
|
||||
_arg1 = NPOINTS;
|
||||
}
|
||||
{
|
||||
wxPy_BEGIN_ALLOW_THREADS;
|
||||
@@ -5546,6 +5534,7 @@ static PyObject *_wrap_wxPyDrawnShape_DrawLines(PyObject *self, PyObject *args,
|
||||
int _arg1;
|
||||
wxPoint * _arg2;
|
||||
PyObject * _argo0 = 0;
|
||||
int NPOINTS;
|
||||
PyObject * _obj2 = 0;
|
||||
char *_kwnames[] = { "self","points", NULL };
|
||||
|
||||
@@ -5561,18 +5550,13 @@ static PyObject *_wrap_wxPyDrawnShape_DrawLines(PyObject *self, PyObject *args,
|
||||
}
|
||||
if (_obj2)
|
||||
{
|
||||
_arg2 = wxPoint_LIST_helper(_obj2);
|
||||
if (_arg2 == NULL) {
|
||||
return NULL;
|
||||
}
|
||||
_arg2 = wxPoint_LIST_helper(_obj2, &NPOINTS);
|
||||
if (_arg2 == NULL) {
|
||||
return NULL;
|
||||
}
|
||||
}
|
||||
{
|
||||
if (_obj2) {
|
||||
_arg1 = PyList_Size(_obj2);
|
||||
}
|
||||
else {
|
||||
_arg1 = 0;
|
||||
}
|
||||
_arg1 = NPOINTS;
|
||||
}
|
||||
{
|
||||
wxPy_BEGIN_ALLOW_THREADS;
|
||||
@@ -5630,6 +5614,7 @@ static PyObject *_wrap_wxPyDrawnShape_DrawPolygon(PyObject *self, PyObject *args
|
||||
wxPoint * _arg2;
|
||||
int _arg3 = (int ) 0;
|
||||
PyObject * _argo0 = 0;
|
||||
int NPOINTS;
|
||||
PyObject * _obj2 = 0;
|
||||
char *_kwnames[] = { "self","points","flags", NULL };
|
||||
|
||||
@@ -5645,18 +5630,13 @@ static PyObject *_wrap_wxPyDrawnShape_DrawPolygon(PyObject *self, PyObject *args
|
||||
}
|
||||
if (_obj2)
|
||||
{
|
||||
_arg2 = wxPoint_LIST_helper(_obj2);
|
||||
if (_arg2 == NULL) {
|
||||
return NULL;
|
||||
}
|
||||
_arg2 = wxPoint_LIST_helper(_obj2, &NPOINTS);
|
||||
if (_arg2 == NULL) {
|
||||
return NULL;
|
||||
}
|
||||
}
|
||||
{
|
||||
if (_obj2) {
|
||||
_arg1 = PyList_Size(_obj2);
|
||||
}
|
||||
else {
|
||||
_arg1 = 0;
|
||||
}
|
||||
_arg1 = NPOINTS;
|
||||
}
|
||||
{
|
||||
wxPy_BEGIN_ALLOW_THREADS;
|
||||
@@ -5749,6 +5729,7 @@ static PyObject *_wrap_wxPyDrawnShape_DrawSpline(PyObject *self, PyObject *args,
|
||||
int _arg1;
|
||||
wxPoint * _arg2;
|
||||
PyObject * _argo0 = 0;
|
||||
int NPOINTS;
|
||||
PyObject * _obj2 = 0;
|
||||
char *_kwnames[] = { "self","points", NULL };
|
||||
|
||||
@@ -5764,18 +5745,13 @@ static PyObject *_wrap_wxPyDrawnShape_DrawSpline(PyObject *self, PyObject *args,
|
||||
}
|
||||
if (_obj2)
|
||||
{
|
||||
_arg2 = wxPoint_LIST_helper(_obj2);
|
||||
if (_arg2 == NULL) {
|
||||
return NULL;
|
||||
}
|
||||
_arg2 = wxPoint_LIST_helper(_obj2, &NPOINTS);
|
||||
if (_arg2 == NULL) {
|
||||
return NULL;
|
||||
}
|
||||
}
|
||||
{
|
||||
if (_obj2) {
|
||||
_arg1 = PyList_Size(_obj2);
|
||||
}
|
||||
else {
|
||||
_arg1 = 0;
|
||||
}
|
||||
_arg1 = NPOINTS;
|
||||
}
|
||||
{
|
||||
wxPy_BEGIN_ALLOW_THREADS;
|
||||
|
@@ -8630,13 +8630,13 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
|
||||
{ "_wxPNMHandler","_class_wxPNMHandler",0},
|
||||
{ "_wxWindowCreateEvent","_class_wxWindowCreateEvent",0},
|
||||
{ "_wxLogGui","_class_wxLogGui",0},
|
||||
{ "_wxPrinterDC","_class_wxPrinterDC",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_wxPanel",0},
|
||||
{ "_wxInitDialogEvent","_class_wxInitDialogEvent",0},
|
||||
{ "_wxCheckBox","_class_wxCheckBox",0},
|
||||
@@ -8704,6 +8704,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
|
||||
{ "_char","_wxChar",0},
|
||||
{ "_wxBitmap","_class_wxBitmap",0},
|
||||
{ "_wxPenList","_class_wxPenList",0},
|
||||
{ "_wxTaskBarIcon","_class_wxTaskBarIcon",0},
|
||||
{ "_wxPrintDialog","_class_wxPrintDialog",0},
|
||||
{ "_wxWindowDC","_class_wxWindowDC",0},
|
||||
{ "_wxTimerEvent","_class_wxTimerEvent",0},
|
||||
@@ -8791,6 +8792,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
|
||||
{ "_class_wxTextCtrl","_wxTextCtrl",0},
|
||||
{ "_class_wxListItemAttr","_wxListItemAttr",0},
|
||||
{ "_wxLayoutConstraints","_class_wxLayoutConstraints",0},
|
||||
{ "_wxMetaFileDC","_class_wxMetaFileDC",0},
|
||||
{ "_class_wxTextDataObject","_wxTextDataObject",0},
|
||||
{ "_wxMenu","_class_wxMenu",0},
|
||||
{ "_class_wxMoveEvent","_wxMoveEvent",0},
|
||||
@@ -8829,6 +8831,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
|
||||
{ "_wxFontList","_class_wxFontList",0},
|
||||
{ "_class_wxMenuEvent","_wxMenuEvent",0},
|
||||
{ "_wxPaletteChangedEvent","_class_wxPaletteChangedEvent",0},
|
||||
{ "_wxJoystick","_class_wxJoystick",0},
|
||||
{ "_class_wxPyBitmapDataObject","_wxPyBitmapDataObject",0},
|
||||
{ "_wxClientDC","_class_wxClientDC",0},
|
||||
{ "_wxMouseEvent","_class_wxMouseEvent",0},
|
||||
@@ -8844,6 +8847,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
|
||||
{ "_signed_short","_short",0},
|
||||
{ "_wxMemoryDC","_class_wxMemoryDC",0},
|
||||
{ "_wxPyTextDataObject","_class_wxPyTextDataObject",0},
|
||||
{ "_class_wxTaskBarIcon","_wxTaskBarIcon",0},
|
||||
{ "_class_wxPrintDialog","_wxPrintDialog",0},
|
||||
{ "_wxPyFileSystemHandler","_class_wxPyFileSystemHandler",0},
|
||||
{ "_wxPaintDC","_class_wxPaintDC",0},
|
||||
@@ -8853,7 +8857,6 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
|
||||
{ "_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},
|
||||
@@ -8861,6 +8864,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
|
||||
{ "_class_wxLog","_wxLog",0},
|
||||
{ "_wxTreeItemId","_class_wxTreeItemId",0},
|
||||
{ "_unsigned_char","_byte",0},
|
||||
{ "_class_wxMetaFileDC","_wxMetaFileDC",0},
|
||||
{ "_class_wxMenu","_wxMenu",0},
|
||||
{ "_wxControl","_class_wxStyledTextCtrl",SwigwxStyledTextCtrlTowxControl},
|
||||
{ "_wxControl","_wxStyledTextCtrl",SwigwxStyledTextCtrlTowxControl},
|
||||
@@ -8953,6 +8957,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
|
||||
{ "_class_wxLogGui","_wxLogGui",0},
|
||||
{ "_class_wxMDIParentFrame","_wxMDIParentFrame",0},
|
||||
{ "_wxPyTreeItemData","_class_wxPyTreeItemData",0},
|
||||
{ "_class_wxPrinterDC","_wxPrinterDC",0},
|
||||
{ "_wxStaticBoxSizer","_class_wxStaticBoxSizer",0},
|
||||
{ "_class_wxTimeSpan","_wxTimeSpan",0},
|
||||
{ "_class_wxPyFileSystemHandler","_wxPyFileSystemHandler",0},
|
||||
@@ -9011,6 +9016,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
|
||||
{ "_class_wxCheckListBox","_wxCheckListBox",0},
|
||||
{ "_class_wxBusyInfo","_wxBusyInfo",0},
|
||||
{ "_class_wxFontList","_wxFontList",0},
|
||||
{ "_class_wxJoystick","_wxJoystick",0},
|
||||
{ "_class_wxCommandEvent","_class_wxStyledTextEvent",SwigwxStyledTextEventTowxCommandEvent},
|
||||
{ "_class_wxCommandEvent","_wxStyledTextEvent",SwigwxStyledTextEventTowxCommandEvent},
|
||||
{ "_class_wxCommandEvent","_wxCommandEvent",0},
|
||||
|
Reference in New Issue
Block a user