Mirrors_UI_SDK/wxWidgets
1
0
Fork 0
mirror of https://github.com/wxWidgets/wxWidgets.git synced 2026-09-24 07:24:31 +08:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

reSWIGged

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31637 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2005-01-29 01:30:42 +00:00
parent 19a6943a67
commit 7557b9b542
12 changed files with 387 additions and 513 deletions
Download Patch File Download Diff File Expand all files Collapse all files
wxPython/src/gtk/_controls.py
+17 -4
View File
@@ -1591,6 +1591,8 @@ TE_HT_BEFORE = _controls_.TE_HT_BEFORE
TE_HT_ON_TEXT = _controls_.TE_HT_ON_TEXT
TE_HT_BELOW = _controls_.TE_HT_BELOW
TE_HT_BEYOND = _controls_.TE_HT_BEYOND
OutOfRangeTextCoord = _controls_.OutOfRangeTextCoord
InvalidTextCoord = _controls_.InvalidTextCoord
class TextAttr(object):
"""Proxy of C++ TextAttr class"""
def __repr__(self):
@@ -2655,6 +2657,17 @@ def RadioButton_GetClassDefaultAttributes(*args, **kwargs):
#---------------------------------------------------------------------------
SL_HORIZONTAL = _controls_.SL_HORIZONTAL
SL_VERTICAL = _controls_.SL_VERTICAL
SL_AUTOTICKS = _controls_.SL_AUTOTICKS
SL_LABELS = _controls_.SL_LABELS
SL_LEFT = _controls_.SL_LEFT
SL_TOP = _controls_.SL_TOP
SL_RIGHT = _controls_.SL_RIGHT
SL_BOTTOM = _controls_.SL_BOTTOM
SL_BOTH = _controls_.SL_BOTH
SL_SELRANGE = _controls_.SL_SELRANGE
SL_INVERSE = _controls_.SL_INVERSE
class Slider(_core.Control):
"""Proxy of C++ Slider class"""
def __repr__(self):
@@ -3226,7 +3239,7 @@ EVT_NOTEBOOK_PAGE_CHANGING = wx.PyEventBinder( wxEVT_COMMAND_NOTEBOOK_PAGE_CHANG
class NotebookPage(wx.Panel):
"""
There is an old (and apparently unsolvable) bug when placing a
window with a nonstandard background colour in a wxNotebook on
window with a nonstandard background colour in a wx.Notebook on
wxGTK, as the notbooks's background colour would always be used
when the window is refreshed. The solution is to place a panel in
the notbook and the coloured window on the panel, sized to cover
@@ -3239,7 +3252,7 @@ class NotebookPage(wx.Panel):
style=wx.TAB_TRAVERSAL, name="panel"):
wx.Panel.__init__(self, parent, id, pos, size, style, name)
self.child = None
EVT_SIZE(self, self.OnSize)
self.Bind(wx.EVT_SIZE, self.OnSize)
def OnSize(self, evt):
if self.child is None:
@@ -4423,8 +4436,6 @@ wxEVT_COMMAND_LIST_BEGIN_LABEL_EDIT = _controls_.wxEVT_COMMAND_LIST_BEGIN_LABEL_
wxEVT_COMMAND_LIST_END_LABEL_EDIT = _controls_.wxEVT_COMMAND_LIST_END_LABEL_EDIT
wxEVT_COMMAND_LIST_DELETE_ITEM = _controls_.wxEVT_COMMAND_LIST_DELETE_ITEM
wxEVT_COMMAND_LIST_DELETE_ALL_ITEMS = _controls_.wxEVT_COMMAND_LIST_DELETE_ALL_ITEMS
wxEVT_COMMAND_LIST_GET_INFO = _controls_.wxEVT_COMMAND_LIST_GET_INFO
wxEVT_COMMAND_LIST_SET_INFO = _controls_.wxEVT_COMMAND_LIST_SET_INFO
wxEVT_COMMAND_LIST_ITEM_SELECTED = _controls_.wxEVT_COMMAND_LIST_ITEM_SELECTED
wxEVT_COMMAND_LIST_ITEM_DESELECTED = _controls_.wxEVT_COMMAND_LIST_ITEM_DESELECTED
wxEVT_COMMAND_LIST_KEY_DOWN = _controls_.wxEVT_COMMAND_LIST_KEY_DOWN
@@ -4439,6 +4450,8 @@ wxEVT_COMMAND_LIST_COL_BEGIN_DRAG = _controls_.wxEVT_COMMAND_LIST_COL_BEGIN_DRAG
wxEVT_COMMAND_LIST_COL_DRAGGING = _controls_.wxEVT_COMMAND_LIST_COL_DRAGGING
wxEVT_COMMAND_LIST_COL_END_DRAG = _controls_.wxEVT_COMMAND_LIST_COL_END_DRAG
wxEVT_COMMAND_LIST_ITEM_FOCUSED = _controls_.wxEVT_COMMAND_LIST_ITEM_FOCUSED
wxEVT_COMMAND_LIST_GET_INFO = _controls_.wxEVT_COMMAND_LIST_GET_INFO
wxEVT_COMMAND_LIST_SET_INFO = _controls_.wxEVT_COMMAND_LIST_SET_INFO
EVT_LIST_BEGIN_DRAG = wx.PyEventBinder(wxEVT_COMMAND_LIST_BEGIN_DRAG , 1)
EVT_LIST_BEGIN_RDRAG = wx.PyEventBinder(wxEVT_COMMAND_LIST_BEGIN_RDRAG , 1)
EVT_LIST_BEGIN_LABEL_EDIT = wx.PyEventBinder(wxEVT_COMMAND_LIST_BEGIN_LABEL_EDIT , 1)
wxPython/src/gtk/_controls_wrap.cpp
+42 -3
View File
@@ -1826,7 +1826,7 @@ static void wxToolBarBase_SetToolClientData(wxToolBarBase *self,int id,PyObject
#include <wx/listctrl.h>
static const wxString wxPyListCtrlNameStr(_T("wxListCtrl"));
static const wxString wxPyListCtrlNameStr(wxListCtrlNameStr);
static void wxListItemAttr_Destroy(wxListItemAttr *self){ delete self; }
// Python aware sorting function for wxPyListCtrl
static int wxCALLBACK wxPyListCtrl_SortItems(long item1, long item2, long funcPtr) {
@@ -37017,6 +37017,12 @@ SWIGEXPORT(void) SWIG_init(void) {
{
PyDict_SetItemString(d,"TE_HT_BEYOND", SWIG_From_int((int)(wxTE_HT_BEYOND)));
}
{
PyDict_SetItemString(d,"OutOfRangeTextCoord", SWIG_From_int((int)(wxOutOfRangeTextCoord)));
}
{
PyDict_SetItemString(d,"InvalidTextCoord", SWIG_From_int((int)(wxInvalidTextCoord)));
}
PyDict_SetItemString(d, "wxEVT_COMMAND_TEXT_UPDATED", PyInt_FromLong(wxEVT_COMMAND_TEXT_UPDATED));
PyDict_SetItemString(d, "wxEVT_COMMAND_TEXT_ENTER", PyInt_FromLong(wxEVT_COMMAND_TEXT_ENTER));
PyDict_SetItemString(d, "wxEVT_COMMAND_TEXT_URL", PyInt_FromLong(wxEVT_COMMAND_TEXT_URL));
@@ -37040,6 +37046,39 @@ SWIGEXPORT(void) SWIG_init(void) {
SWIG_addvarlink(SWIG_globals,(char*)"RadioBoxNameStr",_wrap_RadioBoxNameStr_get, _wrap_RadioBoxNameStr_set);
SWIG_addvarlink(SWIG_globals,(char*)"RadioButtonNameStr",_wrap_RadioButtonNameStr_get, _wrap_RadioButtonNameStr_set);
SWIG_addvarlink(SWIG_globals,(char*)"SliderNameStr",_wrap_SliderNameStr_get, _wrap_SliderNameStr_set);
{
PyDict_SetItemString(d,"SL_HORIZONTAL", SWIG_From_int((int)(wxSL_HORIZONTAL)));
}
{
PyDict_SetItemString(d,"SL_VERTICAL", SWIG_From_int((int)(wxSL_VERTICAL)));
}
{
PyDict_SetItemString(d,"SL_AUTOTICKS", SWIG_From_int((int)(wxSL_AUTOTICKS)));
}
{
PyDict_SetItemString(d,"SL_LABELS", SWIG_From_int((int)(wxSL_LABELS)));
}
{
PyDict_SetItemString(d,"SL_LEFT", SWIG_From_int((int)(wxSL_LEFT)));
}
{
PyDict_SetItemString(d,"SL_TOP", SWIG_From_int((int)(wxSL_TOP)));
}
{
PyDict_SetItemString(d,"SL_RIGHT", SWIG_From_int((int)(wxSL_RIGHT)));
}
{
PyDict_SetItemString(d,"SL_BOTTOM", SWIG_From_int((int)(wxSL_BOTTOM)));
}
{
PyDict_SetItemString(d,"SL_BOTH", SWIG_From_int((int)(wxSL_BOTH)));
}
{
PyDict_SetItemString(d,"SL_SELRANGE", SWIG_From_int((int)(wxSL_SELRANGE)));
}
{
PyDict_SetItemString(d,"SL_INVERSE", SWIG_From_int((int)(wxSL_INVERSE)));
}
SWIG_addvarlink(SWIG_globals,(char*)"ToggleButtonNameStr",_wrap_ToggleButtonNameStr_get, _wrap_ToggleButtonNameStr_set);
PyDict_SetItemString(d, "wxEVT_COMMAND_TOGGLEBUTTON_CLICKED", PyInt_FromLong(wxEVT_COMMAND_TOGGLEBUTTON_CLICKED));
SWIG_addvarlink(SWIG_globals,(char*)"NotebookNameStr",_wrap_NotebookNameStr_get, _wrap_NotebookNameStr_set);
@@ -37368,8 +37407,6 @@ SWIGEXPORT(void) SWIG_init(void) {
PyDict_SetItemString(d, "wxEVT_COMMAND_LIST_END_LABEL_EDIT", PyInt_FromLong(wxEVT_COMMAND_LIST_END_LABEL_EDIT));
PyDict_SetItemString(d, "wxEVT_COMMAND_LIST_DELETE_ITEM", PyInt_FromLong(wxEVT_COMMAND_LIST_DELETE_ITEM));
PyDict_SetItemString(d, "wxEVT_COMMAND_LIST_DELETE_ALL_ITEMS", PyInt_FromLong(wxEVT_COMMAND_LIST_DELETE_ALL_ITEMS));
PyDict_SetItemString(d, "wxEVT_COMMAND_LIST_GET_INFO", PyInt_FromLong(wxEVT_COMMAND_LIST_GET_INFO));
PyDict_SetItemString(d, "wxEVT_COMMAND_LIST_SET_INFO", PyInt_FromLong(wxEVT_COMMAND_LIST_SET_INFO));
PyDict_SetItemString(d, "wxEVT_COMMAND_LIST_ITEM_SELECTED", PyInt_FromLong(wxEVT_COMMAND_LIST_ITEM_SELECTED));
PyDict_SetItemString(d, "wxEVT_COMMAND_LIST_ITEM_DESELECTED", PyInt_FromLong(wxEVT_COMMAND_LIST_ITEM_DESELECTED));
PyDict_SetItemString(d, "wxEVT_COMMAND_LIST_KEY_DOWN", PyInt_FromLong(wxEVT_COMMAND_LIST_KEY_DOWN));
@@ -37384,6 +37421,8 @@ SWIGEXPORT(void) SWIG_init(void) {
PyDict_SetItemString(d, "wxEVT_COMMAND_LIST_COL_DRAGGING", PyInt_FromLong(wxEVT_COMMAND_LIST_COL_DRAGGING));
PyDict_SetItemString(d, "wxEVT_COMMAND_LIST_COL_END_DRAG", PyInt_FromLong(wxEVT_COMMAND_LIST_COL_END_DRAG));
PyDict_SetItemString(d, "wxEVT_COMMAND_LIST_ITEM_FOCUSED", PyInt_FromLong(wxEVT_COMMAND_LIST_ITEM_FOCUSED));
PyDict_SetItemString(d, "wxEVT_COMMAND_LIST_GET_INFO", PyInt_FromLong(wxEVT_COMMAND_LIST_GET_INFO));
PyDict_SetItemString(d, "wxEVT_COMMAND_LIST_SET_INFO", PyInt_FromLong(wxEVT_COMMAND_LIST_SET_INFO));
// Map renamed classes back to their common name for OOR
wxPyPtrTypeMap_Add("wxListCtrl", "wxPyListCtrl");
wxPython/src/gtk/_core.py
+3 -12
View File
@@ -123,16 +123,6 @@ RA_SPECIFY_ROWS = _core_.RA_SPECIFY_ROWS
RA_SPECIFY_COLS = _core_.RA_SPECIFY_COLS
RB_GROUP = _core_.RB_GROUP
RB_SINGLE = _core_.RB_SINGLE
SL_HORIZONTAL = _core_.SL_HORIZONTAL
SL_VERTICAL = _core_.SL_VERTICAL
SL_AUTOTICKS = _core_.SL_AUTOTICKS
SL_LABELS = _core_.SL_LABELS
SL_LEFT = _core_.SL_LEFT
SL_TOP = _core_.SL_TOP
SL_RIGHT = _core_.SL_RIGHT
SL_BOTTOM = _core_.SL_BOTTOM
SL_BOTH = _core_.SL_BOTH
SL_SELRANGE = _core_.SL_SELRANGE
SB_HORIZONTAL = _core_.SB_HORIZONTAL
SB_VERTICAL = _core_.SB_VERTICAL
ST_SIZEGRIP = _core_.ST_SIZEGRIP
@@ -3953,8 +3943,9 @@ class MoveEvent(Event):
"""SetPosition(self, Point pos)"""
return _core_.MoveEvent_SetPosition(*args, **kwargs)
m_pos = property(_core_.MoveEvent_m_pos_get, _core_.MoveEvent_m_pos_set)
m_rect = property(_core_.MoveEvent_m_rect_get, _core_.MoveEvent_m_rect_set)
m_pos = property(GetPosition, SetPosition)
m_rect = property(GetRect, SetRect)
class MoveEventPtr(MoveEvent):
def __init__(self, this):
wxPython/src/gtk/_core_wrap.cpp
+15 -147
View File
@@ -1659,6 +1659,11 @@ static wxPyCoreAPI API = {
#endif
#if !WXWIN_COMPATIBILITY_2_4
#define wxHIDE_READONLY 0
#endif
/*@/opt/swig/share/swig/1.3.24/python/pymacros.swg,66,SWIG_define@*/
#define SWIG_From_int PyInt_FromLong
/*@@*/
@@ -2575,9 +2580,6 @@ SWIG_Check_unsigned_SS_int(PyObject* obj)
static void wxSizeEvent_SetSize(wxSizeEvent *self,wxSize size){
self->m_size = size;
}
static void wxMoveEvent_SetPosition(wxMoveEvent *self,wxPoint pos){
self->m_pos = pos;
}
static PyObject *wxDropFilesEvent_GetFiles(wxDropFilesEvent *self){
int count = self->GetNumberOfFiles();
wxString* files = self->GetFiles();
@@ -18930,7 +18932,8 @@ static PyObject *_wrap_MoveEvent_GetRect(PyObject *, PyObject *args, PyObject *k
static PyObject *_wrap_MoveEvent_SetRect(PyObject *, PyObject *args, PyObject *kwargs) {
PyObject *resultobj;
wxMoveEvent *arg1 = (wxMoveEvent *) 0 ;
wxRect arg2 ;
wxRect *arg2 = 0 ;
wxRect temp2 ;
PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ;
char *kwnames[] = {
@@ -18941,18 +18944,12 @@ static PyObject *_wrap_MoveEvent_SetRect(PyObject *, PyObject *args, PyObject *k
SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxMoveEvent, SWIG_POINTER_EXCEPTION | 0);
if (SWIG_arg_fail(1)) SWIG_fail;
{
wxRect * argp;
SWIG_Python_ConvertPtr(obj1, (void **)&argp, SWIGTYPE_p_wxRect, SWIG_POINTER_EXCEPTION);
if (SWIG_arg_fail(2)) SWIG_fail;
if (argp == NULL) {
SWIG_null_ref("wxRect");
}
if (SWIG_arg_fail(2)) SWIG_fail;
arg2 = *argp;
arg2 = &temp2;
if ( ! wxRect_helper(obj1, &arg2)) SWIG_fail;
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
(arg1)->SetRect(arg2);
(arg1)->SetRect((wxRect const &)*arg2);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
@@ -18967,7 +18964,8 @@ static PyObject *_wrap_MoveEvent_SetRect(PyObject *, PyObject *args, PyObject *k
static PyObject *_wrap_MoveEvent_SetPosition(PyObject *, PyObject *args, PyObject *kwargs) {
PyObject *resultobj;
wxMoveEvent *arg1 = (wxMoveEvent *) 0 ;
wxPoint arg2 ;
wxPoint *arg2 = 0 ;
wxPoint temp2 ;
PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ;
char *kwnames[] = {
@@ -18978,18 +18976,12 @@ static PyObject *_wrap_MoveEvent_SetPosition(PyObject *, PyObject *args, PyObjec
SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxMoveEvent, SWIG_POINTER_EXCEPTION | 0);
if (SWIG_arg_fail(1)) SWIG_fail;
{
wxPoint * argp;
SWIG_Python_ConvertPtr(obj1, (void **)&argp, SWIGTYPE_p_wxPoint, SWIG_POINTER_EXCEPTION);
if (SWIG_arg_fail(2)) SWIG_fail;
if (argp == NULL) {
SWIG_null_ref("wxPoint");
}
if (SWIG_arg_fail(2)) SWIG_fail;
arg2 = *argp;
arg2 = &temp2;
if ( ! wxPoint_helper(obj1, &arg2)) SWIG_fail;
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
wxMoveEvent_SetPosition(arg1,arg2);
(arg1)->SetPosition((wxPoint const &)*arg2);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
@@ -19001,96 +18993,6 @@ static PyObject *_wrap_MoveEvent_SetPosition(PyObject *, PyObject *args, PyObjec
}
static PyObject *_wrap_MoveEvent_m_pos_set(PyObject *, PyObject *args, PyObject *kwargs) {
PyObject *resultobj;
wxMoveEvent *arg1 = (wxMoveEvent *) 0 ;
wxPoint *arg2 = (wxPoint *) 0 ;
PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ;
char *kwnames[] = {
(char *) "self",(char *) "m_pos", NULL
};
if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:MoveEvent_m_pos_set",kwnames,&obj0,&obj1)) goto fail;
SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxMoveEvent, SWIG_POINTER_EXCEPTION | 0);
if (SWIG_arg_fail(1)) SWIG_fail;
SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxPoint, SWIG_POINTER_EXCEPTION | 0);
if (SWIG_arg_fail(2)) SWIG_fail;
if (arg1) (arg1)->m_pos = *arg2;
Py_INCREF(Py_None); resultobj = Py_None;
return resultobj;
fail:
return NULL;
}
static PyObject *_wrap_MoveEvent_m_pos_get(PyObject *, PyObject *args, PyObject *kwargs) {
PyObject *resultobj;
wxMoveEvent *arg1 = (wxMoveEvent *) 0 ;
wxPoint *result;
PyObject * obj0 = 0 ;
char *kwnames[] = {
(char *) "self", NULL
};
if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:MoveEvent_m_pos_get",kwnames,&obj0)) goto fail;
SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxMoveEvent, SWIG_POINTER_EXCEPTION | 0);
if (SWIG_arg_fail(1)) SWIG_fail;
result = (wxPoint *)& ((arg1)->m_pos);
resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxPoint, 0);
return resultobj;
fail:
return NULL;
}
static PyObject *_wrap_MoveEvent_m_rect_set(PyObject *, PyObject *args, PyObject *kwargs) {
PyObject *resultobj;
wxMoveEvent *arg1 = (wxMoveEvent *) 0 ;
wxRect *arg2 = (wxRect *) 0 ;
PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ;
char *kwnames[] = {
(char *) "self",(char *) "m_rect", NULL
};
if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:MoveEvent_m_rect_set",kwnames,&obj0,&obj1)) goto fail;
SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxMoveEvent, SWIG_POINTER_EXCEPTION | 0);
if (SWIG_arg_fail(1)) SWIG_fail;
SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxRect, SWIG_POINTER_EXCEPTION | 0);
if (SWIG_arg_fail(2)) SWIG_fail;
if (arg1) (arg1)->m_rect = *arg2;
Py_INCREF(Py_None); resultobj = Py_None;
return resultobj;
fail:
return NULL;
}
static PyObject *_wrap_MoveEvent_m_rect_get(PyObject *, PyObject *args, PyObject *kwargs) {
PyObject *resultobj;
wxMoveEvent *arg1 = (wxMoveEvent *) 0 ;
wxRect *result;
PyObject * obj0 = 0 ;
char *kwnames[] = {
(char *) "self", NULL
};
if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:MoveEvent_m_rect_get",kwnames,&obj0)) goto fail;
SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxMoveEvent, SWIG_POINTER_EXCEPTION | 0);
if (SWIG_arg_fail(1)) SWIG_fail;
result = (wxRect *)& ((arg1)->m_rect);
resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxRect, 0);
return resultobj;
fail:
return NULL;
}
static PyObject * MoveEvent_swigregister(PyObject *, PyObject *args) {
PyObject *obj;
if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
@@ -44422,10 +44324,6 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"MoveEvent_GetRect", (PyCFunction) _wrap_MoveEvent_GetRect, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"MoveEvent_SetRect", (PyCFunction) _wrap_MoveEvent_SetRect, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"MoveEvent_SetPosition", (PyCFunction) _wrap_MoveEvent_SetPosition, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"MoveEvent_m_pos_set", (PyCFunction) _wrap_MoveEvent_m_pos_set, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"MoveEvent_m_pos_get", (PyCFunction) _wrap_MoveEvent_m_pos_get, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"MoveEvent_m_rect_set", (PyCFunction) _wrap_MoveEvent_m_rect_set, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"MoveEvent_m_rect_get", (PyCFunction) _wrap_MoveEvent_m_rect_get, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"MoveEvent_swigregister", MoveEvent_swigregister, METH_VARARGS, NULL},
{ (char *)"new_PaintEvent", (PyCFunction) _wrap_new_PaintEvent, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"PaintEvent_swigregister", PaintEvent_swigregister, METH_VARARGS, NULL},
@@ -46455,36 +46353,6 @@ SWIGEXPORT(void) SWIG_init(void) {
{
PyDict_SetItemString(d,"RB_SINGLE", SWIG_From_int((int)(wxRB_SINGLE)));
}
{
PyDict_SetItemString(d,"SL_HORIZONTAL", SWIG_From_int((int)(wxSL_HORIZONTAL)));
}
{
PyDict_SetItemString(d,"SL_VERTICAL", SWIG_From_int((int)(wxSL_VERTICAL)));
}
{
PyDict_SetItemString(d,"SL_AUTOTICKS", SWIG_From_int((int)(wxSL_AUTOTICKS)));
}
{
PyDict_SetItemString(d,"SL_LABELS", SWIG_From_int((int)(wxSL_LABELS)));
}
{
PyDict_SetItemString(d,"SL_LEFT", SWIG_From_int((int)(wxSL_LEFT)));
}
{
PyDict_SetItemString(d,"SL_TOP", SWIG_From_int((int)(wxSL_TOP)));
}
{
PyDict_SetItemString(d,"SL_RIGHT", SWIG_From_int((int)(wxSL_RIGHT)));
}
{
PyDict_SetItemString(d,"SL_BOTTOM", SWIG_From_int((int)(wxSL_BOTTOM)));
}
{
PyDict_SetItemString(d,"SL_BOTH", SWIG_From_int((int)(wxSL_BOTH)));
}
{
PyDict_SetItemString(d,"SL_SELRANGE", SWIG_From_int((int)(wxSL_SELRANGE)));
}
{
PyDict_SetItemString(d,"SB_HORIZONTAL", SWIG_From_int((int)(wxSB_HORIZONTAL)));
}
wxPython/src/gtk/_gdi.py
+4 -9
View File
@@ -997,11 +997,8 @@ class Cursor(GDIObject):
__init__(self, String cursorName, long type, int hotSpotX=0, int hotSpotY=0) -> Cursor
Construct a Cursor from a file. Specify the type of file using
wx.BITAMP_TYPE* constants, and specify the hotspot if not using a cur
wx.BITAMP_TYPE* constants, and specify the hotspot if not using a .cur
file.
This constructor is not available on wxGTK, use ``wx.StockCursor``,
``wx.CursorFromImage``, or ``wx.CursorFromBits`` instead.
"""
newobj = _gdi_.new_Cursor(*args, **kwargs)
self.this = newobj.this
@@ -1031,7 +1028,7 @@ def StockCursor(*args, **kwargs):
StockCursor(int id) -> Cursor
Create a cursor using one of the stock cursors. Note that not all
cursors are available on all platforms.
stock cursors are available on all platforms.
"""
val = _gdi_.new_StockCursor(*args, **kwargs)
val.thisown = 1
@@ -1041,10 +1038,8 @@ def CursorFromImage(*args, **kwargs):
"""
CursorFromImage(Image image) -> Cursor
Constructs a cursor from a wxImage. The cursor is monochrome, colors
with the RGB elements all greater than 127 will be foreground, colors
less than this background. The mask (if any) will be used as
transparent.
Constructs a cursor from a `wx.Image`. The mask (if any) will be used
as transparent.
"""
val = _gdi_.new_CursorFromImage(*args, **kwargs)
val.thisown = 1
wxPython/src/gtk/_gdi_wrap.cpp
+8 -6
View File
@@ -1872,12 +1872,14 @@ SWIG_Check_long(PyObject* obj)
return SWIG_AsVal_long(obj, (long*)0);
}
static wxCursor *new_wxCursor(wxString const *cursorName,long type,int hotSpotX=0,int hotSpotY=0){
static wxCursor *new_wxCursor(wxString const &cursorName,long type,int hotSpotX=0,int hotSpotY=0){
#ifdef __WXGTK__
wxCHECK_MSG(false, NULL,
wxT("wx.Cursor constructor not implemented for wxGTK, use wx.StockCursor, wx.CursorFromImage, or wx.CursorFromBits instead."));
wxImage img(cursorName, type);
img.SetOption(wxIMAGE_OPTION_CUR_HOTSPOT_X, hotSpotX);
img.SetOption(wxIMAGE_OPTION_CUR_HOTSPOT_Y, hotSpotY);
return new wxCursor(img);
#else
return new wxCursor(*cursorName, type, hotSpotX, hotSpotY);
return new wxCursor(cursorName, type, hotSpotX, hotSpotY);
#endif
}
@@ -5897,7 +5899,7 @@ static PyObject * IconBundle_swigregister(PyObject *, PyObject *args) {
}
static PyObject *_wrap_new_Cursor(PyObject *, PyObject *args, PyObject *kwargs) {
PyObject *resultobj;
wxString *arg1 = (wxString *) 0 ;
wxString *arg1 = 0 ;
long arg2 ;
int arg3 = (int) 0 ;
int arg4 = (int) 0 ;
@@ -5936,7 +5938,7 @@ static PyObject *_wrap_new_Cursor(PyObject *, PyObject *args, PyObject *kwargs)
{
if (!wxPyCheckForApp()) SWIG_fail;
PyThreadState* __tstate = wxPyBeginAllowThreads();
result = (wxCursor *)new_wxCursor((wxString const *)arg1,arg2,arg3,arg4);
result = (wxCursor *)new_wxCursor((wxString const &)*arg1,arg2,arg3,arg4);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
wxPython/src/gtk/_misc.py
+16 -19
View File
@@ -2019,11 +2019,6 @@ class JoystickEvent(_core.Event):
"""Proxy of C++ JoystickEvent class"""
def __repr__(self):
return "<%s.%s; proxy of C++ wxJoystickEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
m_pos = property(_misc_.JoystickEvent_m_pos_get, _misc_.JoystickEvent_m_pos_set)
m_zPosition = property(_misc_.JoystickEvent_m_zPosition_get, _misc_.JoystickEvent_m_zPosition_set)
m_buttonChange = property(_misc_.JoystickEvent_m_buttonChange_get, _misc_.JoystickEvent_m_buttonChange_set)
m_buttonState = property(_misc_.JoystickEvent_m_buttonState_get, _misc_.JoystickEvent_m_buttonState_set)
m_joyStick = property(_misc_.JoystickEvent_m_joyStick_get, _misc_.JoystickEvent_m_joyStick_set)
def __init__(self, *args, **kwargs):
"""
__init__(self, wxEventType type=wxEVT_NULL, int state=0, int joystick=JOYSTICK1,
@@ -2097,6 +2092,12 @@ class JoystickEvent(_core.Event):
"""ButtonIsDown(self, int but=JOY_BUTTON_ANY) -> bool"""
return _misc_.JoystickEvent_ButtonIsDown(*args, **kwargs)
m_pos = property(GetPosition, SetPosition)
m_zPosition = property(GetZPosition, SetZPosition)
m_buttonChange = property(GetButtonChange, SetButtonChange)
m_buttonState = property(GetButtonState, SetButtonState)
m_joyStick = property(GetJoystick, SetJoystick)
class JoystickEventPtr(JoystickEvent):
def __init__(self, this):
@@ -3759,7 +3760,7 @@ class DateTime(object):
return _misc_.DateTime_ParseRfc822Date(*args, **kwargs)
def ParseFormat(*args, **kwargs):
"""ParseFormat(self, String date, String format=DateFormatStr, DateTime dateDef=DefaultDateTime) -> int"""
"""ParseFormat(self, String date, String format=DefaultDateTimeFormat, DateTime dateDef=DefaultDateTime) -> int"""
return _misc_.DateTime_ParseFormat(*args, **kwargs)
def ParseDateTime(*args, **kwargs):
@@ -3775,7 +3776,7 @@ class DateTime(object):
return _misc_.DateTime_ParseTime(*args, **kwargs)
def Format(*args, **kwargs):
"""Format(self, String format=DateFormatStr, wxDateTime::TimeZone tz=LOCAL_TZ) -> String"""
"""Format(self, String format=DefaultDateTimeFormat, wxDateTime::TimeZone tz=LOCAL_TZ) -> String"""
return _misc_.DateTime_Format(*args, **kwargs)
def FormatDate(*args, **kwargs):
@@ -3812,8 +3813,8 @@ class DateTimePtr(DateTime):
if not hasattr(self,"thisown"): self.thisown = 0
self.__class__ = DateTime
_misc_.DateTime_swigregister(DateTimePtr)
DateFormatStr = cvar.DateFormatStr
TimeSpanFormatStr = cvar.TimeSpanFormatStr
DefaultDateTimeFormat = cvar.DefaultDateTimeFormat
DefaultTimeSpanFormat = cvar.DefaultTimeSpanFormat
def DateTime_SetCountry(*args, **kwargs):
"""DateTime_SetCountry(int country)"""
@@ -4117,7 +4118,7 @@ class TimeSpan(object):
return _misc_.TimeSpan_GetMilliseconds(*args, **kwargs)
def Format(*args, **kwargs):
"""Format(self, String format=TimeSpanFormatStr) -> String"""
"""Format(self, String format=DefaultTimeSpanFormat) -> String"""
return _misc_.TimeSpan_Format(*args, **kwargs)
def __repr__(self):
@@ -4965,12 +4966,6 @@ class FileDataObject(DataObjectSimple):
Explorer and other compatible programs under Windows or GNOME/KDE
filemanager under Unix which makes it possible to receive files from
them using this class.
:Warning: Under all non-Windows platforms this class is currently
"input-only", i.e. you can receive the files from another
application, but copying (or dragging) file(s) from a wxWidgets
application is not currently supported.
"""
def __repr__(self):
return "<%s.%s; proxy of C++ wxFileDataObject instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
@@ -5014,9 +5009,11 @@ class CustomDataObject(DataObjectSimple):
"""
def __repr__(self):
return "<%s.%s; proxy of C++ wxCustomDataObject instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
def __init__(self, *args, **kwargs):
def __init__(self, *args):
"""
__init__(self, DataFormat format=FormatInvalid) -> CustomDataObject
__init__(self, DataFormat format) -> CustomDataObject
__init__(self, String formatName) -> CustomDataObject
__init__(self) -> CustomDataObject
wx.CustomDataObject is a specialization of `wx.DataObjectSimple` for
some application-specific data in arbitrary format. Python strings
@@ -5024,7 +5021,7 @@ class CustomDataObject(DataObjectSimple):
easily be transfered via strings. A copy of the data is stored in the
data object.
"""
newobj = _misc_.new_CustomDataObject(*args, **kwargs)
newobj = _misc_.new_CustomDataObject(*args)
self.this = newobj.this
self.thisown = 1
del newobj.thisown
wxPython/src/gtk/_misc_wrap.cpp
+127 -286
View File
File diff suppressed because it is too large Load Diff
wxPython/src/gtk/_windows.py
+10
View File
@@ -4073,6 +4073,7 @@ class PageSetupDialogData(_core.Object):
"""
__init__(self) -> PageSetupDialogData
__init__(self, PageSetupDialogData data) -> PageSetupDialogData
__init__(self, PrintData data) -> PageSetupDialogData
"""
newobj = _windows_.new_PageSetupDialogData(*args)
self.this = newobj.this
@@ -4200,6 +4201,14 @@ class PageSetupDialogData(_core.Object):
"""SetPrintData(self, PrintData printData)"""
return _windows_.PageSetupDialogData_SetPrintData(*args, **kwargs)
def CalculateIdFromPaperSize(*args, **kwargs):
"""CalculateIdFromPaperSize(self)"""
return _windows_.PageSetupDialogData_CalculateIdFromPaperSize(*args, **kwargs)
def CalculatePaperSizeFromId(*args, **kwargs):
"""CalculatePaperSizeFromId(self)"""
return _windows_.PageSetupDialogData_CalculatePaperSizeFromId(*args, **kwargs)
def __nonzero__(self): return self.Ok()
class PageSetupDialogDataPtr(PageSetupDialogData):
@@ -4247,6 +4256,7 @@ class PrintDialogData(_core.Object):
"""
__init__(self) -> PrintDialogData
__init__(self, PrintData printData) -> PrintDialogData
__init__(self, PrintDialogData printData) -> PrintDialogData
"""
newobj = _windows_.new_PrintDialogData(*args)
self.this = newobj.this
wxPython/src/gtk/_windows_wrap.cpp
+140
View File
@@ -21784,6 +21784,35 @@ static PyObject *_wrap_new_PageSetupDialogData__SWIG_1(PyObject *, PyObject *arg
}
static PyObject *_wrap_new_PageSetupDialogData__SWIG_2(PyObject *, PyObject *args) {
PyObject *resultobj;
wxPrintData *arg1 = 0 ;
wxPageSetupDialogData *result;
PyObject * obj0 = 0 ;
if(!PyArg_ParseTuple(args,(char *)"O:new_PageSetupDialogData",&obj0)) goto fail;
{
SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPrintData, SWIG_POINTER_EXCEPTION | 0);
if (SWIG_arg_fail(1)) SWIG_fail;
if (arg1 == NULL) {
SWIG_null_ref("wxPrintData");
}
if (SWIG_arg_fail(1)) SWIG_fail;
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
result = (wxPageSetupDialogData *)new wxPageSetupDialogData((wxPrintData const &)*arg1);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxPageSetupDialogData, 1);
return resultobj;
fail:
return NULL;
}
static PyObject *_wrap_new_PageSetupDialogData(PyObject *self, PyObject *args) {
int argc;
PyObject *argv[2];
@@ -21811,6 +21840,21 @@ static PyObject *_wrap_new_PageSetupDialogData(PyObject *self, PyObject *args) {
return _wrap_new_PageSetupDialogData__SWIG_1(self,args);
}
}
if (argc == 1) {
int _v;
{
void *ptr = 0;
if (SWIG_ConvertPtr(argv[0], &ptr, SWIGTYPE_p_wxPrintData, 0) == -1) {
_v = 0;
PyErr_Clear();
} else {
_v = (ptr != 0);
}
}
if (_v) {
return _wrap_new_PageSetupDialogData__SWIG_2(self,args);
}
}
PyErr_SetString(PyExc_NotImplementedError,"No matching function for overloaded 'new_PageSetupDialogData'");
return NULL;
@@ -22714,6 +22758,56 @@ static PyObject *_wrap_PageSetupDialogData_SetPrintData(PyObject *, PyObject *ar
}
static PyObject *_wrap_PageSetupDialogData_CalculateIdFromPaperSize(PyObject *, PyObject *args, PyObject *kwargs) {
PyObject *resultobj;
wxPageSetupDialogData *arg1 = (wxPageSetupDialogData *) 0 ;
PyObject * obj0 = 0 ;
char *kwnames[] = {
(char *) "self", NULL
};
if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PageSetupDialogData_CalculateIdFromPaperSize",kwnames,&obj0)) goto fail;
SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPageSetupDialogData, SWIG_POINTER_EXCEPTION | 0);
if (SWIG_arg_fail(1)) SWIG_fail;
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
(arg1)->CalculateIdFromPaperSize();
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
Py_INCREF(Py_None); resultobj = Py_None;
return resultobj;
fail:
return NULL;
}
static PyObject *_wrap_PageSetupDialogData_CalculatePaperSizeFromId(PyObject *, PyObject *args, PyObject *kwargs) {
PyObject *resultobj;
wxPageSetupDialogData *arg1 = (wxPageSetupDialogData *) 0 ;
PyObject * obj0 = 0 ;
char *kwnames[] = {
(char *) "self", NULL
};
if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PageSetupDialogData_CalculatePaperSizeFromId",kwnames,&obj0)) goto fail;
SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPageSetupDialogData, SWIG_POINTER_EXCEPTION | 0);
if (SWIG_arg_fail(1)) SWIG_fail;
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
(arg1)->CalculatePaperSizeFromId();
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
Py_INCREF(Py_None); resultobj = Py_None;
return resultobj;
fail:
return NULL;
}
static PyObject * PageSetupDialogData_swigregister(PyObject *, PyObject *args) {
PyObject *obj;
if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
@@ -22895,6 +22989,35 @@ static PyObject *_wrap_new_PrintDialogData__SWIG_1(PyObject *, PyObject *args) {
}
static PyObject *_wrap_new_PrintDialogData__SWIG_2(PyObject *, PyObject *args) {
PyObject *resultobj;
wxPrintDialogData *arg1 = 0 ;
wxPrintDialogData *result;
PyObject * obj0 = 0 ;
if(!PyArg_ParseTuple(args,(char *)"O:new_PrintDialogData",&obj0)) goto fail;
{
SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPrintDialogData, SWIG_POINTER_EXCEPTION | 0);
if (SWIG_arg_fail(1)) SWIG_fail;
if (arg1 == NULL) {
SWIG_null_ref("wxPrintDialogData");
}
if (SWIG_arg_fail(1)) SWIG_fail;
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
result = (wxPrintDialogData *)new wxPrintDialogData((wxPrintDialogData const &)*arg1);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxPrintDialogData, 1);
return resultobj;
fail:
return NULL;
}
static PyObject *_wrap_new_PrintDialogData(PyObject *self, PyObject *args) {
int argc;
PyObject *argv[2];
@@ -22922,6 +23045,21 @@ static PyObject *_wrap_new_PrintDialogData(PyObject *self, PyObject *args) {
return _wrap_new_PrintDialogData__SWIG_1(self,args);
}
}
if (argc == 1) {
int _v;
{
void *ptr = 0;
if (SWIG_ConvertPtr(argv[0], &ptr, SWIGTYPE_p_wxPrintDialogData, 0) == -1) {
_v = 0;
PyErr_Clear();
} else {
_v = (ptr != 0);
}
}
if (_v) {
return _wrap_new_PrintDialogData__SWIG_2(self,args);
}
}
PyErr_SetString(PyExc_NotImplementedError,"No matching function for overloaded 'new_PrintDialogData'");
return NULL;
@@ -28020,6 +28158,8 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"PageSetupDialogData_SetPaperId", (PyCFunction) _wrap_PageSetupDialogData_SetPaperId, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"PageSetupDialogData_SetPaperSize", (PyCFunction) _wrap_PageSetupDialogData_SetPaperSize, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"PageSetupDialogData_SetPrintData", (PyCFunction) _wrap_PageSetupDialogData_SetPrintData, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"PageSetupDialogData_CalculateIdFromPaperSize", (PyCFunction) _wrap_PageSetupDialogData_CalculateIdFromPaperSize, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"PageSetupDialogData_CalculatePaperSizeFromId", (PyCFunction) _wrap_PageSetupDialogData_CalculatePaperSizeFromId, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"PageSetupDialogData_swigregister", PageSetupDialogData_swigregister, METH_VARARGS, NULL},
{ (char *)"new_PageSetupDialog", (PyCFunction) _wrap_new_PageSetupDialog, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"PageSetupDialog_GetPageSetupData", (PyCFunction) _wrap_PageSetupDialog_GetPageSetupData, METH_VARARGS | METH_KEYWORDS, NULL},
wxPython/src/gtk/grid.py
+1 -2
View File
@@ -115,7 +115,6 @@ class GridCellRendererPtr(GridCellRenderer):
self.__class__ = GridCellRenderer
_grid.GridCellRenderer_swigregister(GridCellRendererPtr)
cvar = _grid.cvar
DateTimeFormatStr = cvar.DateTimeFormatStr
GridNoCellCoords = cvar.GridNoCellCoords
GridNoCellRect = cvar.GridNoCellRect
@@ -248,7 +247,7 @@ class GridCellDateTimeRenderer(GridCellStringRenderer):
def __repr__(self):
return "<%s.%s; proxy of C++ wxGridCellDateTimeRenderer instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
def __init__(self, *args, **kwargs):
"""__init__(self, String outformat=DateTimeFormatStr, String informat=DateTimeFormatStr) -> GridCellDateTimeRenderer"""
"""__init__(self, String outformat=wxPyDefaultDateTimeFormat, String informat=wxPyDefaultDateTimeFormat) -> GridCellDateTimeRenderer"""
newobj = _grid.new_GridCellDateTimeRenderer(*args, **kwargs)
self.this = newobj.this
self.thisown = 1
wxPython/src/gtk/grid_wrap.cpp
+4 -25
View File
@@ -1422,7 +1422,7 @@ static swig_type_info *swig_types[63];
static const wxString wxPyEmptyString(wxEmptyString);
static const wxString wxPyPanelNameStr(wxPanelNameStr);
static const wxString wxPyDateTimeFormatStr(wxT("%c"));
static const wxString wxPyDefaultDateTimeFormat(wxDefaultDateTimeFormat);
#define wxPyMake_TEMPLATE(TYPE) \
@@ -2637,26 +2637,6 @@ static wxGridCellCoords wxGrid_XYToCell(wxGrid *self,int x,int y){
#ifdef __cplusplus
extern "C" {
#endif
static int _wrap_DateTimeFormatStr_set(PyObject *) {
PyErr_SetString(PyExc_TypeError,"Variable DateTimeFormatStr is read-only.");
return 1;
}
static PyObject *_wrap_DateTimeFormatStr_get(void) {
PyObject *pyobj;
{
#if wxUSE_UNICODE
pyobj = PyUnicode_FromWideChar((&wxPyDateTimeFormatStr)->c_str(), (&wxPyDateTimeFormatStr)->Len());
#else
pyobj = PyString_FromStringAndSize((&wxPyDateTimeFormatStr)->c_str(), (&wxPyDateTimeFormatStr)->Len());
#endif
}
return pyobj;
}
static int _wrap_GridNoCellCoords_set(PyObject *) {
PyErr_SetString(PyExc_TypeError,"Variable GridNoCellCoords is read-only.");
return 1;
@@ -3344,8 +3324,8 @@ static PyObject * GridCellBoolRenderer_swigregister(PyObject *, PyObject *args)
}
static PyObject *_wrap_new_GridCellDateTimeRenderer(PyObject *, PyObject *args, PyObject *kwargs) {
PyObject *resultobj;
wxString arg1 = (wxString) wxPyDateTimeFormatStr ;
wxString arg2 = (wxString) wxPyDateTimeFormatStr ;
wxString arg1 = (wxString) wxPyDefaultDateTimeFormat ;
wxString arg2 = (wxString) wxPyDefaultDateTimeFormat ;
wxGridCellDateTimeRenderer *result;
PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ;
@@ -19901,8 +19881,6 @@ SWIGEXPORT(void) SWIG_init(void) {
}
SWIG_InstallConstants(d,swig_const_table);
PyDict_SetItemString(d,(char*)"cvar", SWIG_globals);
SWIG_addvarlink(SWIG_globals,(char*)"DateTimeFormatStr",_wrap_DateTimeFormatStr_get, _wrap_DateTimeFormatStr_set);
PyDict_SetItemString(d,"GRID_VALUE_STRING", SWIG_FromCharPtr("string"));
PyDict_SetItemString(d,"GRID_VALUE_BOOL", SWIG_FromCharPtr("bool"));
PyDict_SetItemString(d,"GRID_VALUE_NUMBER", SWIG_FromCharPtr("long"));
@@ -19912,6 +19890,7 @@ SWIGEXPORT(void) SWIG_init(void) {
PyDict_SetItemString(d,"GRID_VALUE_LONG", SWIG_FromCharPtr("long"));
PyDict_SetItemString(d,"GRID_VALUE_CHOICEINT", SWIG_FromCharPtr("choiceint"));
PyDict_SetItemString(d,"GRID_VALUE_DATETIME", SWIG_FromCharPtr("datetime"));
PyDict_SetItemString(d,(char*)"cvar", SWIG_globals);
SWIG_addvarlink(SWIG_globals,(char*)"GridNoCellCoords",_wrap_GridNoCellCoords_get, _wrap_GridNoCellCoords_set);
SWIG_addvarlink(SWIG_globals,(char*)"GridNoCellRect",_wrap_GridNoCellRect_get, _wrap_GridNoCellRect_set);
{