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
This commit is contained in:
@@ -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}};
|
||||
|
||||
|
Reference in New Issue
Block a user