#include <wx/grid.h>
#include <wx/generic/gridctrl.h>
- DECLARE_DEF_STRING(PanelNameStr);
- DECLARE_DEF_STRING2(DateTimeFormatStr, wxT("%c"));
- static const wxString wxPyEmptyString(wxT(""));
%}
%import windows.i
%pythoncode { wx = core }
+
%include _grid_rename.i
+MAKE_CONST_WXSTRING_NOSWIG(EmptyString);
+MAKE_CONST_WXSTRING_NOSWIG(PanelNameStr);
+MAKE_CONST_WXSTRING2(DateTimeFormatStr, wxT("%c"));
+
+
//---------------------------------------------------------------------------
// OOR related typemaps and helper functions
/* Otherwise make a new wrapper for it the old fashioned way and \
give it the OOR treatment */ \
if (! target) { \
- target = wxPyConstructObject(source, wxT(#TYPE), FALSE); \
+ target = wxPyConstructObject(source, wxT(#TYPE), False); \
if (target) \
source->SetClientObject(new wxPyOORClientData(target)); \
} \
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;
}
// Let SWIG know about it so it can create the Python version
class wxPyGridCellRenderer : public wxGridCellRenderer {
public:
- %addtofunc wxPyGridCellRenderer "self._setCallbackInfo(self, PyGridCellRenderer);self._setOORInfo(self)"
+ %pythonAppend wxPyGridCellRenderer "self._setCallbackInfo(self, PyGridCellRenderer);self._setOORInfo(self)"
wxPyGridCellRenderer();
void _setCallbackInfo(PyObject* self, PyObject* _class);
class wxGridCellStringRenderer : public wxGridCellRenderer
{
public:
- %addtofunc wxGridCellStringRenderer "self._setOORInfo(self)"
+ %pythonAppend wxGridCellStringRenderer "self._setOORInfo(self)"
wxGridCellStringRenderer();
};
class wxGridCellNumberRenderer : public wxGridCellStringRenderer
{
public:
- %addtofunc wxGridCellNumberRenderer "self._setOORInfo(self)"
+ %pythonAppend wxGridCellNumberRenderer "self._setOORInfo(self)"
wxGridCellNumberRenderer();
};
class wxGridCellFloatRenderer : public wxGridCellStringRenderer
{
public:
- %addtofunc wxGridCellFloatRenderer "self._setOORInfo(self)"
+ %pythonAppend wxGridCellFloatRenderer "self._setOORInfo(self)"
wxGridCellFloatRenderer(int width = -1, int precision = -1);
int GetWidth() const;
class wxGridCellBoolRenderer : public wxGridCellRenderer
{
public:
- %addtofunc wxGridCellBoolRenderer "self._setOORInfo(self)"
+ %pythonAppend wxGridCellBoolRenderer "self._setOORInfo(self)"
wxGridCellBoolRenderer();
};
class wxGridCellDateTimeRenderer : public wxGridCellStringRenderer
{
public:
- %addtofunc wxGridCellDateTimeRenderer "self._setOORInfo(self)"
+ %pythonAppend wxGridCellDateTimeRenderer "self._setOORInfo(self)"
wxGridCellDateTimeRenderer(wxString outformat = wxPyDateTimeFormatStr,
wxString informat = wxPyDateTimeFormatStr);
};
class wxGridCellEnumRenderer : public wxGridCellStringRenderer
{
public:
- %addtofunc wxGridCellEnumRenderer "self._setOORInfo(self)"
+ %pythonAppend wxGridCellEnumRenderer "self._setOORInfo(self)"
wxGridCellEnumRenderer( const wxString& choices = wxPyEmptyString );
};
class wxGridCellAutoWrapStringRenderer : public wxGridCellStringRenderer
{
public:
- %addtofunc wxGridCellAutoWrapStringRenderer "self._setOORInfo(self)"
+ %pythonAppend wxGridCellAutoWrapStringRenderer "self._setOORInfo(self)"
wxGridCellAutoWrapStringRenderer();
};
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 rv = False;
+ 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);
}
// Let SWIG know about it so it can create the Python version
class wxPyGridCellEditor : public wxGridCellEditor {
public:
- %addtofunc wxPyGridCellEditor "self._setCallbackInfo(self, PyGridCellEditor);self._setOORInfo(self)"
+ %pythonAppend wxPyGridCellEditor "self._setCallbackInfo(self, PyGridCellEditor);self._setOORInfo(self)"
wxPyGridCellEditor();
void _setCallbackInfo(PyObject* self, PyObject* _class);
class wxGridCellTextEditor : public wxGridCellEditor
{
public:
- %addtofunc wxGridCellTextEditor "self._setOORInfo(self)"
+ %pythonAppend wxGridCellTextEditor "self._setOORInfo(self)"
wxGridCellTextEditor();
virtual wxString GetValue();
};
class wxGridCellNumberEditor : public wxGridCellTextEditor
{
public:
- %addtofunc wxGridCellNumberEditor "self._setOORInfo(self)"
+ %pythonAppend wxGridCellNumberEditor "self._setOORInfo(self)"
wxGridCellNumberEditor(int min = -1, int max = -1);
virtual wxString GetValue();
};
class wxGridCellFloatEditor : public wxGridCellTextEditor
{
public:
- %addtofunc wxGridCellFloatEditor "self._setOORInfo(self)"
+ %pythonAppend wxGridCellFloatEditor "self._setOORInfo(self)"
wxGridCellFloatEditor();
virtual wxString GetValue();
};
class wxGridCellBoolEditor : public wxGridCellEditor
{
public:
- %addtofunc wxGridCellBoolEditor "self._setOORInfo(self)"
+ %pythonAppend wxGridCellBoolEditor "self._setOORInfo(self)"
wxGridCellBoolEditor();
virtual wxString GetValue();
};
class wxGridCellChoiceEditor : public wxGridCellEditor
{
public:
- %addtofunc wxGridCellChoiceEditor "self._setOORInfo(self)"
- wxGridCellChoiceEditor(int LCOUNT = 0,
- const wxString* choices = NULL,
- bool allowOthers = FALSE);
+ %pythonAppend wxGridCellChoiceEditor "self._setOORInfo(self)"
+ wxGridCellChoiceEditor(int choices = 0,
+ const wxString* choices_array = NULL,
+ bool allowOthers = False);
virtual wxString GetValue();
};
class wxGridCellEnumEditor : public wxGridCellChoiceEditor
{
public:
- %addtofunc wxGridCellEnumEditor "self._setOORInfo(self)"
+ %pythonAppend wxGridCellEnumEditor "self._setOORInfo(self)"
wxGridCellEnumEditor( const wxString& choices = wxPyEmptyString );
virtual wxString GetValue();
};
class wxGridCellAutoWrapStringEditor : public wxGridCellTextEditor
{
public:
- %addtofunc wxGridCellAutoWrapStringEditor "self._setOORInfo(self)"
+ %pythonAppend wxGridCellAutoWrapStringEditor "self._setOORInfo(self)"
wxGridCellAutoWrapStringEditor();
virtual wxString GetValue();
};
}
}
- %addtofunc wxGridCellAttr "self._setOORInfo(self)"
+ %pythonAppend wxGridCellAttr "self._setOORInfo(self)"
wxGridCellAttr(wxGridCellAttr *attrDefault = NULL);
void SetFont(const wxFont& font);
void SetAlignment(int hAlign, int vAlign);
void SetSize(int num_rows, int num_cols);
- void SetOverflow( bool allow = TRUE );
- void SetReadOnly(bool isReadOnly = TRUE);
+ void SetOverflow( bool allow = True );
+ void SetReadOnly(bool isReadOnly = True);
void SetRenderer(wxGridCellRenderer *renderer);
void SetEditor(wxGridCellEditor* editor);
wxColour GetTextColour() const;
wxColour GetBackgroundColour() const;
wxFont GetFont() const;
- void GetAlignment(int *OUTPUT, int *OUTPUT) const;
- void GetSize(int *OUTPUT, int *OUTPUT) const;
+
+ DocDeclA(
+ void, GetAlignment(int *OUTPUT, int *OUTPUT) const,
+ "GetAlignment() -> (hAlign, vAlign)");
+
+ DocDeclA(
+ void, GetSize(int *OUTPUT, int *OUTPUT) const,
+ "GetSize() -> (num_rows, num_cols)");
+
bool GetOverflow() const;
wxGridCellRenderer *GetRenderer(wxGrid* grid, int row, int col) const;
wxGridCellEditor *GetEditor(wxGrid* grid, int row, int col) const;
class wxGridCellAttrProvider
{
public:
- %addtofunc wxGridCellAttrProvider "self._setOORInfo(self)"
+ %pythonAppend wxGridCellAttrProvider "self._setOORInfo(self)"
wxGridCellAttrProvider();
// ???? virtual ~wxGridCellAttrProvider();
class wxPyGridCellAttrProvider : public wxGridCellAttrProvider
{
public:
- %addtofunc wxPyGridCellAttrProvider "self._setCallbackInfo(self, PyGridCellAttrProvider)"
+ %pythonAppend wxPyGridCellAttrProvider "self._setCallbackInfo(self, PyGridCellAttrProvider)"
wxPyGridCellAttrProvider();
void _setCallbackInfo(PyObject* self, PyObject* _class);
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 ) {
class wxPyGridTableBase : public wxGridTableBase
{
public:
- %addtofunc wxPyGridTableBase "self._setCallbackInfo(self, PyGridTableBase);self._setOORInfo(self)"
+ %pythonAppend wxPyGridTableBase "self._setCallbackInfo(self, PyGridTableBase);self._setOORInfo(self)"
wxPyGridTableBase();
void _setCallbackInfo(PyObject* self, PyObject* _class);
class wxGridStringTable : public wxGridTableBase
{
public:
- %addtofunc wxGridStringTable "self._setOORInfo(self)"
+ %pythonAppend wxGridStringTable "self._setOORInfo(self)"
wxGridStringTable( int numRows=0, int numCols=0 );
};
//---------------------------------------------------------------------------
-%noautorepr wxGridCellCoords;
-
-class wxGridCellCoords
-{
-public:
- wxGridCellCoords( int r=-1, int c=-1 );
- ~wxGridCellCoords();
-
- int GetRow() const;
- void SetRow( int n );
- int GetCol() const;
- void SetCol( int n );
- void Set( int row, int col );
-
- bool operator==( const wxGridCellCoords& other ) const;
- bool operator!=( const wxGridCellCoords& other ) const;
-
- %extend {
- PyObject* asTuple() {
- PyObject* tup = PyTuple_New(2);
- PyTuple_SET_ITEM(tup, 0, PyInt_FromLong(self->GetRow()));
- PyTuple_SET_ITEM(tup, 1, PyInt_FromLong(self->GetCol()));
- return tup;
- }
- }
- %pythoncode {
- def __str__(self): return str(self.asTuple())
- def __repr__(self): return 'wxGridCellCoords'+str(self.asTuple())
- def __len__(self): return len(self.asTuple())
- def __getitem__(self, index): return self.asTuple()[index]
- def __setitem__(self, index, val):
- if index == 0: self.SetRow(val)
- elif index == 1: self.SetCol(val)
- else: raise IndexError
- }
-
-};
// Typemap to allow conversion of sequence objects to wxGridCellCoords...
%typemap(in) wxGridCellCoords& (wxGridCellCoords temp) {
%{
bool wxGridCellCoords_helper(PyObject* source, wxGridCellCoords** obj) {
+ if (source == Py_None) {
+ **obj = wxGridCellCoords(-1,-1);
+ return True;
+ }
+
// If source is an object instance then it may already be the right type
if (wxPySwigInstance_Check(source)) {
wxGridCellCoords* ptr;
if (! wxPyConvertSwigPtr(source, (void **)&ptr, wxT("wxGridCellCoords")))
goto error;
*obj = ptr;
- return TRUE;
+ return True;
}
// otherwise a 2-tuple of integers is expected
else if (PySequence_Check(source) && PyObject_Length(source) == 2) {
**obj = wxGridCellCoords(PyInt_AsLong(o1), PyInt_AsLong(o2));
Py_DECREF(o1);
Py_DECREF(o2);
- return TRUE;
+ return True;
}
error:
PyErr_SetString(PyExc_TypeError, "Expected a 2-tuple of integers or a wxGridCellCoords object.");
- return FALSE;
+ return False;
}
if (wxPySwigInstance_Check(source) &&
wxPyConvertSwigPtr(source, (void **)&ptr, wxT("wxGridCellCoords")))
- return true;
+ return True;
PyErr_Clear();
if (PySequence_Check(source) && PySequence_Length(source) == 2)
- return true;
+ return True;
- return false;
+ return False;
}
%}
}
%}
+
+
+
+
+class wxGridCellCoords
+{
+public:
+ wxGridCellCoords( int r=-1, int c=-1 );
+ ~wxGridCellCoords();
+
+ int GetRow() const;
+ void SetRow( int n );
+ int GetCol() const;
+ void SetCol( int n );
+ void Set( int row, int col );
+
+ bool operator==( const wxGridCellCoords& other ) const;
+ bool operator!=( const wxGridCellCoords& other ) const;
+
+ %extend {
+ PyObject* asTuple() {
+ PyObject* tup = PyTuple_New(2);
+ PyTuple_SET_ITEM(tup, 0, PyInt_FromLong(self->GetRow()));
+ PyTuple_SET_ITEM(tup, 1, PyInt_FromLong(self->GetCol()));
+ return tup;
+ }
+ }
+ %pythoncode {
+ def __str__(self): return str(self.asTuple())
+ def __repr__(self): return 'wxGridCellCoords'+str(self.asTuple())
+ def __len__(self): return len(self.asTuple())
+ def __getitem__(self, index): return self.asTuple()[index]
+ def __setitem__(self, index, val):
+ if index == 0: self.SetRow(val)
+ elif index == 1: self.SetCol(val)
+ else: raise IndexError
+ }
+
+};
+
+
//---------------------------------------------------------------------------
//---------------------------------------------------------------------------
// The grid itself
class wxGrid : public wxScrolledWindow
{
public:
- %addtofunc wxGrid "self._setOORInfo(self)"
+ %pythonAppend wxGrid "self._setOORInfo(self)"
wxGrid( wxWindow *parent,
wxWindowID id,
const wxString& name = wxPyPanelNameStr);
- enum wxGridSelectionModes {wxGridSelectCells,
- wxGridSelectRows,
- wxGridSelectColumns};
+ enum wxGridSelectionModes {
+ wxGridSelectCells,
+ wxGridSelectRows,
+ wxGridSelectColumns
+ };
+ %pythoncode {
+ SelectCells = wxGridSelectCells
+ SelectRows = wxGridSelectRows
+ SelectColumns = wxGridSelectColumns
+ }
bool CreateGrid( int numRows, int numCols,
WXGRIDSELECTIONMODES selmode = wxGrid::wxGridSelectCells );
wxGridTableBase * GetTable() const;
- bool SetTable( wxGridTableBase *table, bool takeOwnership=FALSE,
+ bool SetTable( wxGridTableBase *table, bool takeOwnership=False,
WXGRIDSELECTIONMODES selmode =
wxGrid::wxGridSelectCells );
void ClearGrid();
- bool InsertRows( int pos = 0, int numRows = 1, bool updateLabels=TRUE );
- bool AppendRows( int numRows = 1, bool updateLabels=TRUE );
- bool DeleteRows( int pos = 0, int numRows = 1, bool updateLabels=TRUE );
- bool InsertCols( int pos = 0, int numCols = 1, bool updateLabels=TRUE );
- bool AppendCols( int numCols = 1, bool updateLabels=TRUE );
- bool DeleteCols( int pos = 0, int numCols = 1, bool updateLabels=TRUE );
+ bool InsertRows( int pos = 0, int numRows = 1, bool updateLabels=True );
+ bool AppendRows( int numRows = 1, bool updateLabels=True );
+ bool DeleteRows( int pos = 0, int numRows = 1, bool updateLabels=True );
+ bool InsertCols( int pos = 0, int numCols = 1, bool updateLabels=True );
+ bool AppendCols( int numCols = 1, bool updateLabels=True );
+ bool DeleteCols( int pos = 0, int numCols = 1, bool updateLabels=True );
// this function is called when the current cell highlight must be redrawn
// //
// void StringToLines( const wxString& value, wxArrayString& lines );
- void GetTextBoxSize( wxDC& dc,
- wxArrayString& lines,
- long *OUTPUT, long *OUTPUT );
+ DocDeclA(
+ void, GetTextBoxSize( wxDC& dc, wxArrayString& lines,
+ long *OUTPUT, long *OUTPUT ),
+ "GetTextBoxSize(DC dc, list lines) -> (width, height)");
// ------
void EndBatch();
int GetBatchCount();
void ForceRefresh();
- void Refresh(bool eraseb=TRUE, const wxRect* rect= NULL);
// ------ edit control functions
bool IsEditable();
void EnableEditing( bool edit );
- void EnableCellEditControl( bool enable = TRUE );
+ void EnableCellEditControl( bool enable = True );
void DisableCellEditControl();
bool CanEnableCellControl() const;
bool IsCellEditControlEnabled() const;
// check to see if a cell is either wholly visible (the default arg) or
// at least partially visible in the grid window
//
- bool IsVisible( int row, int col, bool wholeCellVisible = TRUE );
- // TODO: ??? bool IsVisible( const wxGridCellCoords& coords, bool wholeCellVisible = TRUE );
+ bool IsVisible( int row, int col, bool wholeCellVisible = True );
+ // TODO: ??? bool IsVisible( const wxGridCellCoords& coords, bool wholeCellVisible = True );
void MakeCellVisible( int row, int col );
// TODO: ??? void MakeCellVisible( const wxGridCellCoords& coords );
wxColour GetLabelBackgroundColour();
wxColour GetLabelTextColour();
wxFont GetLabelFont();
- void GetRowLabelAlignment( int *OUTPUT, int *OUTPUT );
- void GetColLabelAlignment( int *OUTPUT, int *OUTPUT );
+
+ DocDeclA(
+ void, GetRowLabelAlignment( int *OUTPUT, int *OUTPUT ),
+ "GetRowLabelAlignment() -> (horiz, vert)");
+
+ DocDeclA(
+ void, GetColLabelAlignment( int *OUTPUT, int *OUTPUT ),
+ "GetColLabelAlignment() -> (horiz, vert)");
+
int GetColLabelTextOrientation();
wxString GetRowLabelValue( int row );
wxString GetColLabelValue( int col );
void SetCellHighlightPenWidth(int width);
void SetCellHighlightROPenWidth(int width);
- void EnableDragRowSize( bool enable = TRUE );
+ void EnableDragRowSize( bool enable = True );
void DisableDragRowSize();
bool CanDragRowSize();
- void EnableDragColSize( bool enable = TRUE );
+ void EnableDragColSize( bool enable = True );
void DisableDragColSize();
bool CanDragColSize();
- void EnableDragGridSize(bool enable = TRUE);
+ void EnableDragGridSize(bool enable = True);
void DisableDragGridSize();
bool CanDragGridSize();
void SetColFormatFloat(int col, int width = -1, int precision = -1);
void SetColFormatCustom(int col, const wxString& typeName);
- void EnableGridLines( bool enable = TRUE );
+ void EnableGridLines( bool enable = True );
bool GridLinesEnabled();
// ------ row and col formatting
wxColour GetCellTextColour( int row, int col );
wxFont GetDefaultCellFont();
wxFont GetCellFont( int row, int col );
- void GetDefaultCellAlignment( int *OUTPUT, int *OUTPUT );
- void GetCellAlignment( int row, int col, int *OUTPUT, int *OUTPUT );
+
+ DocDeclA(
+ void, GetDefaultCellAlignment( int *OUTPUT, int *OUTPUT ),
+ "GetDefaultCellAlignment() -> (horiz, vert)");
+
+ DocDeclA(
+ void, GetCellAlignment( int row, int col, int *OUTPUT, int *OUTPUT ),
+ "GetCellAlignment() -> (horiz, vert)");
+
bool GetDefaultCellOverflow();
bool GetCellOverflow( int row, int col );
- void GetCellSize( int row, int col, int *OUTPUT, int *OUTPUT );
- void SetDefaultRowSize( int height, bool resizeExistingRows = FALSE );
+ DocDeclA(
+ void, GetCellSize( int row, int col, int *OUTPUT, int *OUTPUT ),
+ "GetCellSize(int row, int col) -> (num_rows, num_cols)");
+
+ void SetDefaultRowSize( int height, bool resizeExistingRows = False );
void SetRowSize( int row, int height );
- void SetDefaultColSize( int width, bool resizeExistingCols = FALSE );
+ void SetDefaultColSize( int width, bool resizeExistingCols = False );
void SetColSize( int col, int width );
// automatically size the column or row to fit to its contents, if
- // setAsMin is TRUE, this optimal width will also be set as minimal width
+ // setAsMin is True, this optimal width will also be set as minimal width
// for this column
- void AutoSizeColumn( int col, bool setAsMin = TRUE );
- void AutoSizeRow( int row, bool setAsMin = TRUE );
+ void AutoSizeColumn( int col, bool setAsMin = True );
+ void AutoSizeRow( int row, bool setAsMin = True );
// auto size all columns (very ineffective for big grids!)
- void AutoSizeColumns( bool setAsMin = TRUE );
- void AutoSizeRows( bool setAsMin = TRUE );
+ void AutoSizeColumns( bool setAsMin = True );
+ void AutoSizeRows( bool setAsMin = True );
// auto size the grid, that is make the columns/rows of the "right" size
// and also set the grid size to just fit its contents
void SetCellValue( int row, int col, const wxString& s );
// TODO: ??? void SetCellValue( const wxGridCellCoords& coords, const wxString& s )
- // returns TRUE if the cell can't be edited
+ // returns True if the cell can't be edited
bool IsReadOnly(int row, int col) const;
// make the cell editable/readonly
- void SetReadOnly(int row, int col, bool isReadOnly = TRUE);
+ void SetReadOnly(int row, int col, bool isReadOnly = True);
// ------ selections of blocks of cells
//
- void SelectRow( int row, bool addToSelected = FALSE );
- void SelectCol( int col, bool addToSelected = FALSE );
+ void SelectRow( int row, bool addToSelected = False );
+ void SelectCol( int col, bool addToSelected = False );
void SelectBlock( int topRow, int leftCol, int bottomRow, int rightCol,
- bool addToSelected = FALSE );
+ bool addToSelected = False );
// TODO: ??? void SelectBlock( const wxGridCellCoords& topLeft,
// TODO: ??? const wxGridCellCoords& bottomRight )
{
public:
wxGridEvent(int id, wxEventType type, wxGrid* obj,
- int row=-1, int col=-1, int x=-1, int y=-1, bool sel = TRUE,
- bool control=FALSE, bool shift=FALSE, bool alt=FALSE, bool meta=FALSE);
+ int row=-1, int col=-1, int x=-1, int y=-1, bool sel = True,
+ bool control=False, bool shift=False, bool alt=False, bool meta=False);
virtual int GetRow();
virtual int GetCol();
public:
wxGridSizeEvent(int id, wxEventType type, wxGrid* obj,
int rowOrCol=-1, int x=-1, int y=-1,
- bool control=FALSE, bool shift=FALSE, bool alt=FALSE, bool meta=FALSE);
+ bool control=False, bool shift=False, bool alt=False, bool meta=False);
int GetRowOrCol();
wxPoint GetPosition();
wxGridRangeSelectEvent(int id, wxEventType type, wxGrid* obj,
const wxGridCellCoords& topLeft,
const wxGridCellCoords& bottomRight,
- bool sel = TRUE,
- bool control=FALSE, bool shift=FALSE,
- bool alt=FALSE, bool meta=FALSE);
+ bool sel = True,
+ bool control=False, bool shift=False,
+ bool alt=False, bool meta=False);
wxGridCellCoords GetTopLeftCoords();
wxGridCellCoords GetBottomRightCoords();
projects / wxWidgets.git / blobdiff