void wxPyEventThunker(wxObject*, wxEvent& event);
PyObject* wxPyConstructObject(void* ptr,
- const char* className,
+ const wxString& className,
int setThisOwn=0);
PyObject* wxPyConstructObject(void* ptr,
- const char* className,
+ const wxString& className,
PyObject* klass,
int setThisOwn=0);
-PyObject* wxPyClassExists(const char* className);
-PyObject* wxPyMake_wxObject(wxObject* source, bool checkEvtHandler=TRUE);
-PyObject* wxPyMake_wxSizer(wxSizer* source);
-void wxPyPtrTypeMap_Add(const char* commonName, const char* ptrName);
+
+PyObject* wx2PyString(const wxString& src);
+wxString Py2wxString(PyObject* source);
+
+PyObject* wxPyClassExists(const wxString& className);
+PyObject* wxPyMake_wxObject(wxObject* source, bool checkEvtHandler=TRUE);
+PyObject* wxPyMake_wxSizer(wxSizer* source);
+void wxPyPtrTypeMap_Add(const char* commonName, const char* ptrName);
PyObject* wxPy_ConvertList(wxListBase* list, const char* className);
-long wxPyGetWinHandle(wxWindow* win);
+long wxPyGetWinHandle(wxWindow* win);
//----------------------------------------------------------------------
PyObject* wxArrayInt2PyList_helper(const wxArrayInt& arr);
-#define RETURN_NONE() { Py_INCREF(Py_None); return Py_None; }
+#define RETURN_NONE() { Py_INCREF(Py_None); return Py_None; }
+#define DECLARE_DEF_STRING(name) static wxString wxPy##name(wx##name)
//----------------------------------------------------------------------
void (*p_wxPyBeginBlockThreads)();
void (*p_wxPyEndBlockThreads)();
- PyObject* (*p_wxPyConstructObject)(void *, const char *, int);
+ PyObject* (*p_wxPyConstructObject)(void *, const wxString&, int);
PyObject* (*p_wxPy_ConvertList)(wxListBase* list, const char* className);
wxString* (*p_wxString_in_helper)(PyObject* source);
+ wxString (*p_Py2wxString)(PyObject* source);
+ PyObject* (*p_wx2PyString)(const wxString& src);
byte* (*p_byte_LIST_helper)(PyObject* source);
int* (*p_int_LIST_helper)(PyObject* source);
PyObject* (*p_wxPyCBH_callCallbackObj)(const wxPyCallbackHelper& cbh, PyObject* argTuple);
void (*p_wxPyCBH_delete)(wxPyCallbackHelper* cbh);
- PyObject* (*p_wxPyClassExists)(const char* className);
+ PyObject* (*p_wxPyClassExists)(const wxString& className);
PyObject* (*p_wxPyMake_wxObject)(wxObject* source, bool checkEvtHandler);
PyObject* (*p_wxPyMake_wxSizer)(wxSizer* source);
void (*p_wxPyPtrTypeMap_Add)(const char* commonName, const char* ptrName);
void CBNAME(const wxString& a); \
void base_##CBNAME(const wxString& a);
-// TODO: unicode fix
#define IMP_PYCALLBACK__STRING(CLASS, PCLASS, CBNAME) \
void CLASS::CBNAME(const wxString& a) { \
bool found; \
wxPyBeginBlockThreads(); \
if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) \
- wxPyCBH_callCallback(m_myInst, Py_BuildValue("(s)", a.c_str())); \
+ wxPyCBH_callCallback(m_myInst, Py_BuildValue("(O)", wx2PyString(a))); \
wxPyEndBlockThreads(); \
if (! found) \
PCLASS::CBNAME(a); \
bool CBNAME(const wxString& a); \
bool base_##CBNAME(const wxString& a);
-// TODO: unicode fix
#define IMP_PYCALLBACK_BOOL_STRING(CLASS, PCLASS, CBNAME) \
bool CLASS::CBNAME(const wxString& a) { \
bool rval=FALSE; \
bool found; \
wxPyBeginBlockThreads(); \
if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) \
- rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(s)", a.c_str()));\
+ rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(O)", wx2PyString(a)));\
wxPyEndBlockThreads(); \
if (! found) \
rval = PCLASS::CBNAME(a); \
#define DEC_PYCALLBACK_BOOL_STRING_pure(CBNAME) \
bool CBNAME(const wxString& a);
-// TODO: unicode fix
#define IMP_PYCALLBACK_BOOL_STRING_pure(CLASS, PCLASS, CBNAME) \
bool CLASS::CBNAME(const wxString& a) { \
bool rval=FALSE; \
wxPyBeginBlockThreads(); \
if (wxPyCBH_findCallback(m_myInst, #CBNAME)) \
- rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(s)", a.c_str())); \
+ rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(O)", wx2PyString(a))); \
wxPyEndBlockThreads(); \
return rval; \
} \
#define DEC_PYCALLBACK_STRING_STRING_pure(CBNAME) \
wxString CBNAME(const wxString& a); \
-// TODO: unicode fix
#define IMP_PYCALLBACK_STRING_STRING_pure(CLASS, PCLASS, CBNAME) \
wxString CLASS::CBNAME(const wxString& a) { \
wxString rval; \
- wxPyBeginBlockThreads(); \
+ wxPyBeginBlockThreads(); \
if (wxPyCBH_findCallback(m_myInst, #CBNAME)) { \
PyObject* ro; \
- ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("(s)", a.c_str()));\
+ ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("(O)", wx2PyString(a)));\
if (ro) { \
- PyObject* str = PyObject_Str(ro); \
- rval = PyString_AsString(str); \
- Py_DECREF(ro); Py_DECREF(str); \
+ rval = Py2wxString(ro); \
+ Py_DECREF(ro); \
} \
} \
- wxPyEndBlockThreads(); \
+ wxPyEndBlockThreads(); \
return rval; \
} \
#define DEC_PYCALLBACK_STRING_STRINGINT_pure(CBNAME) \
wxString CBNAME(const wxString& a,int b); \
-// TODO: unicode fix
#define IMP_PYCALLBACK_STRING_STRINGINT_pure(CLASS, PCLASS, CBNAME) \
wxString CLASS::CBNAME(const wxString& a,int b) { \
wxString rval; \
wxPyBeginBlockThreads(); \
if (wxPyCBH_findCallback(m_myInst, #CBNAME)) { \
PyObject* ro; \
- ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("(si)", a.c_str(),b)); \
+ ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("(Oi)", wx2PyString(a),b)); \
if (ro) { \
- PyObject* str = PyObject_Str(ro); \
- rval = PyString_AsString(str); \
- Py_DECREF(ro); Py_DECREF(str); \
+ rval = Py2wxString(ro); \
+ Py_DECREF(ro); \
} \
} \
- wxPyEndBlockThreads(); \
+ wxPyEndBlockThreads(); \
return rval; \
} \
bool CBNAME(const wxString& a, const wxString& b); \
bool base_##CBNAME(const wxString& a, const wxString& b);
-// TODO: unicode fix
#define IMP_PYCALLBACK_BOOL_STRINGSTRING(CLASS, PCLASS, CBNAME) \
bool CLASS::CBNAME(const wxString& a, const wxString& b) { \
bool rval=FALSE; \
bool found; \
wxPyBeginBlockThreads(); \
if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) \
- rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(ss)", \
- a.c_str(), b.c_str())); \
- wxPyEndBlockThreads(); \
+ rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(OO)", \
+ wx2PyString(a), wx2PyString(b))); \
+ wxPyEndBlockThreads(); \
if (! found) \
rval = PCLASS::CBNAME(a, b); \
return rval; \
wxString CBNAME(); \
wxString base_##CBNAME();
-// TODO: unicode fix
#define IMP_PYCALLBACK_STRING_(CLASS, PCLASS, CBNAME) \
wxString CLASS::CBNAME() { \
wxString rval; \
PyObject* ro; \
ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("()")); \
if (ro) { \
- PyObject* str = PyObject_Str(ro); \
- rval = PyString_AsString(str); \
- Py_DECREF(ro); Py_DECREF(str); \
+ rval = Py2wxString(ro); \
+ Py_DECREF(ro); \
} \
} \
- wxPyEndBlockThreads(); \
+ wxPyEndBlockThreads(); \
if (! found) \
rval = PCLASS::CBNAME(); \
return rval; \
#define DEC_PYCALLBACK_STRING__pure(CBNAME) \
wxString CBNAME();
-// TODO: unicode fix
#define IMP_PYCALLBACK_STRING__pure(CLASS, PCLASS, CBNAME) \
wxString CLASS::CBNAME() { \
wxString rval; \
PyObject* ro; \
ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("()")); \
if (ro) { \
- PyObject* str = PyObject_Str(ro); \
- rval = PyString_AsString(str); \
- Py_DECREF(ro); Py_DECREF(str); \
+ rval = Py2wxString(ro); \
+ Py_DECREF(ro); \
} \
} \
- wxPyEndBlockThreads(); \
+ wxPyEndBlockThreads(); \
return rval; \
}
wxDragResult CLASS::CBNAME(wxCoord a, wxCoord b, wxDragResult c) { \
int rval=0; \
bool found; \
- wxPyBeginBlockThreads(); \
+ wxPyBeginBlockThreads(); \
if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) \
rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iii)", a,b,c));\
- wxPyEndBlockThreads(); \
+ wxPyEndBlockThreads(); \
if (! found) \
rval = PCLASS::CBNAME(a, b, c); \
return (wxDragResult)rval; \
#define DEC_PYCALLBACK_FSF_FSSTRING_pure(CBNAME) \
wxFSFile* CBNAME(wxFileSystem& fs, const wxString& location); \
-// TODO: unicode fix
#define IMP_PYCALLBACK_FSF_FSSTRING_pure(CLASS, PCLASS, CBNAME) \
wxFSFile* CLASS::CBNAME(wxFileSystem& a,const wxString& b) { \
- wxPyBeginBlockThreads(); \
+ wxPyBeginBlockThreads(); \
wxFSFile* rval=0; \
if (wxPyCBH_findCallback(m_myInst, #CBNAME)) { \
PyObject* ro; \
PyObject* obj = wxPyMake_wxObject(&a); \
- ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("(Os)",\
- obj, b.c_str())); \
+ ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("(OO)",\
+ obj, wx2PyString(b))); \
if (ro) { \
SWIG_GetPtrObj(ro, (void **)&rval, "_wxFSFILE_p"); \
Py_DECREF(ro); \
} \
Py_DECREF(obj); \
} \
- wxPyEndBlockThreads(); \
+ wxPyEndBlockThreads(); \
return rval; \
};
bool CLASS::CBNAME(wxDragResult a) { \
bool rval=FALSE; \
bool found; \
- wxPyBeginBlockThreads(); \
+ wxPyBeginBlockThreads(); \
if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) \
rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(i)", a));\
- wxPyEndBlockThreads(); \
+ wxPyEndBlockThreads(); \
if (! found) \
rval = PCLASS::CBNAME(a); \
return rval; \
#define IMP_PYCALLBACK_DR_2WXCDR_pure(CLASS, PCLASS, CBNAME) \
wxDragResult CLASS::CBNAME(wxCoord a, wxCoord b, wxDragResult c) { \
- wxPyBeginBlockThreads(); \
+ wxPyBeginBlockThreads(); \
int rval=0; \
if (wxPyCBH_findCallback(m_myInst, #CBNAME)) \
rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iii)", a,b,c));\
- wxPyEndBlockThreads(); \
+ wxPyEndBlockThreads(); \
return (wxDragResult)rval; \
} \
#define DEC_PYCALLBACK_BOOL_INTINTSTR_pure(CBNAME) \
bool CBNAME(int a, int b, const wxString& c);
-// TODO: unicode fix
#define IMP_PYCALLBACK_BOOL_INTINTSTR_pure(CLASS, PCLASS, CBNAME) \
bool CLASS::CBNAME(int a, int b, const wxString& c) { \
bool rval=FALSE; \
- wxPyBeginBlockThreads(); \
+ wxPyBeginBlockThreads(); \
if (wxPyCBH_findCallback(m_myInst, #CBNAME)) \
- rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iis)",a,b,c.c_str()));\
- wxPyEndBlockThreads(); \
+ rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iiO)",a,b, wx2PyString(c)));\
+ wxPyEndBlockThreads(); \
return rval; \
} \
size_t CLASS::CBNAME() { \
size_t rval=0; \
bool found; \
- wxPyBeginBlockThreads(); \
+ wxPyBeginBlockThreads(); \
if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) \
rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("()")); \
- wxPyEndBlockThreads(); \
+ wxPyEndBlockThreads(); \
if (! found) \
rval = PCLASS::CBNAME(); \
return rval; \
wxDataFormat CLASS::CBNAME(size_t a) { \
wxDataFormat rval=0; \
bool found; \
- wxPyBeginBlockThreads(); \
+ wxPyBeginBlockThreads(); \
if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \
PyObject* ro; \
wxDataFormat* ptr; \
Py_DECREF(ro); \
} \
} \
- wxPyEndBlockThreads(); \
+ wxPyEndBlockThreads(); \
if (! found) \
rval = PCLASS::CBNAME(a); \
return rval; \
#define IMP_PYCALLBACK__constany(CLASS, PCLASS, CBNAME, Type) \
void CLASS::CBNAME(const Type& a) { \
bool found; \
- wxPyBeginBlockThreads(); \
+ wxPyBeginBlockThreads(); \
if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \
PyObject* obj = wxPyConstructObject((void*)&a, #Type, 0); \
wxPyCBH_callCallback(m_myInst, Py_BuildValue("(O)", obj)); \
Py_DECREF(obj); \
} \
- wxPyEndBlockThreads(); \
+ wxPyEndBlockThreads(); \
if (! found) \
PCLASS::CBNAME(a); \
} \
#define IMP_PYCALLBACK__any(CLASS, PCLASS, CBNAME, Type) \
void CLASS::CBNAME(Type& a) { \
bool found; \
- wxPyBeginBlockThreads(); \
+ wxPyBeginBlockThreads(); \
if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \
PyObject* obj = wxPyConstructObject((void*)&a, #Type, 0); \
wxPyCBH_callCallback(m_myInst, Py_BuildValue("(O)", obj)); \
Py_DECREF(obj); \
} \
- wxPyEndBlockThreads(); \
+ wxPyEndBlockThreads(); \
if (! found) \
PCLASS::CBNAME(a); \
} \
bool CLASS::CBNAME(Type& a) { \
bool rv=FALSE; \
bool found; \
- wxPyBeginBlockThreads(); \
+ wxPyBeginBlockThreads(); \
if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \
PyObject* obj = wxPyConstructObject((void*)&a, #Type, 0); \
rv = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(O)", obj)); \
Py_DECREF(obj); \
} \
- wxPyEndBlockThreads(); \
+ wxPyEndBlockThreads(); \
if (! found) \
rv = PCLASS::CBNAME(a); \
return rv; \
wxString CBNAME(long a, long b) const; \
wxString base_##CBNAME(long a, long b)const ;
-// TODO: unicode fix
#define IMP_PYCALLBACK_STRING_LONGLONG(CLASS, PCLASS, CBNAME) \
wxString CLASS::CBNAME(long a, long b) const { \
wxString rval; \
bool found; \
- wxPyBeginBlockThreads(); \
+ wxPyBeginBlockThreads(); \
if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \
PyObject* ro; \
ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("(ll)",a,b)); \
if (ro) { \
- PyObject* str = PyObject_Str(ro); \
- rval = PyString_AsString(str); \
- Py_DECREF(ro); Py_DECREF(str); \
+ rval = Py2wxString(ro); \
+ Py_DECREF(ro); \
} \
} \
- wxPyEndBlockThreads(); \
+ wxPyEndBlockThreads(); \
if (! found) \
rval = PCLASS::CBNAME(a,b); \
return rval; \
int CLASS::CBNAME(long a) const { \
int rval=-1; \
bool found; \
- wxPyBeginBlockThreads(); \
+ wxPyBeginBlockThreads(); \
if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \
PyObject* ro; \
ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("(l)",a)); \
Py_DECREF(ro); \
} \
} \
- wxPyEndBlockThreads(); \
+ wxPyEndBlockThreads(); \
if (! found) \
rval = PCLASS::CBNAME(a); \
return rval; \
wxListItemAttr *CLASS::CBNAME(long a) const { \
wxListItemAttr *rval = NULL; \
bool found; \
- wxPyBeginBlockThreads(); \
+ wxPyBeginBlockThreads(); \
if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \
PyObject* ro; \
wxListItemAttr* ptr; \
Py_DECREF(ro); \
} \
} \
- wxPyEndBlockThreads(); \
+ wxPyEndBlockThreads(); \
if (! found) \
rval = PCLASS::CBNAME(a); \
return rval; \
//---------------------------------------------------------------------------
-#define DEC_PYCALLBACK_BOOL_ME(CBNAME) \
- bool CBNAME(wxMouseEvent& e); \
+#define DEC_PYCALLBACK_BOOL_ME(CBNAME) \
+ bool CBNAME(wxMouseEvent& e); \
bool base_##CBNAME(wxMouseEvent& e);
-#define IMP_PYCALLBACK_BOOL_ME(CLASS, PCLASS, CBNAME) \
- bool CLASS::CBNAME(wxMouseEvent& e) { \
- bool rval=FALSE; \
- bool found; \
- wxPyBeginBlockThreads(); \
- if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \
- PyObject* ro; \
- PyObject* obj = wxPyConstructObject((void*)&e, "wxMouseEvent", 0); \
- ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("(O)",obj)); \
- if (ro) { \
- rval = PyInt_AsLong(ro); \
- Py_DECREF(ro); \
- } \
- Py_DECREF(obj); \
- } \
- wxPyEndBlockThreads(); \
- if (! found) \
- return PCLASS::CBNAME(e); \
- return rval; \
- } \
- bool CLASS::base_##CBNAME(wxMouseEvent& e) { \
- return PCLASS::CBNAME(e); \
+#define IMP_PYCALLBACK_BOOL_ME(CLASS, PCLASS, CBNAME) \
+ bool CLASS::CBNAME(wxMouseEvent& e) { \
+ bool rval=FALSE; \
+ bool found; \
+ wxPyBeginBlockThreads(); \
+ if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \
+ PyObject* ro; \
+ PyObject* obj = wxPyConstructObject((void*)&e, "wxMouseEvent", 0); \
+ ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("(O)",obj)); \
+ if (ro) { \
+ rval = PyInt_AsLong(ro); \
+ Py_DECREF(ro); \
+ } \
+ Py_DECREF(obj); \
+ } \
+ wxPyEndBlockThreads(); \
+ if (! found) \
+ return PCLASS::CBNAME(e); \
+ return rval; \
+ } \
+ bool CLASS::base_##CBNAME(wxMouseEvent& e) { \
+ return PCLASS::CBNAME(e); \
}
projects / wxWidgets.git / blobdiff