#ifndef OLD_GRID
%{
-#include "export.h"
+#include "wxPython.h"
#include <wx/grid.h>
#include <wx/generic/gridctrl.h>
%}
%}
//---------------------------------------------------------------------------
+// OOR related typemaps and helper functions
+
+%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)
+
+%}
+
//---------------------------------------------------------------------------
// Macros, similar to what's in helpers.h, to aid in the creation of
// virtual methods that are able to make callbacks to Python. Many of these
#define PYCALLBACK__GCAINTINT(PCLASS, CBNAME) \
void CBNAME(wxGridCellAttr *attr, int a, int b) { \
- wxPyBeginBlockThreads(); \
+ wxPyBeginBlockThreads(); \
bool found; \
if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \
- PyObject* obj = wxPyConstructObject((void*)attr, "wxGridCellAttr", 0);\
- wxPyCBH_callCallback(m_myInst, Py_BuildValue("(Oii)", obj, a, b)); \
+ PyObject* obj = wxPyMake_wxGridCellAttr(attr); \
+ wxPyCBH_callCallback(m_myInst, Py_BuildValue("(Oii)", obj, a, b)); \
Py_DECREF(obj); \
} \
- wxPyEndBlockThreads(); \
+ wxPyEndBlockThreads(); \
if (! found) \
PCLASS::CBNAME(attr, a, b); \
} \
#define PYCALLBACK__GCAINT(PCLASS, CBNAME) \
void CBNAME(wxGridCellAttr *attr, int val) { \
- wxPyBeginBlockThreads(); \
+ wxPyBeginBlockThreads(); \
bool found; \
if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \
- PyObject* obj = wxPyConstructObject((void*)attr, "wxGridCellAttr", 0);\
+ PyObject* obj = wxPyMake_wxGridCellAttr(attr); \
wxPyCBH_callCallback(m_myInst, Py_BuildValue("(Oi)", obj, val)); \
Py_DECREF(obj); \
} \
#define PYCALLBACK__INTINTSTRING_pure(CBNAME) \
void CBNAME(int a, int b, const wxString& c) { \
wxPyBeginBlockThreads(); \
- if (wxPyCBH_findCallback(m_myInst, #CBNAME)) \
- wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iiO)",a,b,wx2PyString(c)));\
+ 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(); \
}
bool rval = 0; \
bool found; \
wxPyBeginBlockThreads(); \
- if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) \
- rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iiO)", a,b,wx2PyString(c)));\
+ 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(); \
if (! found) \
rval = PCLASS::CBNAME(a,b,c); \
Py_DECREF(ro); Py_DECREF(str); \
} \
} \
- wxPyEndBlockThreads(); \
+ wxPyEndBlockThreads(); \
if (! found) \
rval = PCLASS::CBNAME(a, b); \
return rval; \
#define PYCALLBACK__(PCLASS, CBNAME) \
void CBNAME() { \
bool found; \
- wxPyBeginBlockThreads(); \
+ wxPyBeginBlockThreads(); \
if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) \
wxPyCBH_callCallback(m_myInst, Py_BuildValue("()")); \
- wxPyEndBlockThreads(); \
+ wxPyEndBlockThreads(); \
if (! found) \
PCLASS::CBNAME(); \
} \
bool CBNAME(size_t a, size_t b) { \
bool rval = 0; \
bool found; \
- wxPyBeginBlockThreads(); \
+ wxPyBeginBlockThreads(); \
if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) \
rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(ii)", a,b)); \
- wxPyEndBlockThreads(); \
+ wxPyEndBlockThreads(); \
if (! found) \
rval = PCLASS::CBNAME(a,b); \
return rval; \
bool CBNAME(size_t a) { \
bool rval = 0; \
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; \
void CBNAME(int a, const wxString& c) { \
bool found; \
wxPyBeginBlockThreads(); \
- if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) \
- wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iO)", a, wx2PyString(c))); \
+ if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \
+ PyObject* s = wx2PyString(c); \
+ wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iO)",a,s)); \
+ Py_DECREF(s); \
+ } \
wxPyEndBlockThreads(); \
if (! found) \
PCLASS::CBNAME(a,c); \
-%}
-
-//---------------------------------------------------------------------------
-// OOR related typemaps and helper functions
-
-%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)
-
%}
//---------------------------------------------------------------------------
int row, int col, bool isSelected) {
wxPyBeginBlockThreads();
if (wxPyCBH_findCallback(m_myInst, "Draw")) {
- wxPyCBH_callCallback(m_myInst,
- Py_BuildValue("(OOOOiii)",
- wxPyConstructObject((void*)&grid, "wxGrid", 0),
- wxPyConstructObject((void*)&attr, "wxGridCellAttr", 0),
- wxPyConstructObject((void*)&dc, "wxDC", 0),
- wxPyConstructObject((void*)&rect, "wxRect", 0),
- row, col, isSelected));
+ PyObject* go = wxPyMake_wxObject(&grid);
+ PyObject* dco = wxPyMake_wxObject(&dc);
+ PyObject* ao = wxPyMake_wxGridCellAttr(&attr);
+ PyObject* ro = wxPyConstructObject((void*)&rect, "wxRect", 0);
+
+ wxPyCBH_callCallback(m_myInst, Py_BuildValue("(OOOOiii)", go, ao, dco, ro,
+ row, col, isSelected));
+ Py_DECREF(go);
+ Py_DECREF(ao);
+ Py_DECREF(dco);
+ Py_DECREF(ro);
}
wxPyEndBlockThreads();
}
if (wxPyCBH_findCallback(m_myInst, "GetBestSize")) {
PyObject* ro;
wxSize* ptr;
- ro = wxPyCBH_callCallbackObj(m_myInst,
- Py_BuildValue("(OOOii)",
- wxPyConstructObject((void*)&grid, "wxGrid", 0),
- wxPyConstructObject((void*)&attr, "wxGridCellAttr", 0),
- wxPyConstructObject((void*)&dc, "wxDC", 0),
- row, col));
+ PyObject* go = wxPyMake_wxObject(&grid);
+ PyObject* dco = wxPyMake_wxObject(&dc);
+ PyObject* ao = wxPyMake_wxGridCellAttr(&attr);
+
+ ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("(OOOii)",
+ go, ao, dco,
+ row, col));
+ Py_DECREF(go);
+ Py_DECREF(ao);
+ Py_DECREF(dco);
+
if (ro) {
const char* errmsg = "GetBestSize should return a 2-tuple of integers or a wxSize object.";
if (!SWIG_GetPtrObj(ro, (void **)&ptr, "_wxSize_p")) {
void Create(wxWindow* parent, wxWindowID id, wxEvtHandler* evtHandler) {
wxPyBeginBlockThreads();
if (wxPyCBH_findCallback(m_myInst, "Create")) {
- wxPyCBH_callCallback(m_myInst,
- Py_BuildValue("(OiO)",
- wxPyConstructObject((void*)parent, "wxWindow", 0),
- id,
- wxPyConstructObject((void*)evtHandler, "wxEvtHandler", 0)));
+ PyObject* po = wxPyMake_wxObject(parent);
+ PyObject* eo = wxPyMake_wxObject(evtHandler);
+
+ wxPyCBH_callCallback(m_myInst, Py_BuildValue("(OiO)", po, id, eo));
+ Py_DECREF(po);
+ Py_DECREF(eo);
}
wxPyEndBlockThreads();
}
void BeginEdit(int row, int col, wxGrid* grid) {
wxPyBeginBlockThreads();
if (wxPyCBH_findCallback(m_myInst, "BeginEdit")) {
- wxPyCBH_callCallback(m_myInst,
- Py_BuildValue("(iiO)", row, col,
- wxPyConstructObject((void*)grid, "wxGrid", 0)));
+ PyObject* go = wxPyMake_wxObject(grid);
+ wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iiO)", row, col, go));
+ Py_DECREF(go);
}
wxPyEndBlockThreads();
}
bool rv = FALSE;
wxPyBeginBlockThreads();
if (wxPyCBH_findCallback(m_myInst, "EndEdit")) {
- rv = wxPyCBH_callCallback(m_myInst,
- Py_BuildValue("(iiO)", row, col,
- wxPyConstructObject((void*)grid, "wxGrid", 0)));
+ PyObject* go = wxPyMake_wxObject(grid);
+ rv = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iiO)", row, col, go));
+ Py_DECREF(go);
}
wxPyEndBlockThreads();
return rv;
void Show(bool show, wxGridCellAttr *attr) {
bool found;
wxPyBeginBlockThreads();
- if ((found = wxPyCBH_findCallback(m_myInst, "Show")))
- wxPyCBH_callCallback(m_myInst,
- Py_BuildValue("(iO)", show,
- wxPyConstructObject((void*)attr, "wxGridCellAttr", 0)));
+ 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();
if (! found)
wxGridCellEditor::Show(show, attr);
void PaintBackground(const wxRect& rectCell, wxGridCellAttr *attr) {
- bool found; \
+ bool found;
wxPyBeginBlockThreads();
- if ((found = wxPyCBH_findCallback(m_myInst, "PaintBackground)")))
- wxPyCBH_callCallback(m_myInst,
- Py_BuildValue("(OO)",
- wxPyConstructObject((void*)&rectCell, "wxRect", 0),
- wxPyConstructObject((void*)attr, "wxGridCellAttr", 0)));
+ if ((found = wxPyCBH_findCallback(m_myInst, "PaintBackground)"))) {
+ PyObject* ao = wxPyMake_wxGridCellAttr(attr);
+ PyObject* ro = wxPyConstructObject((void*)&rectCell, "wxRect", 0);
+
+ wxPyCBH_callCallback(m_myInst, Py_BuildValue("(OO)", ro, ao));
+
+ Py_DECREF(ro);
+ Py_DECREF(ao);
+ }
wxPyEndBlockThreads();
if (! found)
wxGridCellEditor::PaintBackground(rectCell, attr);
void SetBackgroundColour(const wxColour& colBack);
void SetFont(const wxFont& font);
void SetAlignment(int hAlign, int vAlign);
+ void SetSize(int num_rows, int num_cols);
+ void SetOverflow( bool allow );
void SetReadOnly(bool isReadOnly = TRUE);
void SetRenderer(wxGridCellRenderer *renderer);
wxColour GetBackgroundColour() const;
wxFont GetFont() const;
void GetAlignment(int *OUTPUT, int *OUTPUT) const;
+ void GetSize(int *num_rows, int *num_cols) const;
+ bool GetOverflow() const;
wxGridCellRenderer *GetRenderer(wxGrid* grid, int row, int col) const;
wxGridCellEditor *GetEditor(wxGrid* grid, int row, int col) const;
void SetValue(int row, int col, const wxString& val) {
wxPyBeginBlockThreads();
if (wxPyCBH_findCallback(m_myInst, "SetValue")) {
- wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iiO)",row,col,wx2PyString(val)));
+ PyObject* s = wx2PyString(val);
+ wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iiO)",row,col,s));
+ Py_DECREF(s);
}
wxPyEndBlockThreads();
}
bool CreateGrid( int numRows, int numCols,
WXGRIDSELECTIONMODES selmode = wxGrid::wxGridSelectCells );
void SetSelectionMode(WXGRIDSELECTIONMODES selmode);
+ WXGRIDSELECTIONMODES GetSelectionMode();
// ------ grid dimensions
void EndBatch();
int GetBatchCount();
void ForceRefresh();
+ void Refresh(bool eraseb=TRUE, const wxRect* rect= NULL);
// ------ edit control functions
//
- bool IsEditable() { return m_editable; }
+ bool IsEditable();
void EnableEditing( bool edit );
void EnableCellEditControl( bool enable = TRUE );
bool CanDragGridSize();
// this sets the specified attribute for all cells in this row/col
+ void SetAttr(int row, int col, wxGridCellAttr *attr);
void SetRowAttr(int row, wxGridCellAttr *attr);
void SetColAttr(int col, wxGridCellAttr *attr);
wxFont GetCellFont( int row, int col );
void GetDefaultCellAlignment( int *horiz, int *vert );
void GetCellAlignment( int row, int col, int *horiz, int *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 );
void SetRowSize( int row, int height );
void SetCellFont( int row, int col, const wxFont& );
void SetDefaultCellAlignment( int horiz, int vert );
void SetCellAlignment( int row, int col, int horiz, int vert );
+ void SetDefaultCellOverflow( bool allow );
+ void SetCellOverflow( int row, int col, bool allow );
+ void SetCellSize( int row, int col, int num_rows, int num_cols );
// takes ownership of the pointer
void SetDefaultRenderer(wxGridCellRenderer *renderer);
bool IsInSelection( int row, int col );
// TODO: ??? bool IsInSelection( const wxGridCellCoords& coords )
+// TODO: These need typemaps
+// wxGridCellCoordsArray GetSelectedCells() const;
+// wxGridCellCoordsArray GetSelectionBlockTopLeft() const;
+// wxGridCellCoordsArray GetSelectionBlockBottomRight() const;
+// wxArrayInt GetSelectedRows() const;
+// wxArrayInt GetSelectedCols() const;
+
// This function returns the rectangle that encloses the block of cells
// limited by TopLeft and BottomRight cell in device coords and clipped
projects / wxWidgets.git / blobdiff