Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Renamed some helpers to avoid "GNU C++ internal naming strategy" warnings

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@18199 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2002-12-12 06:29:23 +00:00
parent 245f9233fc
commit 57327441a0
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
wxPython/src/gdi.i
View File

@@ -749,7 +749,7 @@ public:
else { else {
obj = PySequence_GetItem(pyPoints, i); obj = PySequence_GetItem(pyPoints, i);
} }
if (! _2int_seq_helper(obj, &x1, &y1)) { if (! wxPy2int_seq_helper(obj, &x1, &y1)) {
if (!isFastPens) if (!isFastPens)
Py_DECREF(obj); Py_DECREF(obj);
goto err0; goto err0;
@@ -839,7 +839,7 @@ public:
else { else {
obj = PySequence_GetItem(pyLines, i); obj = PySequence_GetItem(pyLines, i);
} }
if (! _4int_seq_helper(obj, &x1, &y1, &x2, &y2)) { if (! wxPy4int_seq_helper(obj, &x1, &y1, &x2, &y2)) {
if (!isFastPens) if (!isFastPens)
Py_DECREF(obj); Py_DECREF(obj);
goto err0; goto err0;

4
wxPython/src/gtk/gdi.cpp
View File

@@ -7731,7 +7731,7 @@ static PyObject * wxDC__DrawPointList(wxDC *self,PyObject * pyPoints,PyObject *
else { else {
obj = PySequence_GetItem(pyPoints, i); obj = PySequence_GetItem(pyPoints, i);
} }
if (! _2int_seq_helper(obj, &x1, &y1)) { if (! wxPy2int_seq_helper(obj, &x1, &y1)) {
if (!isFastPens) if (!isFastPens)
Py_DECREF(obj); Py_DECREF(obj);
goto err0; goto err0;
@@ -7856,7 +7856,7 @@ static PyObject * wxDC__DrawLineList(wxDC *self,PyObject * pyLines,PyObject * py
else { else {
obj = PySequence_GetItem(pyLines, i); obj = PySequence_GetItem(pyLines, i);
} }
if (! _4int_seq_helper(obj, &x1, &y1, &x2, &y2)) { if (! wxPy4int_seq_helper(obj, &x1, &y1, &x2, &y2)) {
if (!isFastPens) if (!isFastPens)
Py_DECREF(obj); Py_DECREF(obj);
goto err0; goto err0;

4
wxPython/src/helpers.cpp
View File

@@ -1882,7 +1882,7 @@ wxPen** wxPen_LIST_helper(PyObject* source) {
} }
bool _2int_seq_helper(PyObject* source, int* i1, int* i2) { bool wxPy2int_seq_helper(PyObject* source, int* i1, int* i2) {
bool isFast = PyList_Check(source) || PyTuple_Check(source); bool isFast = PyList_Check(source) || PyTuple_Check(source);
PyObject *o1, *o2; PyObject *o1, *o2;
@@ -1909,7 +1909,7 @@ bool _2int_seq_helper(PyObject* source, int* i1, int* i2) {
} }
bool _4int_seq_helper(PyObject* source, int* i1, int* i2, int* i3, int* i4) { bool wxPy4int_seq_helper(PyObject* source, int* i1, int* i2, int* i3, int* i4) {
bool isFast = PyList_Check(source) || PyTuple_Check(source); bool isFast = PyList_Check(source) || PyTuple_Check(source);
PyObject *o1, *o2, *o3, *o4; PyObject *o1, *o2, *o3, *o4;

4
wxPython/src/helpers.h
View File

@@ -98,8 +98,8 @@ bool wxPoint2DDouble_helper(PyObject* source, wxPoint2DDouble** obj);
(PyList_Check(o) ? PyList_GET_ITEM(o, i) : PyTuple_GET_ITEM(o, i)) (PyList_Check(o) ? PyList_GET_ITEM(o, i) : PyTuple_GET_ITEM(o, i))
#endif #endif
bool _2int_seq_helper(PyObject* source, int* i1, int* i2); bool wxPy2int_seq_helper(PyObject* source, int* i1, int* i2);
bool _4int_seq_helper(PyObject* source, int* i1, int* i2, int* i3, int* i4); bool wxPy4int_seq_helper(PyObject* source, int* i1, int* i2, int* i3, int* i4);
PyObject* wxArrayString2PyList_helper(const wxArrayString& arr); PyObject* wxArrayString2PyList_helper(const wxArrayString& arr);