From 57327441a02c6dbbf684756f36b476166656ff8b Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Thu, 12 Dec 2002 06:29:23 +0000 Subject: [PATCH] Renamed some helpers to avoid "GNU C++ internal naming strategy" warnings git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@18199 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- wxPython/src/gdi.i | 4 ++-- wxPython/src/gtk/gdi.cpp | 4 ++-- wxPython/src/helpers.cpp | 4 ++-- wxPython/src/helpers.h | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/wxPython/src/gdi.i b/wxPython/src/gdi.i index 87762b0f94..5b562a6853 100644 --- a/wxPython/src/gdi.i +++ b/wxPython/src/gdi.i @@ -749,7 +749,7 @@ public: else { obj = PySequence_GetItem(pyPoints, i); } - if (! _2int_seq_helper(obj, &x1, &y1)) { + if (! wxPy2int_seq_helper(obj, &x1, &y1)) { if (!isFastPens) Py_DECREF(obj); goto err0; @@ -839,7 +839,7 @@ public: else { 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) Py_DECREF(obj); goto err0; diff --git a/wxPython/src/gtk/gdi.cpp b/wxPython/src/gtk/gdi.cpp index 26907f929b..1002ab83dd 100644 --- a/wxPython/src/gtk/gdi.cpp +++ b/wxPython/src/gtk/gdi.cpp @@ -7731,7 +7731,7 @@ static PyObject * wxDC__DrawPointList(wxDC *self,PyObject * pyPoints,PyObject * else { obj = PySequence_GetItem(pyPoints, i); } - if (! _2int_seq_helper(obj, &x1, &y1)) { + if (! wxPy2int_seq_helper(obj, &x1, &y1)) { if (!isFastPens) Py_DECREF(obj); goto err0; @@ -7856,7 +7856,7 @@ static PyObject * wxDC__DrawLineList(wxDC *self,PyObject * pyLines,PyObject * py else { 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) Py_DECREF(obj); goto err0; diff --git a/wxPython/src/helpers.cpp b/wxPython/src/helpers.cpp index d21267dfea..28b68e1c9c 100644 --- a/wxPython/src/helpers.cpp +++ b/wxPython/src/helpers.cpp @@ -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); 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); PyObject *o1, *o2, *o3, *o4; diff --git a/wxPython/src/helpers.h b/wxPython/src/helpers.h index c4642cf43a..2317629d5a 100644 --- a/wxPython/src/helpers.h +++ b/wxPython/src/helpers.h @@ -98,8 +98,8 @@ bool wxPoint2DDouble_helper(PyObject* source, wxPoint2DDouble** obj); (PyList_Check(o) ? PyList_GET_ITEM(o, i) : PyTuple_GET_ITEM(o, i)) #endif -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 wxPy2int_seq_helper(PyObject* source, int* i1, int* i2); +bool wxPy4int_seq_helper(PyObject* source, int* i1, int* i2, int* i3, int* i4); PyObject* wxArrayString2PyList_helper(const wxArrayString& arr);