%pragma(python) code = "import wx"
+//----------------------------------------------------------------------
+
+%{
+ // Put some wx default wxChar* values into wxStrings.
+ DECLARE_DEF_STRING(PanelNameStr);
+ DECLARE_DEF_STRING2(DateTimeFormatStr, wxT("%c"));
+ static const wxString wxPyEmptyString(wxT(""));
+%}
+
//---------------------------------------------------------------------------
//---------------------------------------------------------------------------
// Macros, similar to what's in helpers.h, to aid in the creation of
}
-
#define PYCALLBACK_STRING_INTINT_pure(CBNAME) \
wxString CBNAME(int a, int b) { \
- wxPyBeginBlockThreads(); \
+ wxPyBeginBlockThreads(); \
wxString rval; \
if (wxPyCBH_findCallback(m_myInst, #CBNAME)) { \
PyObject* ro; \
ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("(ii)",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; \
}
-
#define PYCALLBACK__INTINTSTRING_pure(CBNAME) \
void CBNAME(int a, int b, const wxString& c) { \
- wxPyBeginBlockThreads(); \
+ wxPyBeginBlockThreads(); \
if (wxPyCBH_findCallback(m_myInst, #CBNAME)) \
- wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iis)",a,b,c.c_str()));\
- wxPyEndBlockThreads(); \
+ wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iiO)",a,b,wx2PyString(c)));\
+ wxPyEndBlockThreads(); \
}
#define PYCALLBACK_STRING_INTINT(PCLASS, CBNAME) \
wxString CBNAME(int a, int b) { \
bool found; \
- wxPyBeginBlockThreads(); \
+ wxPyBeginBlockThreads(); \
wxString rval; \
if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \
PyObject* ro; \
ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("(ii)",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; \
}
-
#define PYCALLBACK_BOOL_INTINTSTRING(PCLASS, CBNAME) \
bool CBNAME(int a, int b, const wxString& c) { \
bool rval = 0; \
bool found; \
- wxPyBeginBlockThreads(); \
+ wxPyBeginBlockThreads(); \
if ((found = 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(); \
if (! found) \
rval = PCLASS::CBNAME(a,b,c); \
return rval; \
}
-
#define PYCALLBACK_STRING_INT(PCLASS, CBNAME) \
wxString CBNAME(int a) { \
bool found; \
- wxPyBeginBlockThreads(); \
+ wxPyBeginBlockThreads(); \
wxString rval; \
if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \
PyObject* ro; \
ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("(i)",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(); \
if (! found) \
rval = PCLASS::CBNAME(a); \
return rval; \
}
-
#define PYCALLBACK__INTSTRING(PCLASS, CBNAME) \
void CBNAME(int a, const wxString& c) { \
bool found; \
- wxPyBeginBlockThreads(); \
+ wxPyBeginBlockThreads(); \
if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) \
- wxPyCBH_callCallback(m_myInst, Py_BuildValue("(is)", a,c.c_str())); \
- wxPyEndBlockThreads(); \
+ wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iO)", a, wx2PyString(c))); \
+ wxPyEndBlockThreads(); \
if (! found) \
PCLASS::CBNAME(a,c); \
} \
bool CBNAME() { \
bool 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; \
#define PYCALLBACK__SIZETINT(PCLASS, CBNAME) \
void CBNAME(size_t a, int b) { \
bool found; \
- wxPyBeginBlockThreads(); \
+ wxPyBeginBlockThreads(); \
if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) \
wxPyCBH_callCallback(m_myInst, Py_BuildValue("(ii)", a,b)); \
- wxPyEndBlockThreads(); \
+ wxPyEndBlockThreads(); \
if (! found) \
PCLASS::CBNAME(a,b); \
} \
#define PYCALLBACK__INTINTLONG(PCLASS, CBNAME) \
void CBNAME(int a, int b, long c) { \
bool found; \
- wxPyBeginBlockThreads(); \
+ wxPyBeginBlockThreads(); \
if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) \
wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iii)", a,b,c)); \
- wxPyEndBlockThreads(); \
+ wxPyEndBlockThreads(); \
if (! found) \
PCLASS::CBNAME(a,b,c); \
} \
#define PYCALLBACK__INTINTDOUBLE(PCLASS, CBNAME) \
void CBNAME(int a, int b, double c) { \
bool found; \
- wxPyBeginBlockThreads(); \
+ wxPyBeginBlockThreads(); \
if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) \
wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iif)", a,b,c)); \
- wxPyEndBlockThreads(); \
+ wxPyEndBlockThreads(); \
if (! found) \
PCLASS::CBNAME(a,b,c); \
} \
#define PYCALLBACK__INTINTBOOL(PCLASS, CBNAME) \
void CBNAME(int a, int b, bool c) { \
bool found; \
- wxPyBeginBlockThreads(); \
+ wxPyBeginBlockThreads(); \
if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) \
wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iii)", a,b,c)); \
- wxPyEndBlockThreads(); \
+ wxPyEndBlockThreads(); \
if (! found) \
PCLASS::CBNAME(a,b,c); \
} \
%}
//---------------------------------------------------------------------------
+// OOR related typemaps and helper functions
-class wxGridCellCoords;
-class wxGridCellAttr;
+%typemap(python, out) wxGridCellRenderer* { $target = wxPyMake_wxGridCellRenderer($source); }
+%typemap(python, out) wxGridCellEditor* { $target = wxPyMake_wxGridCellEditor($source); }
+%typemap(python, out) wxGridCellAttr* { $target = wxPyMake_wxGridCellAttr($source); }
+%typemap(python, out) wxGridCellAttrProvider* { $target = wxPyMake_wxGridCellAttrProvider($source); }
+%typemap(python, out) wxGridTableBase* { $target = wxPyMake_wxGridTableBase($source); }
+
+%{
+
+
+#define wxPyMake_TEMPLATE(TYPE) \
+PyObject* wxPyMake_##TYPE(TYPE* source) { \
+ PyObject* target = NULL; \
+ if (source) { \
+ /* Check if there is already a pointer to a Python object in the \
+ OOR data that we can use. */ \
+ wxPyOORClientData* data = (wxPyOORClientData*)source->GetClientObject(); \
+ if (data) { \
+ target = data->m_obj; \
+ Py_INCREF(target); \
+ } \
+ /* Otherwise make a new wrapper for it the old fashioned way and \
+ give it the OOR treatment */ \
+ if (! target) { \
+ target = wxPyConstructObject(source, #TYPE, FALSE); \
+ if (target) \
+ source->SetClientObject(new wxPyOORClientData(target)); \
+ } \
+ } else { /* source was NULL so return None. */ \
+ Py_INCREF(Py_None); target = Py_None; \
+ } \
+ return target; \
+} \
+
+wxPyMake_TEMPLATE(wxGridCellRenderer)
+wxPyMake_TEMPLATE(wxGridCellEditor)
+wxPyMake_TEMPLATE(wxGridCellAttr)
+wxPyMake_TEMPLATE(wxGridCellAttrProvider)
+wxPyMake_TEMPLATE(wxGridTableBase)
+%}
+
+//---------------------------------------------------------------------------
+class wxGridCellCoords;
+class wxGridCellAttr;
#define wxGRID_VALUE_STRING "string"
#define wxGRID_VALUE_BOOL "bool"
#define wxGRID_VALUE_CHOICE "choice"
#define wxGRID_VALUE_TEXT "string"
#define wxGRID_VALUE_LONG "long"
+#define wxGRID_VALUE_CHOICEINT "choiceint"
+#define wxGRID_VALUE_DATETIME "datetime"
+
%readonly
wxGridCellCoords wxGridNoCellCoords;
class wxGridCellRenderer
{
public:
+ %addmethods {
+ void _setOORInfo(PyObject* _self) {
+ self->SetClientObject(new wxPyOORClientData(_self));
+ }
+ }
+
void SetParameters(const wxString& params);
void IncRef();
void DecRef();
wxPyConstructObject((void*)&dc, "wxDC", 0),
row, col));
if (ro) {
- if (!SWIG_GetPtrObj(ro, (void **)&ptr, "_wxSize_p"))
+ const char* errmsg = "GetBestSize should return a 2-tuple of integers or a wxSize object.";
+ if (!SWIG_GetPtrObj(ro, (void **)&ptr, "_wxSize_p")) {
rval = *ptr;
+ }
+ else if (PySequence_Check(ro) && PyObject_Length(ro) == 2) {
+ PyObject* o1 = PySequence_GetItem(ro, 0);
+ PyObject* o2 = PySequence_GetItem(ro, 1);
+ if (PyNumber_Check(o1) && PyNumber_Check(o2))
+ rval = wxSize(PyInt_AsLong(o1), PyInt_AsLong(o2));
+ else
+ PyErr_SetString(PyExc_TypeError, errmsg);
+ Py_DECREF(o1);
+ Py_DECREF(o2);
+ }
+ else {
+ PyErr_SetString(PyExc_TypeError, errmsg);
+ }
Py_DECREF(ro);
}
}
wxPyGridCellRenderer();
void _setCallbackInfo(PyObject* self, PyObject* _class);
%pragma(python) addtomethod = "__init__:self._setCallbackInfo(self, wxPyGridCellRenderer)"
+ %pragma(python) addtomethod = "__init__:self._setOORInfo(self)"
void base_SetParameters(const wxString& params);
};
{
public:
wxGridCellStringRenderer();
+ %pragma(python) addtomethod = "__init__:self._setOORInfo(self)"
};
{
public:
wxGridCellNumberRenderer();
+ %pragma(python) addtomethod = "__init__:self._setOORInfo(self)"
};
{
public:
wxGridCellFloatRenderer(int width = -1, int precision = -1);
+ %pragma(python) addtomethod = "__init__:self._setOORInfo(self)"
int GetWidth() const;
void SetWidth(int width);
{
public:
wxGridCellBoolRenderer();
+ %pragma(python) addtomethod = "__init__:self._setOORInfo(self)"
};
class wxGridCellDateTimeRenderer : public wxGridCellStringRenderer
{
public:
- wxGridCellDateTimeRenderer(wxString outformat = "%c",
- wxString informat = "%c");
+ wxGridCellDateTimeRenderer(wxString outformat = wxPyDateTimeFormatStr,
+ wxString informat = wxPyDateTimeFormatStr);
+ %pragma(python) addtomethod = "__init__:self._setOORInfo(self)"
};
class wxGridCellEnumRenderer : public wxGridCellStringRenderer
{
public:
- wxGridCellEnumRenderer( const wxString& choices = "" );
+ wxGridCellEnumRenderer( const wxString& choices = wxPyEmptyString );
+ %pragma(python) addtomethod = "__init__:self._setOORInfo(self)"
};
{
public:
wxGridCellAutoWrapStringRenderer();
+ %pragma(python) addtomethod = "__init__:self._setOORInfo(self)"
};
class wxGridCellEditor
{
public:
+ %addmethods {
+ void _setOORInfo(PyObject* _self) {
+ self->SetClientObject(new wxPyOORClientData(_self));
+ }
+ }
+
bool IsCreated();
wxControl* GetControl();
void SetControl(wxControl* control);
wxPyGridCellEditor();
void _setCallbackInfo(PyObject* self, PyObject* _class);
%pragma(python) addtomethod = "__init__:self._setCallbackInfo(self, wxPyGridCellEditor)"
+ %pragma(python) addtomethod = "__init__:self._setOORInfo(self)"
void base_SetSize(const wxRect& rect);
void base_Show(bool show, wxGridCellAttr *attr = NULL);
{
public:
wxGridCellTextEditor();
+ %pragma(python) addtomethod = "__init__:self._setOORInfo(self)"
};
{
public:
wxGridCellNumberEditor(int min = -1, int max = -1);
+ %pragma(python) addtomethod = "__init__:self._setOORInfo(self)"
};
{
public:
wxGridCellFloatEditor();
+ %pragma(python) addtomethod = "__init__:self._setOORInfo(self)"
};
{
public:
wxGridCellBoolEditor();
+ %pragma(python) addtomethod = "__init__:self._setOORInfo(self)"
};
class wxGridCellChoiceEditor : public wxGridCellEditor
wxGridCellChoiceEditor(int LCOUNT = 0,
const wxString* choices = NULL,
bool allowOthers = FALSE);
+ %pragma(python) addtomethod = "__init__:self._setOORInfo(self)"
};
class wxGridCellEnumEditor : public wxGridCellChoiceEditor
{
public:
- wxGridCellEnumEditor( const wxString& choices = "" );
+ wxGridCellEnumEditor( const wxString& choices = wxPyEmptyString );
+ %pragma(python) addtomethod = "__init__:self._setOORInfo(self)"
};
{
public:
wxGridCellAutoWrapStringEditor();
+ %pragma(python) addtomethod = "__init__:self._setOORInfo(self)"
};
Merged
};
+ %addmethods {
+ void _setOORInfo(PyObject* _self) {
+ self->SetClientObject(new wxPyOORClientData(_self));
+ }
+ }
+
wxGridCellAttr(wxGridCellAttr *attrDefault = NULL);
+ %pragma(python) addtomethod = "__init__:self._setOORInfo(self)"
wxGridCellAttr *Clone() const;
void MergeWith(wxGridCellAttr *mergefrom);
public:
wxGridCellAttrProvider();
// ???? virtual ~wxGridCellAttrProvider();
+ %pragma(python) addtomethod = "__init__:self._setOORInfo(self)"
+
+ %addmethods {
+ void _setOORInfo(PyObject* _self) {
+ self->SetClientObject(new wxPyOORClientData(_self));
+ }
+ }
wxGridCellAttr *GetAttr(int row, int col,
wxGridCellAttr::wxAttrKind kind) const;
// Grid Table Base class and Python aware version
-
class wxGridTableBase : public wxObject
{
public:
// wxGridTableBase(); This is an ABC
//~wxGridTableBase();
+ %addmethods {
+ void _setOORInfo(PyObject* _self) {
+ self->SetClientObject(new wxPyOORClientData(_self));
+ }
+ }
+
void SetAttrProvider(wxGridCellAttrProvider *attrProvider);
wxGridCellAttrProvider *GetAttrProvider() const;
void SetView( wxGrid *grid );
PyObject* ro;
ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("(ii)",row,col));
if (ro) {
- PyObject* str = PyObject_Str(ro);
- rval = PyString_AsString(str);
+ rval = Py2wxString(ro);
Py_DECREF(ro);
- Py_DECREF(str);
}
}
wxPyEndBlockThreads();
void SetValue(int row, int col, const wxString& val) {
wxPyBeginBlockThreads();
- if (wxPyCBH_findCallback(m_myInst, "SetValue"))
- wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iis)",row,col,val.c_str()));
+ if (wxPyCBH_findCallback(m_myInst, "SetValue")) {
+ wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iiO)",row,col,wx2PyString(val)));
+ }
wxPyEndBlockThreads();
}
wxPyGridTableBase();
void _setCallbackInfo(PyObject* self, PyObject* _class);
%pragma(python) addtomethod = "__init__:self._setCallbackInfo(self, wxPyGridTableBase)"
+ %pragma(python) addtomethod = "__init__:self._setOORInfo(self)"
%addmethods { void Destroy() { delete self; } }
{
public:
wxGridStringTable( int numRows=0, int numCols=0 );
+ %pragma(python) addtomethod = "__init__:self._setOORInfo(self)"
};
//---------------------------------------------------------------------------
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
long style = wxWANTS_CHARS,
- const char* name = wxPanelNameStr );
+ const wxString& name = wxPyPanelNameStr);
%pragma(python) addtomethod = "__init__:self._setOORInfo(self)"
projects / wxWidgets.git / blobdiff