// Licence: wxWindows license
/////////////////////////////////////////////////////////////////////////////
-%module grid
+%define DOCSTRING
+"Classes for implementing a spreadsheet-like control."
+%enddef
+%module(docstring=DOCSTRING) grid
+
%{
#include "wx/wxPython/wxPython.h"
//---------------------------------------------------------------------------
%import windows.i
-%pythoncode { wx = core }
+%pythoncode { wx = _core }
+%pythoncode { __docfilter__ = wx.__DocFilter(globals()) }
%include _grid_rename.i
wxGridCellAttr* CBNAME(int a, int b, wxGridCellAttr::wxAttrKind c) { \
wxGridCellAttr* rval = NULL; \
bool found; \
- wxPyBeginBlockThreads(); \
+ bool blocked = wxPyBeginBlockThreads(); \
if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \
PyObject* ro; \
wxGridCellAttr* ptr; \
Py_DECREF(ro); \
} \
} \
- wxPyEndBlockThreads(); \
+ wxPyEndBlockThreads(blocked); \
if (! found) \
rval = PCLASS::CBNAME(a, b, c); \
return rval; \
#define PYCALLBACK__GCAINTINT(PCLASS, CBNAME) \
void CBNAME(wxGridCellAttr *attr, int a, int b) { \
- wxPyBeginBlockThreads(); \
+ bool blocked = wxPyBeginBlockThreads(); \
bool found; \
if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \
PyObject* obj = wxPyMake_wxGridCellAttr(attr); \
wxPyCBH_callCallback(m_myInst, Py_BuildValue("(Oii)", obj, a, b)); \
Py_DECREF(obj); \
} \
- wxPyEndBlockThreads(); \
+ wxPyEndBlockThreads(blocked); \
if (! found) \
PCLASS::CBNAME(attr, a, b); \
} \
#define PYCALLBACK__GCAINT(PCLASS, CBNAME) \
void CBNAME(wxGridCellAttr *attr, int val) { \
- wxPyBeginBlockThreads(); \
+ bool blocked = wxPyBeginBlockThreads(); \
bool found; \
if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \
PyObject* obj = wxPyMake_wxGridCellAttr(attr); \
wxPyCBH_callCallback(m_myInst, Py_BuildValue("(Oi)", obj, val)); \
Py_DECREF(obj); \
} \
- wxPyEndBlockThreads(); \
+ wxPyEndBlockThreads(blocked); \
if (! found) \
PCLASS::CBNAME(attr, val); \
} \
#define PYCALLBACK_INT__pure(CBNAME) \
int CBNAME() { \
- wxPyBeginBlockThreads(); \
+ bool blocked = wxPyBeginBlockThreads(); \
int rval = 0; \
if (wxPyCBH_findCallback(m_myInst, #CBNAME)) \
rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("()")); \
- wxPyEndBlockThreads(); \
+ wxPyEndBlockThreads(blocked); \
return rval; \
}
#define PYCALLBACK_BOOL_INTINT_pure(CBNAME) \
bool CBNAME(int a, int b) { \
- wxPyBeginBlockThreads(); \
+ bool blocked = wxPyBeginBlockThreads(); \
bool rval = 0; \
if (wxPyCBH_findCallback(m_myInst, #CBNAME)) \
rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(ii)",a,b)); \
- wxPyEndBlockThreads(); \
+ wxPyEndBlockThreads(blocked); \
return rval; \
}
#define PYCALLBACK_STRING_INTINT_pure(CBNAME) \
wxString CBNAME(int a, int b) { \
- wxPyBeginBlockThreads(); \
+ bool blocked = wxPyBeginBlockThreads(); \
wxString rval; \
if (wxPyCBH_findCallback(m_myInst, #CBNAME)) { \
PyObject* ro; \
Py_DECREF(ro); \
} \
} \
- wxPyEndBlockThreads(); \
+ wxPyEndBlockThreads(blocked); \
return rval; \
}
#define PYCALLBACK__INTINTSTRING_pure(CBNAME) \
void CBNAME(int a, int b, const wxString& c) { \
- wxPyBeginBlockThreads(); \
+ bool blocked = wxPyBeginBlockThreads(); \
if (wxPyCBH_findCallback(m_myInst, #CBNAME)) { \
PyObject* s = wx2PyString(c); \
rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iiO)",a,b,s));\
Py_DECREF(s); \
} \
- wxPyEndBlockThreads(); \
+ wxPyEndBlockThreads(blocked); \
}
#define PYCALLBACK_STRING_INTINT(PCLASS, CBNAME) \
wxString CBNAME(int a, int b) { \
bool found; \
- wxPyBeginBlockThreads(); \
+ bool blocked = wxPyBeginBlockThreads(); \
wxString rval; \
if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \
PyObject* ro; \
Py_DECREF(ro); \
} \
} \
- wxPyEndBlockThreads(); \
+ wxPyEndBlockThreads(blocked); \
if (! found) \
rval = PCLASS::CBNAME(a, b); \
return rval; \
bool CBNAME(int a, int b, const wxString& c) { \
bool rval = 0; \
bool found; \
- wxPyBeginBlockThreads(); \
+ bool blocked = wxPyBeginBlockThreads(); \
if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \
PyObject* s = wx2PyString(c); \
rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iiO)",a,b,s));\
Py_DECREF(s); \
} \
- wxPyEndBlockThreads(); \
+ wxPyEndBlockThreads(blocked); \
if (! found) \
rval = PCLASS::CBNAME(a,b,c); \
return rval; \
long CBNAME(int a, int b) { \
long rval; \
bool found; \
- wxPyBeginBlockThreads(); \
+ bool blocked = wxPyBeginBlockThreads(); \
if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) \
rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(ii)", a,b)); \
- wxPyEndBlockThreads(); \
+ wxPyEndBlockThreads(blocked); \
if (! found) \
rval = PCLASS::CBNAME(a,b); \
return rval; \
bool CBNAME(int a, int b) { \
bool rval = 0; \
bool found; \
- wxPyBeginBlockThreads(); \
+ bool blocked = wxPyBeginBlockThreads(); \
if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) \
rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(ii)", a,b)); \
- wxPyEndBlockThreads(); \
+ wxPyEndBlockThreads(blocked); \
if (! found) \
rval = PCLASS::CBNAME(a,b); \
return rval; \
#define PYCALLBACK_DOUBLE_INTINT(PCLASS, CBNAME) \
double CBNAME(int a, int b) { \
bool found; \
- wxPyBeginBlockThreads(); \
+ bool blocked = wxPyBeginBlockThreads(); \
double rval; \
if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \
PyObject* ro; \
Py_DECREF(ro); Py_DECREF(str); \
} \
} \
- wxPyEndBlockThreads(); \
+ wxPyEndBlockThreads(blocked); \
if (! found) \
rval = PCLASS::CBNAME(a, b); \
return rval; \
#define PYCALLBACK__(PCLASS, CBNAME) \
void CBNAME() { \
bool found; \
- wxPyBeginBlockThreads(); \
+ bool blocked = wxPyBeginBlockThreads(); \
if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) \
wxPyCBH_callCallback(m_myInst, Py_BuildValue("()")); \
- wxPyEndBlockThreads(); \
+ wxPyEndBlockThreads(blocked); \
if (! found) \
PCLASS::CBNAME(); \
} \
bool CBNAME(size_t a, size_t b) { \
bool rval = 0; \
bool found; \
- wxPyBeginBlockThreads(); \
+ bool blocked = wxPyBeginBlockThreads(); \
if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) \
rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(ii)", a,b)); \
- wxPyEndBlockThreads(); \
+ wxPyEndBlockThreads(blocked); \
if (! found) \
rval = PCLASS::CBNAME(a,b); \
return rval; \
bool CBNAME(size_t a) { \
bool rval = 0; \
bool found; \
- wxPyBeginBlockThreads(); \
+ bool blocked = wxPyBeginBlockThreads(); \
if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) \
rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(i)", a)); \
- wxPyEndBlockThreads(); \
+ wxPyEndBlockThreads(blocked); \
if (! found) \
rval = PCLASS::CBNAME(a); \
return rval; \
#define PYCALLBACK_STRING_INT(PCLASS, CBNAME) \
wxString CBNAME(int a) { \
bool found; \
- wxPyBeginBlockThreads(); \
+ bool blocked = wxPyBeginBlockThreads(); \
wxString rval; \
if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \
PyObject* ro; \
Py_DECREF(ro); \
} \
} \
- wxPyEndBlockThreads(); \
+ wxPyEndBlockThreads(blocked); \
if (! found) \
rval = PCLASS::CBNAME(a); \
return rval; \
#define PYCALLBACK__INTSTRING(PCLASS, CBNAME) \
void CBNAME(int a, const wxString& c) { \
bool found; \
- wxPyBeginBlockThreads(); \
+ bool blocked = wxPyBeginBlockThreads(); \
if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \
PyObject* s = wx2PyString(c); \
wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iO)",a,s)); \
Py_DECREF(s); \
} \
- wxPyEndBlockThreads(); \
+ wxPyEndBlockThreads(blocked); \
if (! found) \
PCLASS::CBNAME(a,c); \
} \
bool CBNAME() { \
bool rval = 0; \
bool found; \
- wxPyBeginBlockThreads(); \
+ bool blocked = wxPyBeginBlockThreads(); \
if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) \
rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("()")); \
- wxPyEndBlockThreads(); \
+ wxPyEndBlockThreads(blocked); \
if (! found) \
rval = PCLASS::CBNAME(); \
return rval; \
#define PYCALLBACK__SIZETINT(PCLASS, CBNAME) \
void CBNAME(size_t a, int b) { \
bool found; \
- wxPyBeginBlockThreads(); \
+ bool blocked = wxPyBeginBlockThreads(); \
if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) \
wxPyCBH_callCallback(m_myInst, Py_BuildValue("(ii)", a,b)); \
- wxPyEndBlockThreads(); \
+ wxPyEndBlockThreads(blocked); \
if (! found) \
PCLASS::CBNAME(a,b); \
} \
#define PYCALLBACK__INTINTLONG(PCLASS, CBNAME) \
void CBNAME(int a, int b, long c) { \
bool found; \
- wxPyBeginBlockThreads(); \
+ bool blocked = wxPyBeginBlockThreads(); \
if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) \
wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iii)", a,b,c)); \
- wxPyEndBlockThreads(); \
+ wxPyEndBlockThreads(blocked); \
if (! found) \
PCLASS::CBNAME(a,b,c); \
} \
#define PYCALLBACK__INTINTDOUBLE(PCLASS, CBNAME) \
void CBNAME(int a, int b, double c) { \
bool found; \
- wxPyBeginBlockThreads(); \
+ bool blocked = wxPyBeginBlockThreads(); \
if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) \
wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iif)", a,b,c)); \
- wxPyEndBlockThreads(); \
+ wxPyEndBlockThreads(blocked); \
if (! found) \
PCLASS::CBNAME(a,b,c); \
} \
#define PYCALLBACK__INTINTBOOL(PCLASS, CBNAME) \
void CBNAME(int a, int b, bool c) { \
bool found; \
- wxPyBeginBlockThreads(); \
+ bool blocked = wxPyBeginBlockThreads(); \
if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) \
wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iii)", a,b,c)); \
- wxPyEndBlockThreads(); \
+ wxPyEndBlockThreads(blocked); \
if (! found) \
PCLASS::CBNAME(a,b,c); \
} \
void Draw(wxGrid& grid, wxGridCellAttr& attr,
wxDC& dc, const wxRect& rect,
int row, int col, bool isSelected) {
- wxPyBeginBlockThreads();
+ bool blocked = wxPyBeginBlockThreads();
if (wxPyCBH_findCallback(m_myInst, "Draw")) {
PyObject* go = wxPyMake_wxObject(&grid);
PyObject* dco = wxPyMake_wxObject(&dc);
Py_DECREF(dco);
Py_DECREF(ro);
}
- wxPyEndBlockThreads();
+ wxPyEndBlockThreads(blocked);
}
wxSize GetBestSize(wxGrid& grid, wxGridCellAttr& attr, wxDC& dc,
int row, int col) {
wxSize rval;
- wxPyBeginBlockThreads();
+ bool blocked = wxPyBeginBlockThreads();
if (wxPyCBH_findCallback(m_myInst, "GetBestSize")) {
PyObject* ro;
wxSize* ptr;
Py_DECREF(ro);
}
}
- wxPyEndBlockThreads();
+ wxPyEndBlockThreads(blocked);
return rval;
}
wxGridCellRenderer *Clone() const {
wxGridCellRenderer* rval = NULL;
- wxPyBeginBlockThreads();
+ bool blocked = wxPyBeginBlockThreads();
if (wxPyCBH_findCallback(m_myInst, "Clone")) {
PyObject* ro;
wxGridCellRenderer* ptr;
Py_DECREF(ro);
}
}
- wxPyEndBlockThreads();
+ wxPyEndBlockThreads(blocked);
return rval;
}
wxPyGridCellEditor() : wxGridCellEditor() {}
void Create(wxWindow* parent, wxWindowID id, wxEvtHandler* evtHandler) {
- wxPyBeginBlockThreads();
+ bool blocked = wxPyBeginBlockThreads();
if (wxPyCBH_findCallback(m_myInst, "Create")) {
PyObject* po = wxPyMake_wxObject(parent);
PyObject* eo = wxPyMake_wxObject(evtHandler);
Py_DECREF(po);
Py_DECREF(eo);
}
- wxPyEndBlockThreads();
+ wxPyEndBlockThreads(blocked);
}
void BeginEdit(int row, int col, wxGrid* grid) {
- wxPyBeginBlockThreads();
+ bool blocked = wxPyBeginBlockThreads();
if (wxPyCBH_findCallback(m_myInst, "BeginEdit")) {
PyObject* go = wxPyMake_wxObject(grid);
wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iiO)", row, col, go));
Py_DECREF(go);
}
- wxPyEndBlockThreads();
+ wxPyEndBlockThreads(blocked);
}
bool EndEdit(int row, int col, wxGrid* grid) {
bool rv = False;
- wxPyBeginBlockThreads();
+ bool blocked = wxPyBeginBlockThreads();
if (wxPyCBH_findCallback(m_myInst, "EndEdit")) {
PyObject* go = wxPyMake_wxObject(grid);
rv = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iiO)", row, col, go));
Py_DECREF(go);
}
- wxPyEndBlockThreads();
+ wxPyEndBlockThreads(blocked);
return rv;
}
wxGridCellEditor* Clone() const {
wxGridCellEditor* rval = NULL;
- wxPyBeginBlockThreads();
+ bool blocked = wxPyBeginBlockThreads();
if (wxPyCBH_findCallback(m_myInst, "Clone")) {
PyObject* ro;
wxGridCellEditor* ptr;
Py_DECREF(ro);
}
}
- wxPyEndBlockThreads();
+ wxPyEndBlockThreads(blocked);
return rval;
}
void Show(bool show, wxGridCellAttr *attr) {
bool found;
- wxPyBeginBlockThreads();
+ bool blocked = wxPyBeginBlockThreads();
if ((found = wxPyCBH_findCallback(m_myInst, "Show"))) {
PyObject* ao = wxPyMake_wxGridCellAttr(attr);
wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iO)", show, ao));
Py_DECREF(ao);
}
- wxPyEndBlockThreads();
+ wxPyEndBlockThreads(blocked);
if (! found)
wxGridCellEditor::Show(show, attr);
}
void PaintBackground(const wxRect& rectCell, wxGridCellAttr *attr) {
bool found;
- wxPyBeginBlockThreads();
+ bool blocked = wxPyBeginBlockThreads();
if ((found = wxPyCBH_findCallback(m_myInst, "PaintBackground)"))) {
PyObject* ao = wxPyMake_wxGridCellAttr(attr);
PyObject* ro = wxPyConstructObject((void*)&rectCell, wxT("wxRect"), 0);
Py_DECREF(ro);
Py_DECREF(ao);
}
- wxPyEndBlockThreads();
+ wxPyEndBlockThreads(blocked);
if (! found)
wxGridCellEditor::PaintBackground(rectCell, attr);
}
{
public:
%pythonAppend wxGridCellFloatEditor "self._setOORInfo(self)"
- wxGridCellFloatEditor();
+ wxGridCellFloatEditor(int width = -1, int precision = -1);
virtual wxString GetValue();
};
wxString GetValue(int row, int col) {
- wxPyBeginBlockThreads();
+ bool blocked = wxPyBeginBlockThreads();
wxString rval;
if (wxPyCBH_findCallback(m_myInst, "GetValue")) {
PyObject* ro;
Py_DECREF(ro);
}
}
- wxPyEndBlockThreads();
+ wxPyEndBlockThreads(blocked);
return rval;
}
void SetValue(int row, int col, const wxString& val) {
- wxPyBeginBlockThreads();
+ bool blocked = wxPyBeginBlockThreads();
if (wxPyCBH_findCallback(m_myInst, "SetValue")) {
PyObject* s = wx2PyString(val);
wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iiO)",row,col,s));
Py_DECREF(s);
}
- wxPyEndBlockThreads();
+ wxPyEndBlockThreads(blocked);
}
// the GetValue and SetValue python methods.
long GetValueAsLong( int row, int col ) {
long rval = 0;
- wxPyBeginBlockThreads();
+ bool blocked = wxPyBeginBlockThreads();
if (wxPyCBH_findCallback(m_myInst, "GetValue")) {
PyObject* ro;
PyObject* num;
Py_DECREF(ro);
}
}
- wxPyEndBlockThreads();
+ wxPyEndBlockThreads(blocked);
return rval;
}
double GetValueAsDouble( int row, int col ) {
double rval = 0.0;
- wxPyBeginBlockThreads();
+ bool blocked = wxPyBeginBlockThreads();
if (wxPyCBH_findCallback(m_myInst, "GetValue")) {
PyObject* ro;
PyObject* num;
Py_DECREF(ro);
}
}
- wxPyEndBlockThreads();
+ wxPyEndBlockThreads(blocked);
return rval;
}
}
void SetValueAsLong( int row, int col, long value ) {
- wxPyBeginBlockThreads();
+ bool blocked = wxPyBeginBlockThreads();
if (wxPyCBH_findCallback(m_myInst, "SetValue")) {
wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iii)", row, col, value));
}
- wxPyEndBlockThreads();
+ wxPyEndBlockThreads(blocked);
}
void SetValueAsDouble( int row, int col, double value ) {
- wxPyBeginBlockThreads();
+ bool blocked = wxPyBeginBlockThreads();
if (wxPyCBH_findCallback(m_myInst, "SetValue")) {
wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iid)", row, col, value));
}
- wxPyEndBlockThreads();
+ wxPyEndBlockThreads(blocked);
}
void SetValueAsBool( int row, int col, bool value ) {
bool operator!=( const wxGridCellCoords& other ) const;
%extend {
- PyObject* asTuple() {
+ PyObject* Get() {
PyObject* tup = PyTuple_New(2);
PyTuple_SET_ITEM(tup, 0, PyInt_FromLong(self->GetRow()));
PyTuple_SET_ITEM(tup, 1, PyInt_FromLong(self->GetCol()));
}
}
%pythoncode {
- def __str__(self): return str(self.asTuple())
- def __repr__(self): return 'wxGridCellCoords'+str(self.asTuple())
- def __len__(self): return len(self.asTuple())
+ asTuple = wx._deprecated(Get, "asTuple is deprecated, use `Get` instead")
+ def __str__(self): return str(self.Get())
+ def __repr__(self): return 'wxGridCellCoords'+str(self.Get())
+ def __len__(self): return len(self.Get())
def __getitem__(self, index): return self.asTuple()[index]
def __setitem__(self, index, val):
if index == 0: self.SetRow(val)
%pythoncode {
SelectCells = wxGridSelectCells
SelectRows = wxGridSelectRows
- SelectColumns = wxGridSelectColumns,
+ SelectColumns = wxGridSelectColumns
}
bool CreateGrid( int numRows, int numCols,
wxWindow* GetGridCornerLabelWindow();
+ static wxVisualAttributes
+ GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
};
projects / wxWidgets.git / blobdiff