AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Moved wxPy_ConvertList function from oglhelpers to helpers

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3652 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn 1999-09-13 19:28:10 +00:00
parent 18ba9da6b9
commit 389c55270a
5 changed files with 133 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
utils/wxPython/modules/ogl/ogl.i
View File

@ -156,6 +156,7 @@ extern "C" SWIGEXPORT(void) initoglshapes2c();
extern "C" SWIGEXPORT(void) initoglcanvasc();
%}
%init %{
initoglbasicc();

40
utils/wxPython/modules/ogl/oglhelpers.cpp
View File

@ -92,42 +92,10 @@ wxList* wxPy_wxRealPoint_ListHelper(PyObject* pyList) {
//---------------------------------------------------------------------------
// Convert a wxList to a Python List
#include <ogl.h>
PyObject* wxPy_ConvertList(wxList* list, char* className) {
PyObject* pyList;
PyObject* pyObj;
wxObject* wxObj;
wxNode* node = list->First();
bool doSave = wxPyRestoreThread();
pyList = PyList_New(0);
while (node) {
wxObj = node->Data();
// printf("%s class at %x : %x\n", wxObj->GetClassInfo()->GetClassName(), (void*)wxObj, (void*)((wxShape*)wxObj)->GetParent());
pyObj = wxPyConstructObject(wxObj, className);
PyList_Append(pyList, pyObj);
node = node->Next();
}
// for (int x=0; x<PyList_Size(pyList); x++) {
// PyObject* obj = PyList_GetItem(pyList, x);
// char* attr = PyString_AsString(PyObject_GetAttrString(obj, "this"));
// PyObject* par = PyObject_CallMethod(obj, "GetParent", NULL);
// char* parent;
// if (par != Py_None)
// parent = PyString_AsString(PyObject_GetAttrString(par, "this"));
// else
// parent = "None";
// printf("obj.this = %s obj.GetParent().this = %s\n", attr, parent);
// }
// printf("--------\n");
wxPySaveThread(doSave);
return pyList;
}
//---------------------------------------------------------------------------

2
utils/wxPython/modules/ogl/oglhelpers.h
View File

@ -100,8 +100,6 @@
wxList* wxPy_wxListHelper(PyObject* pyList, char* className);
wxList* wxPy_wxRealPoint_ListHelper(PyObject* pyList);
PyObject* wxPy_ConvertList(wxList* list, char* className);
//---------------------------------------------------------------------------

23
utils/wxPython/src/helpers.cpp
View File

@ -494,9 +494,30 @@ PyObject* wxPyEvent::GetUserData() {
}
//----------------------------------------------------------------------
//---------------------------------------------------------------------------
// Convert a wxList to a Python List
PyObject* wxPy_ConvertList(wxListBase* list, char* className) {
PyObject* pyList;
PyObject* pyObj;
wxObject* wxObj;
wxNode* node = list->First();
bool doSave = wxPyRestoreThread();
pyList = PyList_New(0);
while (node) {
wxObj = node->Data();
pyObj = wxPyConstructObject(wxObj, className);
PyList_Append(pyList, pyObj);
node = node->Next();
}
wxPySaveThread(doSave);
return pyList;
}
//----------------------------------------------------------------------
// Some helper functions for typemaps in my_typemaps.i, so they won't be
// imcluded in every file...
// included in every file...
HELPEREXPORT byte* byte_LIST_helper(PyObject* source) {

106
utils/wxPython/src/helpers.h
View File

@ -67,6 +67,7 @@ void wxPyEventThunker(wxObject*, wxEvent& event);
HELPEREXPORT PyObject* wxPyConstructObject(void* ptr, char* className);
HELPEREXPORT bool wxPyRestoreThread();
HELPEREXPORT void wxPySaveThread(bool doSave);
HELPEREXPORT PyObject* wxPy_ConvertList(wxListBase* list, char* className);
//----------------------------------------------------------------------
@ -574,6 +575,111 @@ private:
//---------------------------------------------------------------------------
//---------------------------------------------------------------------------
#define DEC_PYCALLBACK__STRING(CBNAME) \
void CBNAME(const wxString& a); \
void base_##CBNAME(const wxString& a);
#define IMP_PYCALLBACK__STRING(CLASS, PCLASS, CBNAME) \
void CLASS::CBNAME(const wxString& a) { \
bool doSave = wxPyRestoreThread(); \
if (m_myInst.findCallback(#CBNAME)) \
m_myInst.callCallback(Py_BuildValue("(s)", a.c_str())); \
else \
PCLASS::CBNAME(a); \
wxPySaveThread(doSave); \
} \
void CLASS::base_##CBNAME(const wxString& a) { \
PCLASS::CBNAME(a); \
}
//---------------------------------------------------------------------------
#define DEC_PYCALLBACK_BOOL_STRING(CBNAME) \
bool CBNAME(const wxString& a); \
bool base_##CBNAME(const wxString& a);
#define IMP_PYCALLBACK_BOOL_STRING(CLASS, PCLASS, CBNAME) \
bool CLASS::CBNAME(const wxString& a) { \
bool rval; \
bool doSave = wxPyRestoreThread(); \
if (m_myInst.findCallback(#CBNAME)) \
rval = m_myInst.callCallback(Py_BuildValue("(s)", a.c_str())); \
else \
rval = PCLASS::CBNAME(a); \
wxPySaveThread(doSave); \
return rval; \
} \
bool CLASS::base_##CBNAME(const wxString& a) { \
return PCLASS::CBNAME(a); \
}
//---------------------------------------------------------------------------
#define DEC_PYCALLBACK_STRING_(CBNAME) \
wxString CBNAME(); \
wxString base_##CBNAME();
#define IMP_PYCALLBACK_STRING_(CLASS, PCLASS, CBNAME) \
wxString CLASS::CBNAME() { \
wxString rval; \
bool doSave = wxPyRestoreThread(); \
if (m_myInst.findCallback(#CBNAME)) { \
PyObject* ro; \
ro = m_myInst.callCallbackObj(Py_BuildValue("()")); \
rval = PyString_AsString(PyObject_Str(ro)); \
} \
else \
rval = PCLASS::CBNAME(a); \
wxPySaveThread(doSave); \
return rval; \
} \
bool CLASS::base_##CBNAME(const wxString& a) { \
return PCLASS::CBNAME(a); \
}
//---------------------------------------------------------------------------
#define DEC_PYCALLBACK_STRING__pure(CBNAME) \
wxString CBNAME();
#define IMP_PYCALLBACK_STRING__pure(CLASS, PCLASS, CBNAME) \
wxString CLASS::CBNAME() { \
wxString rval; \
bool doSave = wxPyRestoreThread(); \
if (m_myInst.findCallback(#CBNAME)) { \
PyObject* ro; \
ro = m_myInst.callCallbackObj(Py_BuildValue("()")); \
rval = PyString_AsString(PyObject_Str(ro)); \
} \
wxPySaveThread(doSave); \
return rval; \
}
//---------------------------------------------------------------------------
#define DEC_PYCALLBACK_BOOL_TAG_pure(CBNAME) \
bool CBNAME(const wxHtmlTag& a); \
#define IMP_PYCALLBACK_BOOL_TAG_pure(CLASS, PCLASS, CBNAME) \
bool CLASS::CBNAME(const wxHtmlTag& a) { \
bool rval = false; \
bool doSave = wxPyRestoreThread(); \
if (m_myInst.findCallback(#CBNAME)) \
rval = m_myInst.callCallback(Py_BuildValue("(O)", \
wxPyConstructObject((void*)&a,"wxHtmlTag"))); \
wxPySaveThread(doSave); \
return rval; \
}
//---------------------------------------------------------------------------
//---------------------------------------------------------------------------
//---------------------------------------------------------------------------
//---------------------------------------------------------------------------
//---------------------------------------------------------------------------