reSWIGged

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38227 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2006-03-20 18:26:35 +00:00
parent 607a3fa066
commit f52cbe909c
23 changed files with 1396 additions and 1969 deletions

View File

@@ -5847,6 +5847,8 @@ class HelpProvider(object):
thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
def __init__(self): raise AttributeError, "No constructor defined"
__repr__ = _swig_repr
__swig_destroy__ = _controls_.delete_HelpProvider
__del__ = lambda self : None;
def Set(*args, **kwargs):
"""
Set(HelpProvider helpProvider) -> HelpProvider

View File

@@ -38872,6 +38872,34 @@ SWIGINTERN PyObject *ContextHelpButton_swiginit(PyObject *SWIGUNUSEDPARM(self),
return SWIG_Python_InitShadowInstance(args);
}
SWIGINTERN PyObject *_wrap_delete_HelpProvider(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
wxHelpProvider *arg1 = (wxHelpProvider *) 0 ;
void *argp1 = 0 ;
int res1 = 0 ;
PyObject *swig_obj[1] ;
if (!args) SWIG_fail;
swig_obj[0] = args;
res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxHelpProvider, SWIG_POINTER_DISOWN | 0 );
if (!SWIG_IsOK(res1)) {
SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_HelpProvider" "', expected argument " "1"" of type '" "wxHelpProvider *""'");
}
arg1 = reinterpret_cast< wxHelpProvider * >(argp1);
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
delete arg1;
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
resultobj = SWIG_Py_Void();
return resultobj;
fail:
return NULL;
}
SWIGINTERN PyObject *_wrap_HelpProvider_Set(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
PyObject *resultobj = 0;
wxHelpProvider *arg1 = (wxHelpProvider *) 0 ;
@@ -41381,6 +41409,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"new_ContextHelpButton", (PyCFunction) _wrap_new_ContextHelpButton, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"ContextHelpButton_swigregister", ContextHelpButton_swigregister, METH_VARARGS, NULL},
{ (char *)"ContextHelpButton_swiginit", ContextHelpButton_swiginit, METH_VARARGS, NULL},
{ (char *)"delete_HelpProvider", (PyCFunction)_wrap_delete_HelpProvider, METH_O, NULL},
{ (char *)"HelpProvider_Set", (PyCFunction) _wrap_HelpProvider_Set, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"HelpProvider_Get", (PyCFunction)_wrap_HelpProvider_Get, METH_NOARGS, NULL},
{ (char *)"HelpProvider_GetHelp", (PyCFunction) _wrap_HelpProvider_GetHelp, METH_VARARGS | METH_KEYWORDS, NULL},

View File

@@ -9337,7 +9337,7 @@ class Window(EvtHandler):
Sets the help text to be used as context-sensitive help for this
window. Note that the text is actually stored by the current
wxHelpProvider implementation, and not in the window object itself.
`wx.HelpProvider` implementation, and not in the window object itself.
"""
return _core_.Window_SetHelpText(*args, **kwargs)
@@ -9356,7 +9356,7 @@ class Window(EvtHandler):
Gets the help text to be used as context-sensitive help for this
window. Note that the text is actually stored by the current
wxHelpProvider implementation, and not in the window object itself.
`wx.HelpProvider` implementation, and not in the window object itself.
"""
return _core_.Window_GetHelpText(*args, **kwargs)

View File

@@ -5386,8 +5386,8 @@ class VideoMode(object):
"""
Matches(self, VideoMode other) -> bool
Returns true if this mode matches the other one in the sense that all
non zero fields of the other mode have the same value in this
Returns True if this mode matches the other one in the sense that all
non-zero fields of the other mode have the same value in this
one (except for refresh which is allowed to have a greater value)
"""
return _misc_.VideoMode_Matches(*args, **kwargs)
@@ -5404,8 +5404,7 @@ class VideoMode(object):
"""
GetHeight(self) -> int
Returns the screen width in pixels (e.g. 640*480), 0 means
unspecified
Returns the screen height in pixels (e.g. 640*480), 0 means unspecified
"""
return _misc_.VideoMode_GetHeight(*args, **kwargs)
@@ -5504,6 +5503,15 @@ class Display(object):
"""
return _misc_.Display_GetGeometry(*args, **kwargs)
def GetClientArea(*args, **kwargs):
"""
GetClientArea(self) -> Rect
Returns the bounding rectangle the client area of the display,
i.e., without taskbars and such.
"""
return _misc_.Display_GetClientArea(*args, **kwargs)
def GetName(*args, **kwargs):
"""
GetName(self) -> String
@@ -5516,7 +5524,7 @@ class Display(object):
"""
IsPrimary(self) -> bool
Returns true if the display is the primary display. The primary
Returns True if the display is the primary display. The primary
display is the one whose index is 0.
"""
return _misc_.Display_IsPrimary(*args, **kwargs)

View File

@@ -4009,54 +4009,18 @@ SWIGINTERN bool wxClipboardLocker___nonzero__(wxClipboardLocker *self){ return !
SWIGINTERN bool wxVideoMode___eq__(wxVideoMode *self,wxVideoMode const *other){ return other ? (*self == *other) : false; }
SWIGINTERN bool wxVideoMode___ne__(wxVideoMode *self,wxVideoMode const *other){ return other ? (*self != *other) : true; }
// dummy version of wxDisplay for when it is not enabled in the wxWidgets build
#if !wxUSE_DISPLAY
#include <wx/dynarray.h>
#include <wx/vidmode.h>
WX_DECLARE_OBJARRAY(wxVideoMode, wxArrayVideoModes);
#include "wx/arrimpl.cpp"
WX_DEFINE_OBJARRAY(wxArrayVideoModes);
const wxVideoMode wxDefaultVideoMode;
class wxDisplay
{
public:
wxDisplay(size_t index = 0) { wxPyRaiseNotImplemented(); }
~wxDisplay() {}
static size_t GetCount()
{ wxPyRaiseNotImplemented(); return 0; }
static int GetFromPoint(const wxPoint& pt)
{ wxPyRaiseNotImplemented(); return wxNOT_FOUND; }
static int GetFromWindow(wxWindow *window)
{ wxPyRaiseNotImplemented(); return wxNOT_FOUND; }
virtual bool IsOk() const { return false; }
virtual wxRect GetGeometry() const { wxRect r; return r; }
virtual wxString GetName() const { return wxEmptyString; }
bool IsPrimary() const { return false; }
wxArrayVideoModes GetModes(const wxVideoMode& mode = wxDefaultVideoMode)
{ wxArrayVideoModes a; return a; }
virtual wxVideoMode GetCurrentMode() const
{ return wxDefaultVideoMode; }
virtual bool ChangeMode(const wxVideoMode& mode = wxDefaultVideoMode)
{ return false; }
void ResetMode() {}
};
const wxVideoMode wxDefaultVideoMode;
#endif
SWIGINTERN PyObject *wxDisplay_GetModes(wxDisplay *self,wxVideoMode const &mode=wxDefaultVideoMode){
#if wxUSE_DISPLAY
PyObject* pyList = NULL;
wxArrayVideoModes arr = self->GetModes(mode);
wxPyBlock_t blocked = wxPyBeginBlockThreads();
pyList = PyList_New(0);
for (int i=0; i < arr.GetCount(); i++) {
for (size_t i=0; i < arr.GetCount(); i++)
{
wxVideoMode* m = new wxVideoMode(arr.Item(i));
PyObject* pyObj = wxPyConstructObject(m, wxT("wxVideoMode"), true);
PyList_Append(pyList, pyObj);
@@ -4064,6 +4028,33 @@ SWIGINTERN PyObject *wxDisplay_GetModes(wxDisplay *self,wxVideoMode const &mode=
}
wxPyEndBlockThreads(blocked);
return pyList;
#else
wxPyRaiseNotImplemented();
return NULL;
#endif
}
SWIGINTERN wxVideoMode wxDisplay_GetCurrentMode(wxDisplay const *self){
#if wxUSE_DISPLAY
return self->GetCurrentMode();
#else
wxPyRaiseNotImplemented();
return wxDefaultVideoMode;
#endif
}
SWIGINTERN bool wxDisplay_ChangeMode(wxDisplay *self,wxVideoMode const &mode=wxDefaultVideoMode){
#if wxUSE_DISPLAY
return self->ChangeMode(mode);
#else
wxPyRaiseNotImplemented();
return false;
#endif
}
SWIGINTERN void wxDisplay_ResetMode(wxDisplay *self){
#if wxUSE_DISPLAY
self->ResetMode();
#else
wxPyRaiseNotImplemented();
#endif
}
#include <wx/stdpaths.h>
@@ -35133,6 +35124,34 @@ fail:
}
SWIGINTERN PyObject *_wrap_Display_GetClientArea(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
wxDisplay *arg1 = (wxDisplay *) 0 ;
wxRect result;
void *argp1 = 0 ;
int res1 = 0 ;
PyObject *swig_obj[1] ;
if (!args) SWIG_fail;
swig_obj[0] = args;
res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxDisplay, 0 | 0 );
if (!SWIG_IsOK(res1)) {
SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Display_GetClientArea" "', expected argument " "1"" of type '" "wxDisplay const *""'");
}
arg1 = reinterpret_cast< wxDisplay * >(argp1);
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
result = ((wxDisplay const *)arg1)->GetClientArea();
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
resultobj = SWIG_NewPointerObj((new wxRect(static_cast< const wxRect& >(result))), SWIGTYPE_p_wxRect, SWIG_POINTER_OWN | 0 );
return resultobj;
fail:
return NULL;
}
SWIGINTERN PyObject *_wrap_Display_GetName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
wxDisplay *arg1 = (wxDisplay *) 0 ;
@@ -35259,7 +35278,7 @@ SWIGINTERN PyObject *_wrap_Display_GetCurrentMode(PyObject *SWIGUNUSEDPARM(self)
arg1 = reinterpret_cast< wxDisplay * >(argp1);
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
result = ((wxDisplay const *)arg1)->GetCurrentMode();
result = wxDisplay_GetCurrentMode((wxDisplay const *)arg1);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
@@ -35304,7 +35323,7 @@ SWIGINTERN PyObject *_wrap_Display_ChangeMode(PyObject *SWIGUNUSEDPARM(self), Py
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
result = (bool)(arg1)->ChangeMode((wxVideoMode const &)*arg2);
result = (bool)wxDisplay_ChangeMode(arg1,(wxVideoMode const &)*arg2);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
@@ -35333,7 +35352,7 @@ SWIGINTERN PyObject *_wrap_Display_ResetMode(PyObject *SWIGUNUSEDPARM(self), PyO
arg1 = reinterpret_cast< wxDisplay * >(argp1);
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
(arg1)->ResetMode();
wxDisplay_ResetMode(arg1);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
@@ -36584,6 +36603,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"Display_GetFromWindow", (PyCFunction) _wrap_Display_GetFromWindow, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"Display_IsOk", (PyCFunction)_wrap_Display_IsOk, METH_O, NULL},
{ (char *)"Display_GetGeometry", (PyCFunction)_wrap_Display_GetGeometry, METH_O, NULL},
{ (char *)"Display_GetClientArea", (PyCFunction)_wrap_Display_GetClientArea, METH_O, NULL},
{ (char *)"Display_GetName", (PyCFunction)_wrap_Display_GetName, METH_O, NULL},
{ (char *)"Display_IsPrimary", (PyCFunction)_wrap_Display_IsPrimary, METH_O, NULL},
{ (char *)"Display_GetModes", (PyCFunction) _wrap_Display_GetModes, METH_VARARGS | METH_KEYWORDS, NULL},

View File

@@ -78,48 +78,43 @@ GRID_LABEL_EDGE_ZONE = _grid.GRID_LABEL_EDGE_ZONE
GRID_MIN_ROW_HEIGHT = _grid.GRID_MIN_ROW_HEIGHT
GRID_MIN_COL_WIDTH = _grid.GRID_MIN_COL_WIDTH
GRID_DEFAULT_SCROLLBAR_WIDTH = _grid.GRID_DEFAULT_SCROLLBAR_WIDTH
class GridCellRenderer(object):
"""Proxy of C++ GridCellRenderer class"""
class GridCellWorker(object):
"""Proxy of C++ GridCellWorker class"""
thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
def __init__(self): raise AttributeError, "No constructor defined"
__repr__ = _swig_repr
def _setOORInfo(*args, **kwargs):
"""_setOORInfo(self, PyObject _self)"""
return _grid.GridCellRenderer__setOORInfo(*args, **kwargs)
return _grid.GridCellWorker__setOORInfo(*args, **kwargs)
__swig_destroy__ = _grid.delete_GridCellWorker
__del__ = lambda self : None;
def SetParameters(*args, **kwargs):
"""SetParameters(self, String params)"""
return _grid.GridCellRenderer_SetParameters(*args, **kwargs)
return _grid.GridCellWorker_SetParameters(*args, **kwargs)
def IncRef(*args, **kwargs):
"""IncRef(self)"""
return _grid.GridCellRenderer_IncRef(*args, **kwargs)
return _grid.GridCellWorker_IncRef(*args, **kwargs)
def DecRef(*args, **kwargs):
"""DecRef(self)"""
return _grid.GridCellRenderer_DecRef(*args, **kwargs)
return _grid.GridCellWorker_DecRef(*args, **kwargs)
def Draw(*args, **kwargs):
"""
Draw(self, Grid grid, GridCellAttr attr, DC dc, Rect rect, int row,
int col, bool isSelected)
"""
return _grid.GridCellRenderer_Draw(*args, **kwargs)
def GetBestSize(*args, **kwargs):
"""GetBestSize(self, Grid grid, GridCellAttr attr, DC dc, int row, int col) -> Size"""
return _grid.GridCellRenderer_GetBestSize(*args, **kwargs)
def Clone(*args, **kwargs):
"""Clone(self) -> GridCellRenderer"""
return _grid.GridCellRenderer_Clone(*args, **kwargs)
GridCellRenderer_swigregister = _grid.GridCellRenderer_swigregister
GridCellRenderer_swigregister(GridCellRenderer)
GridCellWorker_swigregister = _grid.GridCellWorker_swigregister
GridCellWorker_swigregister(GridCellWorker)
cvar = _grid.cvar
GridNoCellCoords = cvar.GridNoCellCoords
GridNoCellRect = cvar.GridNoCellRect
class GridCellRenderer(GridCellWorker):
"""Proxy of C++ GridCellRenderer class"""
thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
def __init__(self): raise AttributeError, "No constructor defined"
__repr__ = _swig_repr
GridCellRenderer_swigregister = _grid.GridCellRenderer_swigregister
GridCellRenderer_swigregister(GridCellRenderer)
class PyGridCellRenderer(GridCellRenderer):
"""Proxy of C++ PyGridCellRenderer class"""
thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
@@ -245,15 +240,11 @@ class GridCellAutoWrapStringRenderer(GridCellStringRenderer):
GridCellAutoWrapStringRenderer_swigregister = _grid.GridCellAutoWrapStringRenderer_swigregister
GridCellAutoWrapStringRenderer_swigregister(GridCellAutoWrapStringRenderer)
class GridCellEditor(object):
class GridCellEditor(GridCellWorker):
"""Proxy of C++ GridCellEditor class"""
thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
def __init__(self): raise AttributeError, "No constructor defined"
__repr__ = _swig_repr
def _setOORInfo(*args, **kwargs):
"""_setOORInfo(self, PyObject _self)"""
return _grid.GridCellEditor__setOORInfo(*args, **kwargs)
def IsCreated(*args, **kwargs):
"""IsCreated(self) -> bool"""
return _grid.GridCellEditor_IsCreated(*args, **kwargs)
@@ -274,18 +265,6 @@ class GridCellEditor(object):
"""SetCellAttr(self, GridCellAttr attr)"""
return _grid.GridCellEditor_SetCellAttr(*args, **kwargs)
def SetParameters(*args, **kwargs):
"""SetParameters(self, String params)"""
return _grid.GridCellEditor_SetParameters(*args, **kwargs)
def IncRef(*args, **kwargs):
"""IncRef(self)"""
return _grid.GridCellEditor_IncRef(*args, **kwargs)
def DecRef(*args, **kwargs):
"""DecRef(self)"""
return _grid.GridCellEditor_DecRef(*args, **kwargs)
def Create(*args, **kwargs):
"""Create(self, Window parent, int id, EvtHandler evtHandler)"""
return _grid.GridCellEditor_Create(*args, **kwargs)
@@ -523,6 +502,8 @@ class GridCellAttr(object):
_grid.GridCellAttr_swiginit(self,_grid.new_GridCellAttr(*args, **kwargs))
self._setOORInfo(self)
__swig_destroy__ = _grid.delete_GridCellAttr
__del__ = lambda self : None;
def Clone(*args, **kwargs):
"""Clone(self) -> GridCellAttr"""
return _grid.GridCellAttr_Clone(*args, **kwargs)

File diff suppressed because it is too large Load Diff