Fixes for some changed stuff in wxHTML
Fixed an annoying ocmpiler warning in the generated code Regenerated code for wxGTK git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10039 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -103,7 +103,11 @@ static PyObject* t_output_helper(PyObject* target, PyObject* o) {
|
||||
return target;
|
||||
}
|
||||
|
||||
static char* wxStringErrorMsg = "string type is required for parameter";
|
||||
#if PYTHON_API_VERSION >= 1009
|
||||
static char* wxStringErrorMsg = "String or Unicode type required";
|
||||
#else
|
||||
static char* wxStringErrorMsg = "string type is required for parameter";
|
||||
#endif
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
@@ -165,7 +169,7 @@ static PyObject *_wrap_new_wxMDIParentFrame(PyObject *self, PyObject *args, PyOb
|
||||
#if PYTHON_API_VERSION >= 1009
|
||||
char* tmpPtr; int tmpSize;
|
||||
if (!PyString_Check(_obj2) && !PyUnicode_Check(_obj2)) {
|
||||
PyErr_SetString(PyExc_TypeError, "String or Unicode type required");
|
||||
PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
|
||||
return NULL;
|
||||
}
|
||||
if (PyString_AsStringAndSize(_obj2, &tmpPtr, &tmpSize) == -1)
|
||||
@@ -505,7 +509,7 @@ static PyObject *_wrap_new_wxMDIChildFrame(PyObject *self, PyObject *args, PyObj
|
||||
#if PYTHON_API_VERSION >= 1009
|
||||
char* tmpPtr; int tmpSize;
|
||||
if (!PyString_Check(_obj2) && !PyUnicode_Check(_obj2)) {
|
||||
PyErr_SetString(PyExc_TypeError, "String or Unicode type required");
|
||||
PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
|
||||
return NULL;
|
||||
}
|
||||
if (PyString_AsStringAndSize(_obj2, &tmpPtr, &tmpSize) == -1)
|
||||
@@ -798,6 +802,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
|
||||
{ "_class_wxDataObject","_wxDataObject",0},
|
||||
{ "_wxStaticLine","_class_wxStaticLine",0},
|
||||
{ "_wxBrush","_class_wxBrush",0},
|
||||
{ "_wxToggleButton","_class_wxToggleButton",0},
|
||||
{ "_wxMiniFrame","_class_wxMiniFrame",0},
|
||||
{ "_wxDataFormat","_class_wxDataFormat",0},
|
||||
{ "_class_wxDataObjectSimple","_wxDataObjectSimple",0},
|
||||
@@ -1027,6 +1032,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
|
||||
{ "_wxEraseEvent","_class_wxEraseEvent",0},
|
||||
{ "_wxDataObjectComposite","_class_wxDataObjectComposite",0},
|
||||
{ "_class_wxJoystickEvent","_wxJoystickEvent",0},
|
||||
{ "_class_wxToggleButton","_wxToggleButton",0},
|
||||
{ "_class_wxMiniFrame","_wxMiniFrame",0},
|
||||
{ "_wxRegion","_class_wxRegion",0},
|
||||
{ "_class_wxShowEvent","_wxShowEvent",0},
|
||||
|
Reference in New Issue
Block a user