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

Use correct DLL import/export specifier for multi-lib builds

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39198 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2006-05-18 01:22:06 +00:00
parent e328812d74
commit f460c29d59
37 changed files with 3885 additions and 3429 deletions
Download Patch File Download Diff File Expand all files Collapse all files
wxPython/src/msw/_controls.py
+27 -10
View File
@@ -1535,6 +1535,11 @@ class TextAttr(object):
"""Init(self)"""
return _controls_.TextAttr_Init(*args, **kwargs)
def Merge(*args, **kwargs):
"""Merge(TextAttr base, TextAttr overlay) -> TextAttr"""
return _controls_.TextAttr_Merge(*args, **kwargs)
Merge = staticmethod(Merge)
def SetTextColour(*args, **kwargs):
"""SetTextColour(self, Colour colText)"""
return _controls_.TextAttr_SetTextColour(*args, **kwargs)
@@ -1648,6 +1653,10 @@ TextAttr_swigregister = _controls_.TextAttr_swigregister
TextAttr_swigregister(TextAttr)
TextCtrlNameStr = cvar.TextCtrlNameStr
def TextAttr_Merge(*args, **kwargs):
"""TextAttr_Merge(TextAttr base, TextAttr overlay) -> TextAttr"""
return _controls_.TextAttr_Merge(*args, **kwargs)
def TextAttr_Combine(*args, **kwargs):
"""TextAttr_Combine(TextAttr attr, TextAttr attrDef, TextCtrl text) -> TextAttr"""
return _controls_.TextAttr_Combine(*args, **kwargs)
@@ -2274,7 +2283,7 @@ class SpinEvent(_core.NotifyEvent):
thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
__repr__ = _swig_repr
def __init__(self, *args, **kwargs):
"""__init__(self, wxEventType commandType=wxEVT_NULL, int winid=0) -> SpinEvent"""
"""__init__(self, EventType commandType=wxEVT_NULL, int winid=0) -> SpinEvent"""
_controls_.SpinEvent_swiginit(self,_controls_.new_SpinEvent(*args, **kwargs))
def GetPosition(*args, **kwargs):
"""GetPosition(self) -> int"""
@@ -2385,6 +2394,14 @@ class RadioBox(_core.Control):
"""GetNextItem(self, int item, int dir, long style) -> int"""
return _controls_.RadioBox_GetNextItem(*args, **kwargs)
def SetItemToolTip(*args, **kwargs):
"""SetItemToolTip(self, unsigned int item, String text)"""
return _controls_.RadioBox_SetItemToolTip(*args, **kwargs)
def GetItemToolTip(*args, **kwargs):
"""GetItemToolTip(self, unsigned int item) -> ToolTip"""
return _controls_.RadioBox_GetItemToolTip(*args, **kwargs)
def GetClassDefaultAttributes(*args, **kwargs):
"""
GetClassDefaultAttributes(int variant=WINDOW_VARIANT_NORMAL) -> VisualAttributes
@@ -2928,7 +2945,7 @@ class BookCtrlBaseEvent(_core.NotifyEvent):
__repr__ = _swig_repr
def __init__(self, *args, **kwargs):
"""
__init__(self, wxEventType commandType=wxEVT_NULL, int id=0, int nSel=-1,
__init__(self, EventType commandType=wxEVT_NULL, int id=0, int nSel=-1,
int nOldSel=-1) -> BookCtrlBaseEvent
"""
_controls_.BookCtrlBaseEvent_swiginit(self,_controls_.new_BookCtrlBaseEvent(*args, **kwargs))
@@ -3062,7 +3079,7 @@ class NotebookEvent(BookCtrlBaseEvent):
__repr__ = _swig_repr
def __init__(self, *args, **kwargs):
"""
__init__(self, wxEventType commandType=wxEVT_NULL, int id=0, int nSel=-1,
__init__(self, EventType commandType=wxEVT_NULL, int id=0, int nSel=-1,
int nOldSel=-1) -> NotebookEvent
"""
_controls_.NotebookEvent_swiginit(self,_controls_.new_NotebookEvent(*args, **kwargs))
@@ -3150,7 +3167,7 @@ class ListbookEvent(BookCtrlBaseEvent):
__repr__ = _swig_repr
def __init__(self, *args, **kwargs):
"""
__init__(self, wxEventType commandType=wxEVT_NULL, int id=0, int nSel=-1,
__init__(self, EventType commandType=wxEVT_NULL, int id=0, int nSel=-1,
int nOldSel=-1) -> ListbookEvent
"""
_controls_.ListbookEvent_swiginit(self,_controls_.new_ListbookEvent(*args, **kwargs))
@@ -3205,7 +3222,7 @@ class ChoicebookEvent(BookCtrlBaseEvent):
__repr__ = _swig_repr
def __init__(self, *args, **kwargs):
"""
__init__(self, wxEventType commandType=wxEVT_NULL, int id=0, int nSel=-1,
__init__(self, EventType commandType=wxEVT_NULL, int id=0, int nSel=-1,
int nOldSel=-1) -> ChoicebookEvent
"""
_controls_.ChoicebookEvent_swiginit(self,_controls_.new_ChoicebookEvent(*args, **kwargs))
@@ -3285,7 +3302,7 @@ class TreebookEvent(BookCtrlBaseEvent):
__repr__ = _swig_repr
def __init__(self, *args, **kwargs):
"""
__init__(self, wxEventType commandType=wxEVT_NULL, int id=0, int nSel=NOT_FOUND,
__init__(self, EventType commandType=wxEVT_NULL, int id=0, int nSel=NOT_FOUND,
int nOldSel=NOT_FOUND) -> TreebookEvent
"""
_controls_.TreebookEvent_swiginit(self,_controls_.new_TreebookEvent(*args, **kwargs))
@@ -3345,7 +3362,7 @@ class ToolbookEvent(BookCtrlBaseEvent):
__repr__ = _swig_repr
def __init__(self, *args, **kwargs):
"""
__init__(self, wxEventType commandType=wxEVT_NULL, int id=0, int nSel=NOT_FOUND,
__init__(self, EventType commandType=wxEVT_NULL, int id=0, int nSel=NOT_FOUND,
int nOldSel=NOT_FOUND) -> ToolbookEvent
"""
_controls_.ToolbookEvent_swiginit(self,_controls_.new_ToolbookEvent(*args, **kwargs))
@@ -4169,7 +4186,7 @@ class ListEvent(_core.NotifyEvent):
thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
__repr__ = _swig_repr
def __init__(self, *args, **kwargs):
"""__init__(self, wxEventType commandType=wxEVT_NULL, int id=0) -> ListEvent"""
"""__init__(self, EventType commandType=wxEVT_NULL, int id=0) -> ListEvent"""
_controls_.ListEvent_swiginit(self,_controls_.new_ListEvent(*args, **kwargs))
m_code = property(_controls_.ListEvent_m_code_get, _controls_.ListEvent_m_code_set)
m_oldItemIndex = property(_controls_.ListEvent_m_oldItemIndex_get, _controls_.ListEvent_m_oldItemIndex_set)
@@ -4914,7 +4931,7 @@ class TreeEvent(_core.NotifyEvent):
thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
__repr__ = _swig_repr
def __init__(self, *args, **kwargs):
"""__init__(self, wxEventType commandType=wxEVT_NULL, int id=0) -> TreeEvent"""
"""__init__(self, EventType commandType=wxEVT_NULL, int id=0) -> TreeEvent"""
_controls_.TreeEvent_swiginit(self,_controls_.new_TreeEvent(*args, **kwargs))
def GetItem(*args, **kwargs):
"""GetItem(self) -> TreeItemId"""
@@ -5734,7 +5751,7 @@ class HelpEvent(_core.CommandEvent):
thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
__repr__ = _swig_repr
def __init__(self, *args, **kwargs):
"""__init__(self, wxEventType type=wxEVT_NULL, int winid=0, Point pt=DefaultPosition) -> HelpEvent"""
"""__init__(self, EventType type=wxEVT_NULL, int winid=0, Point pt=DefaultPosition) -> HelpEvent"""
_controls_.HelpEvent_swiginit(self,_controls_.new_HelpEvent(*args, **kwargs))
def GetPosition(*args, **kwargs):
"""
wxPython/src/msw/_controls_wrap.cpp
+152 -9
View File
@@ -6063,7 +6063,7 @@ SWIGINTERN PyObject *_wrap_ComboBox_Replace(PyObject *SWIGUNUSEDPARM(self), PyOb
PyObject * obj2 = 0 ;
PyObject * obj3 = 0 ;
char * kwnames[] = {
(char *) "self",(char *) "_from",(char *) "to",(char *) "value", NULL
(char *) "self",(char *) "from",(char *) "to",(char *) "value", NULL
};
if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:ComboBox_Replace",kwnames,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
@@ -6123,7 +6123,7 @@ SWIGINTERN PyObject *_wrap_ComboBox_SetMark(PyObject *SWIGUNUSEDPARM(self), PyOb
PyObject * obj1 = 0 ;
PyObject * obj2 = 0 ;
char * kwnames[] = {
(char *) "self",(char *) "_from",(char *) "to", NULL
(char *) "self",(char *) "from",(char *) "to", NULL
};
if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ComboBox_SetMark",kwnames,&obj0,&obj1,&obj2)) SWIG_fail;
@@ -6412,7 +6412,7 @@ SWIGINTERN PyObject *_wrap_ComboBox_Remove(PyObject *SWIGUNUSEDPARM(self), PyObj
PyObject * obj1 = 0 ;
PyObject * obj2 = 0 ;
char * kwnames[] = {
(char *) "self",(char *) "_from",(char *) "to", NULL
(char *) "self",(char *) "from",(char *) "to", NULL
};
if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ComboBox_Remove",kwnames,&obj0,&obj1,&obj2)) SWIG_fail;
@@ -10543,6 +10543,51 @@ fail:
}
SWIGINTERN PyObject *_wrap_TextAttr_Merge(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
PyObject *resultobj = 0;
wxTextAttr *arg1 = 0 ;
wxTextAttr *arg2 = 0 ;
wxTextAttr result;
void *argp1 = 0 ;
int res1 = 0 ;
void *argp2 = 0 ;
int res2 = 0 ;
PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ;
char * kwnames[] = {
(char *) "base",(char *) "overlay", NULL
};
if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:TextAttr_Merge",kwnames,&obj0,&obj1)) SWIG_fail;
res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_wxTextAttr, 0 | 0);
if (!SWIG_IsOK(res1)) {
SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TextAttr_Merge" "', expected argument " "1"" of type '" "wxTextAttr const &""'");
}
if (!argp1) {
SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "TextAttr_Merge" "', expected argument " "1"" of type '" "wxTextAttr const &""'");
}
arg1 = reinterpret_cast< wxTextAttr * >(argp1);
res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_wxTextAttr, 0 | 0);
if (!SWIG_IsOK(res2)) {
SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "TextAttr_Merge" "', expected argument " "2"" of type '" "wxTextAttr const &""'");
}
if (!argp2) {
SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "TextAttr_Merge" "', expected argument " "2"" of type '" "wxTextAttr const &""'");
}
arg2 = reinterpret_cast< wxTextAttr * >(argp2);
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
result = wxTextAttr::Merge((wxTextAttr const &)*arg1,(wxTextAttr const &)*arg2);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
resultobj = SWIG_NewPointerObj((new wxTextAttr(static_cast< const wxTextAttr& >(result))), SWIGTYPE_p_wxTextAttr, SWIG_POINTER_OWN | 0 );
return resultobj;
fail:
return NULL;
}
SWIGINTERN PyObject *_wrap_TextAttr_SetTextColour(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
PyObject *resultobj = 0;
wxTextAttr *arg1 = (wxTextAttr *) 0 ;
@@ -11881,7 +11926,7 @@ SWIGINTERN PyObject *_wrap_TextCtrl_GetRange(PyObject *SWIGUNUSEDPARM(self), PyO
PyObject * obj1 = 0 ;
PyObject * obj2 = 0 ;
char * kwnames[] = {
(char *) "self",(char *) "_from",(char *) "to", NULL
(char *) "self",(char *) "from",(char *) "to", NULL
};
if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:TextCtrl_GetRange",kwnames,&obj0,&obj1,&obj2)) SWIG_fail;
@@ -12277,7 +12322,7 @@ SWIGINTERN PyObject *_wrap_TextCtrl_Replace(PyObject *SWIGUNUSEDPARM(self), PyOb
PyObject * obj2 = 0 ;
PyObject * obj3 = 0 ;
char * kwnames[] = {
(char *) "self",(char *) "_from",(char *) "to",(char *) "value", NULL
(char *) "self",(char *) "from",(char *) "to",(char *) "value", NULL
};
if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:TextCtrl_Replace",kwnames,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
@@ -12337,7 +12382,7 @@ SWIGINTERN PyObject *_wrap_TextCtrl_Remove(PyObject *SWIGUNUSEDPARM(self), PyObj
PyObject * obj1 = 0 ;
PyObject * obj2 = 0 ;
char * kwnames[] = {
(char *) "self",(char *) "_from",(char *) "to", NULL
(char *) "self",(char *) "from",(char *) "to", NULL
};
if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:TextCtrl_Remove",kwnames,&obj0,&obj1,&obj2)) SWIG_fail;
@@ -13553,7 +13598,7 @@ SWIGINTERN PyObject *_wrap_TextCtrl_SetSelection(PyObject *SWIGUNUSEDPARM(self),
PyObject * obj1 = 0 ;
PyObject * obj2 = 0 ;
char * kwnames[] = {
(char *) "self",(char *) "_from",(char *) "to", NULL
(char *) "self",(char *) "from",(char *) "to", NULL
};
if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:TextCtrl_SetSelection",kwnames,&obj0,&obj1,&obj2)) SWIG_fail;
@@ -13784,7 +13829,7 @@ SWIGINTERN PyObject *_wrap_TextCtrl_GetString(PyObject *SWIGUNUSEDPARM(self), Py
PyObject * obj1 = 0 ;
PyObject * obj2 = 0 ;
char * kwnames[] = {
(char *) "self",(char *) "_from",(char *) "to", NULL
(char *) "self",(char *) "from",(char *) "to", NULL
};
if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:TextCtrl_GetString",kwnames,&obj0,&obj1,&obj2)) SWIG_fail;
@@ -15629,7 +15674,7 @@ SWIGINTERN PyObject *_wrap_SpinCtrl_SetSelection(PyObject *SWIGUNUSEDPARM(self),
PyObject * obj1 = 0 ;
PyObject * obj2 = 0 ;
char * kwnames[] = {
(char *) "self",(char *) "_from",(char *) "to", NULL
(char *) "self",(char *) "from",(char *) "to", NULL
};
if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:SpinCtrl_SetSelection",kwnames,&obj0,&obj1,&obj2)) SWIG_fail;
@@ -16840,6 +16885,101 @@ fail:
}
SWIGINTERN PyObject *_wrap_RadioBox_SetItemToolTip(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
PyObject *resultobj = 0;
wxRadioBox *arg1 = (wxRadioBox *) 0 ;
unsigned int arg2 ;
wxString *arg3 = 0 ;
void *argp1 = 0 ;
int res1 = 0 ;
unsigned int val2 ;
int ecode2 = 0 ;
bool temp3 = false ;
PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ;
PyObject * obj2 = 0 ;
char * kwnames[] = {
(char *) "self",(char *) "item",(char *) "text", NULL
};
if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:RadioBox_SetItemToolTip",kwnames,&obj0,&obj1,&obj2)) SWIG_fail;
res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxRadioBox, 0 | 0 );
if (!SWIG_IsOK(res1)) {
SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "RadioBox_SetItemToolTip" "', expected argument " "1"" of type '" "wxRadioBox *""'");
}
arg1 = reinterpret_cast< wxRadioBox * >(argp1);
ecode2 = SWIG_AsVal_unsigned_SS_int(obj1, &val2);
if (!SWIG_IsOK(ecode2)) {
SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "RadioBox_SetItemToolTip" "', expected argument " "2"" of type '" "unsigned int""'");
}
arg2 = static_cast< unsigned int >(val2);
{
arg3 = wxString_in_helper(obj2);
if (arg3 == NULL) SWIG_fail;
temp3 = true;
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
(arg1)->SetItemToolTip(arg2,(wxString const &)*arg3);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
resultobj = SWIG_Py_Void();
{
if (temp3)
delete arg3;
}
return resultobj;
fail:
{
if (temp3)
delete arg3;
}
return NULL;
}
SWIGINTERN PyObject *_wrap_RadioBox_GetItemToolTip(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
PyObject *resultobj = 0;
wxRadioBox *arg1 = (wxRadioBox *) 0 ;
unsigned int arg2 ;
wxToolTip *result = 0 ;
void *argp1 = 0 ;
int res1 = 0 ;
unsigned int val2 ;
int ecode2 = 0 ;
PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ;
char * kwnames[] = {
(char *) "self",(char *) "item", NULL
};
if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:RadioBox_GetItemToolTip",kwnames,&obj0,&obj1)) SWIG_fail;
res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxRadioBox, 0 | 0 );
if (!SWIG_IsOK(res1)) {
SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "RadioBox_GetItemToolTip" "', expected argument " "1"" of type '" "wxRadioBox const *""'");
}
arg1 = reinterpret_cast< wxRadioBox * >(argp1);
ecode2 = SWIG_AsVal_unsigned_SS_int(obj1, &val2);
if (!SWIG_IsOK(ecode2)) {
SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "RadioBox_GetItemToolTip" "', expected argument " "2"" of type '" "unsigned int""'");
}
arg2 = static_cast< unsigned int >(val2);
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
result = (wxToolTip *)((wxRadioBox const *)arg1)->GetItemToolTip(arg2);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
{
resultobj = wxPyMake_wxObject(result, (bool)0);
}
return resultobj;
fail:
return NULL;
}
SWIGINTERN PyObject *_wrap_RadioBox_GetClassDefaultAttributes(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
PyObject *resultobj = 0;
wxWindowVariant arg1 = (wxWindowVariant) wxWINDOW_VARIANT_NORMAL ;
@@ -41073,6 +41213,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"new_TextAttr", (PyCFunction) _wrap_new_TextAttr, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"delete_TextAttr", (PyCFunction)_wrap_delete_TextAttr, METH_O, NULL},
{ (char *)"TextAttr_Init", (PyCFunction)_wrap_TextAttr_Init, METH_O, NULL},
{ (char *)"TextAttr_Merge", (PyCFunction) _wrap_TextAttr_Merge, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"TextAttr_SetTextColour", (PyCFunction) _wrap_TextAttr_SetTextColour, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"TextAttr_SetBackgroundColour", (PyCFunction) _wrap_TextAttr_SetBackgroundColour, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"TextAttr_SetFont", (PyCFunction) _wrap_TextAttr_SetFont, METH_VARARGS | METH_KEYWORDS, NULL},
@@ -41229,6 +41370,8 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"RadioBox_GetColumnCount", (PyCFunction)_wrap_RadioBox_GetColumnCount, METH_O, NULL},
{ (char *)"RadioBox_GetRowCount", (PyCFunction)_wrap_RadioBox_GetRowCount, METH_O, NULL},
{ (char *)"RadioBox_GetNextItem", (PyCFunction) _wrap_RadioBox_GetNextItem, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"RadioBox_SetItemToolTip", (PyCFunction) _wrap_RadioBox_SetItemToolTip, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"RadioBox_GetItemToolTip", (PyCFunction) _wrap_RadioBox_GetItemToolTip, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"RadioBox_GetClassDefaultAttributes", (PyCFunction) _wrap_RadioBox_GetClassDefaultAttributes, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"RadioBox_swigregister", RadioBox_swigregister, METH_VARARGS, NULL},
{ (char *)"RadioBox_swiginit", RadioBox_swiginit, METH_VARARGS, NULL},
wxPython/src/msw/_core.py
+36 -23
View File
@@ -292,6 +292,7 @@ PD_SMOOTH = _core_.PD_SMOOTH
PD_CAN_SKIP = _core_.PD_CAN_SKIP
DD_NEW_DIR_BUTTON = _core_.DD_NEW_DIR_BUTTON
DD_DEFAULT_STYLE = _core_.DD_DEFAULT_STYLE
DD_CHANGE_DIR = _core_.DD_CHANGE_DIR
MENU_TEAROFF = _core_.MENU_TEAROFF
MB_DOCKABLE = _core_.MB_DOCKABLE
NO_FULL_REPAINT_ON_RESIZE = _core_.NO_FULL_REPAINT_ON_RESIZE
@@ -3330,7 +3331,7 @@ class EvtHandler(Object):
return _core_.EvtHandler_Connect(*args, **kwargs)
def Disconnect(*args, **kwargs):
"""Disconnect(self, int id, int lastId=-1, wxEventType eventType=wxEVT_NULL) -> bool"""
"""Disconnect(self, int id, int lastId=-1, EventType eventType=wxEVT_NULL) -> bool"""
return _core_.EvtHandler_Disconnect(*args, **kwargs)
def _setOORInfo(*args, **kwargs):
@@ -3454,7 +3455,7 @@ EVENT_PROPAGATE_NONE = _core_.EVENT_PROPAGATE_NONE
EVENT_PROPAGATE_MAX = _core_.EVENT_PROPAGATE_MAX
def NewEventType(*args):
"""NewEventType() -> wxEventType"""
"""NewEventType() -> EventType"""
return _core_.NewEventType(*args)
wxEVT_NULL = _core_.wxEVT_NULL
wxEVT_FIRST = _core_.wxEVT_FIRST
@@ -3766,7 +3767,7 @@ class Event(Object):
__del__ = lambda self : None;
def SetEventType(*args, **kwargs):
"""
SetEventType(self, wxEventType typ)
SetEventType(self, EventType typ)
Sets the specific type of the event.
"""
@@ -3774,7 +3775,7 @@ class Event(Object):
def GetEventType(*args, **kwargs):
"""
GetEventType(self) -> wxEventType
GetEventType(self) -> EventType
Returns the identifier of the given event type, such as
``wxEVT_COMMAND_BUTTON_CLICKED``.
@@ -3954,7 +3955,7 @@ class CommandEvent(Event):
__repr__ = _swig_repr
def __init__(self, *args, **kwargs):
"""
__init__(self, wxEventType commandType=wxEVT_NULL, int winid=0) -> CommandEvent
__init__(self, EventType commandType=wxEVT_NULL, int winid=0) -> CommandEvent
This event class contains information about command events, which
originate from a variety of simple controls, as well as menus and
@@ -4028,7 +4029,7 @@ class CommandEvent(Event):
def GetInt(*args, **kwargs):
"""
GetInt(self) -> long
GetInt(self) -> int
Returns the integer identifier corresponding to a listbox, choice or
radiobox selection (only if the event was a selection, not a
@@ -4075,7 +4076,7 @@ class NotifyEvent(CommandEvent):
__repr__ = _swig_repr
def __init__(self, *args, **kwargs):
"""
__init__(self, wxEventType commandType=wxEVT_NULL, int winid=0) -> NotifyEvent
__init__(self, EventType commandType=wxEVT_NULL, int winid=0) -> NotifyEvent
An instance of this class (or one of its derived classes) is sent from
a control when the control's state is being changed and the control
@@ -4131,7 +4132,7 @@ class ScrollEvent(CommandEvent):
__repr__ = _swig_repr
def __init__(self, *args, **kwargs):
"""
__init__(self, wxEventType commandType=wxEVT_NULL, int winid=0, int pos=0,
__init__(self, EventType commandType=wxEVT_NULL, int winid=0, int pos=0,
int orient=0) -> ScrollEvent
"""
_core_.ScrollEvent_swiginit(self,_core_.new_ScrollEvent(*args, **kwargs))
@@ -4174,7 +4175,7 @@ class ScrollWinEvent(Event):
__repr__ = _swig_repr
def __init__(self, *args, **kwargs):
"""
__init__(self, wxEventType commandType=wxEVT_NULL, int pos=0, int orient=0) -> ScrollWinEvent
__init__(self, EventType commandType=wxEVT_NULL, int pos=0, int orient=0) -> ScrollWinEvent
A wx.ScrollWinEvent holds information about scrolling and is sent from
scrolling windows.
@@ -4243,7 +4244,7 @@ class MouseEvent(Event):
__repr__ = _swig_repr
def __init__(self, *args, **kwargs):
"""
__init__(self, wxEventType mouseType=wxEVT_NULL) -> MouseEvent
__init__(self, EventType mouseType=wxEVT_NULL) -> MouseEvent
Constructs a wx.MouseEvent. Valid event types are:
@@ -4757,7 +4758,7 @@ class KeyEvent(Event):
__repr__ = _swig_repr
def __init__(self, *args, **kwargs):
"""
__init__(self, wxEventType eventType=wxEVT_NULL) -> KeyEvent
__init__(self, EventType eventType=wxEVT_NULL) -> KeyEvent
Construct a new `wx.KeyEvent`. Valid event types are:
*
@@ -5118,7 +5119,7 @@ class FocusEvent(Event):
__repr__ = _swig_repr
def __init__(self, *args, **kwargs):
"""
__init__(self, wxEventType type=wxEVT_NULL, int winid=0) -> FocusEvent
__init__(self, EventType type=wxEVT_NULL, int winid=0) -> FocusEvent
Constructor
"""
@@ -5193,7 +5194,7 @@ class ActivateEvent(Event):
__repr__ = _swig_repr
def __init__(self, *args, **kwargs):
"""
__init__(self, wxEventType type=wxEVT_NULL, bool active=True, int Id=0) -> ActivateEvent
__init__(self, EventType type=wxEVT_NULL, bool active=True, int Id=0) -> ActivateEvent
Constructor
"""
@@ -5247,7 +5248,7 @@ class MenuEvent(Event):
__repr__ = _swig_repr
def __init__(self, *args, **kwargs):
"""
__init__(self, wxEventType type=wxEVT_NULL, int winid=0, Menu menu=None) -> MenuEvent
__init__(self, EventType type=wxEVT_NULL, int winid=0, Menu menu=None) -> MenuEvent
Constructor
"""
@@ -5312,7 +5313,7 @@ class CloseEvent(Event):
__repr__ = _swig_repr
def __init__(self, *args, **kwargs):
"""
__init__(self, wxEventType type=wxEVT_NULL, int winid=0) -> CloseEvent
__init__(self, EventType type=wxEVT_NULL, int winid=0) -> CloseEvent
Constructor.
"""
@@ -6166,7 +6167,7 @@ class ContextMenuEvent(CommandEvent):
__repr__ = _swig_repr
def __init__(self, *args, **kwargs):
"""
__init__(self, wxEventType type=wxEVT_NULL, int winid=0, Point pt=DefaultPosition) -> ContextMenuEvent
__init__(self, EventType type=wxEVT_NULL, int winid=0, Point pt=DefaultPosition) -> ContextMenuEvent
Constructor.
"""
@@ -6357,7 +6358,7 @@ class PyEvent(Event):
thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
__repr__ = _swig_repr
def __init__(self, *args, **kwargs):
"""__init__(self, int winid=0, wxEventType eventType=wxEVT_NULL) -> PyEvent"""
"""__init__(self, int winid=0, EventType eventType=wxEVT_NULL) -> PyEvent"""
_core_.PyEvent_swiginit(self,_core_.new_PyEvent(*args, **kwargs))
self._SetSelf(self)
@@ -6389,7 +6390,7 @@ class PyCommandEvent(CommandEvent):
thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
__repr__ = _swig_repr
def __init__(self, *args, **kwargs):
"""__init__(self, wxEventType eventType=wxEVT_NULL, int id=0) -> PyCommandEvent"""
"""__init__(self, EventType eventType=wxEVT_NULL, int id=0) -> PyCommandEvent"""
_core_.PyCommandEvent_swiginit(self,_core_.new_PyCommandEvent(*args, **kwargs))
self._SetSelf(self)
@@ -6416,7 +6417,7 @@ class DateEvent(CommandEvent):
thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
__repr__ = _swig_repr
def __init__(self, *args, **kwargs):
"""__init__(self, Window win, DateTime dt, wxEventType type) -> DateEvent"""
"""__init__(self, Window win, DateTime dt, EventType type) -> DateEvent"""
_core_.DateEvent_swiginit(self,_core_.new_DateEvent(*args, **kwargs))
def GetDate(*args, **kwargs):
"""
@@ -7137,6 +7138,15 @@ your Mac."""
self._BootstrapApp()
def OnPreInit(self):
"""
Things that must be done after _BootstrapApp has done its
thing, but would be nice if they were already done by the time
that OnInit is called.
"""
wx.StockGDI._initStockObjects()
def __del__(self, destroy=wx.PyApp.__del__):
self.RestoreStdio() # Just in case the MainLoop was overridden
destroy(self)
@@ -10678,10 +10688,13 @@ ControlWithItems_swigregister(ControlWithItems)
class SizerItem(Object):
"""
The wx.SizerItem class is used to track the position, size and other
attributes of each item managed by a `wx.Sizer`. In normal usage user
code should never need to deal directly with a wx.SizerItem, but
custom classes derived from `wx.PySizer` will probably need to use the
collection of wx.SizerItems held by wx.Sizer when calculating layout.
attributes of each item managed by a `wx.Sizer`. It is not usually
necessary to use this class because the sizer elements can also be
identified by their positions or window or sizer references but
sometimes it may be more convenient to use wx.SizerItem directly.
Also, custom classes derived from `wx.PySizer` will probably need to
use the collection of wx.SizerItems held by wx.Sizer when calculating
layout.
:see: `wx.Sizer`, `wx.GBSizerItem`
"""
wxPython/src/msw/_core_wrap.cpp
+5 -3
View File
@@ -2689,6 +2689,7 @@ namespace swig {
#include "wx/wxPython/wxPython_int.h"
#include "wx/wxPython/pyclasses.h"
#include "wx/wxPython/twoitem.h"
#ifndef wxPyUSE_EXPORT
@@ -19071,7 +19072,7 @@ fail:
SWIGINTERN PyObject *_wrap_CommandEvent_GetInt(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
wxCommandEvent *arg1 = (wxCommandEvent *) 0 ;
long result;
int result;
void *argp1 = 0 ;
int res1 = 0 ;
PyObject *swig_obj[1] ;
@@ -19085,11 +19086,11 @@ SWIGINTERN PyObject *_wrap_CommandEvent_GetInt(PyObject *SWIGUNUSEDPARM(self), P
arg1 = reinterpret_cast< wxCommandEvent * >(argp1);
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
result = (long)((wxCommandEvent const *)arg1)->GetInt();
result = (int)((wxCommandEvent const *)arg1)->GetInt();
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
resultobj = SWIG_From_long(static_cast< long >(result));
resultobj = SWIG_From_int(static_cast< int >(result));
return resultobj;
fail:
return NULL;
@@ -55703,6 +55704,7 @@ SWIGEXPORT void SWIG_init(void) {
SWIG_Python_SetConstant(d, "PD_CAN_SKIP",SWIG_From_int(static_cast< int >(wxPD_CAN_SKIP)));
SWIG_Python_SetConstant(d, "DD_NEW_DIR_BUTTON",SWIG_From_int(static_cast< int >(wxDD_NEW_DIR_BUTTON)));
SWIG_Python_SetConstant(d, "DD_DEFAULT_STYLE",SWIG_From_int(static_cast< int >(wxDD_DEFAULT_STYLE)));
SWIG_Python_SetConstant(d, "DD_CHANGE_DIR",SWIG_From_int(static_cast< int >(wxDD_CHANGE_DIR)));
SWIG_Python_SetConstant(d, "MENU_TEAROFF",SWIG_From_int(static_cast< int >(wxMENU_TEAROFF)));
SWIG_Python_SetConstant(d, "MB_DOCKABLE",SWIG_From_int(static_cast< int >(wxMB_DOCKABLE)));
SWIG_Python_SetConstant(d, "NO_FULL_REPAINT_ON_RESIZE",SWIG_From_int(static_cast< int >(wxNO_FULL_REPAINT_ON_RESIZE)));
wxPython/src/msw/_gdi.py
+110 -72
View File
@@ -73,6 +73,9 @@ GDIObject_swigregister(GDIObject)
#---------------------------------------------------------------------------
C2S_NAME = _gdi_.C2S_NAME
C2S_CSS_SYNTAX = _gdi_.C2S_CSS_SYNTAX
C2S_HTML_SYNTAX = _gdi_.C2S_HTML_SYNTAX
class Colour(_core.Object):
"""
A colour is an object representing a combination of Red, Green, and
@@ -168,6 +171,20 @@ class Colour(_core.Object):
"""
return _gdi_.Colour_SetFromName(*args, **kwargs)
def GetAsString(*args, **kwargs):
"""
GetAsString(self, long flags=wxC2S_NAME|wxC2S_CSS_SYNTAX) -> String
Return the colour as a string. Acceptable flags are:
=================== ==================================
wx.C2S_NAME return colour name, when possible
wx.C2S_CSS_SYNTAX return colour in rgb(r,g,b) syntax
wx.C2S_HTML_SYNTAX return colour in #rrggbb syntax
=================== ==================================
"""
return _gdi_.Colour_GetAsString(*args, **kwargs)
def GetPixel(*args, **kwargs):
"""
GetPixel(self) -> long
@@ -4535,6 +4552,49 @@ class StockGDI(object):
"""GetFont(self, int item) -> Font"""
return _gdi_.StockGDI_GetFont(*args, **kwargs)
def _initStockObjects():
import wx
wx.ITALIC_FONT = StockGDI.instance().GetFont(StockGDI.FONT_ITALIC)
wx.NORMAL_FONT = StockGDI.instance().GetFont(StockGDI.FONT_NORMAL)
wx.SMALL_FONT = StockGDI.instance().GetFont(StockGDI.FONT_SMALL)
wx.SWISS_FONT = StockGDI.instance().GetFont(StockGDI.FONT_SWISS)
wx.BLACK_DASHED_PEN = StockGDI.GetPen(StockGDI.PEN_BLACKDASHED)
wx.BLACK_PEN = StockGDI.GetPen(StockGDI.PEN_BLACK)
wx.CYAN_PEN = StockGDI.GetPen(StockGDI.PEN_CYAN)
wx.GREEN_PEN = StockGDI.GetPen(StockGDI.PEN_GREEN)
wx.GREY_PEN = StockGDI.GetPen(StockGDI.PEN_GREY)
wx.LIGHT_GREY_PEN = StockGDI.GetPen(StockGDI.PEN_LIGHTGREY)
wx.MEDIUM_GREY_PEN = StockGDI.GetPen(StockGDI.PEN_MEDIUMGREY)
wx.RED_PEN = StockGDI.GetPen(StockGDI.PEN_RED)
wx.TRANSPARENT_PEN = StockGDI.GetPen(StockGDI.PEN_TRANSPARENT)
wx.WHITE_PEN = StockGDI.GetPen(StockGDI.PEN_WHITE)
wx.BLACK_BRUSH = StockGDI.GetBrush(StockGDI.BRUSH_BLACK)
wx.BLUE_BRUSH = StockGDI.GetBrush(StockGDI.BRUSH_BLUE)
wx.CYAN_BRUSH = StockGDI.GetBrush(StockGDI.BRUSH_CYAN)
wx.GREEN_BRUSH = StockGDI.GetBrush(StockGDI.BRUSH_GREEN)
wx.GREY_BRUSH = StockGDI.GetBrush(StockGDI.BRUSH_GREY)
wx.LIGHT_GREY_BRUSH = StockGDI.GetBrush(StockGDI.BRUSH_LIGHTGREY)
wx.MEDIUM_GREY_BRUSH = StockGDI.GetBrush(StockGDI.BRUSH_MEDIUMGREY)
wx.RED_BRUSH = StockGDI.GetBrush(StockGDI.BRUSH_RED)
wx.TRANSPARENT_BRUSH = StockGDI.GetBrush(StockGDI.BRUSH_TRANSPARENT)
wx.WHITE_BRUSH = StockGDI.GetBrush(StockGDI.BRUSH_WHITE)
wx.BLACK = StockGDI.GetColour(StockGDI.COLOUR_BLACK)
wx.BLUE = StockGDI.GetColour(StockGDI.COLOUR_BLUE)
wx.CYAN = StockGDI.GetColour(StockGDI.COLOUR_CYAN)
wx.GREEN = StockGDI.GetColour(StockGDI.COLOUR_GREEN)
wx.LIGHT_GREY = StockGDI.GetColour(StockGDI.COLOUR_LIGHTGREY)
wx.RED = StockGDI.GetColour(StockGDI.COLOUR_RED)
wx.WHITE = StockGDI.GetColour(StockGDI.COLOUR_WHITE)
wx.CROSS_CURSOR = StockGDI.GetCursor(StockGDI.CURSOR_CROSS)
wx.HOURGLASS_CURSOR = StockGDI.GetCursor(StockGDI.CURSOR_HOURGLASS)
wx.STANDARD_CURSOR = StockGDI.GetCursor(StockGDI.CURSOR_STANDARD)
_initStockObjects = staticmethod(_initStockObjects)
StockGDI_swigregister = _gdi_.StockGDI_swigregister
StockGDI_swigregister(StockGDI)
@@ -4562,75 +4622,6 @@ def StockGDI_GetPen(*args, **kwargs):
"""StockGDI_GetPen(int item) -> Pen"""
return _gdi_.StockGDI_GetPen(*args, **kwargs)
# This function makes a class used to do delayed initialization of some
# stock wx objects. When they are used the first time then an init function
# is called to make the real instance, which is then used to replace the
# original instance and class seen by the programmer.
def _wxPyMakeDelayedInitWrapper(initFunc):
class _wxPyStockObjectWrapper(object):
def __init__(self, *args):
self._args = args
def __getattr__(self, name):
obj = initFunc(*self._args)
self.__class__ = obj.__class__
self.__dict__ = obj.__dict__
return getattr(self, name)
def __str__(self):
return self.__getattr__("__str__")()
def __repr__(self):
return self.__getattr__("__repr__")()
return _wxPyStockObjectWrapper
def _wxPyFontInit(id):
return StockGDI.instance().GetFont(id)
_wxPyStockPen = _wxPyMakeDelayedInitWrapper(StockGDI.GetPen)
_wxPyStockBrush = _wxPyMakeDelayedInitWrapper(StockGDI.GetBrush)
_wxPyStockCursor = _wxPyMakeDelayedInitWrapper(StockGDI.GetCursor)
_wxPyStockColour = _wxPyMakeDelayedInitWrapper(StockGDI.GetColour)
_wxPyStockFont = _wxPyMakeDelayedInitWrapper(_wxPyFontInit)
ITALIC_FONT = _wxPyStockCursor(StockGDI.FONT_ITALIC)
NORMAL_FONT = _wxPyStockCursor(StockGDI.FONT_NORMAL)
SMALL_FONT = _wxPyStockCursor(StockGDI.FONT_SMALL)
SWISS_FONT = _wxPyStockCursor(StockGDI.FONT_SWISS)
BLACK_DASHED_PEN = _wxPyStockPen(StockGDI.PEN_BLACKDASHED)
BLACK_PEN = _wxPyStockPen(StockGDI.PEN_BLACK)
CYAN_PEN = _wxPyStockPen(StockGDI.PEN_CYAN)
GREEN_PEN = _wxPyStockPen(StockGDI.PEN_GREEN)
GREY_PEN = _wxPyStockPen(StockGDI.PEN_GREY)
LIGHT_GREY_PEN = _wxPyStockPen(StockGDI.PEN_LIGHTGREY)
MEDIUM_GREY_PEN = _wxPyStockPen(StockGDI.PEN_MEDIUMGREY)
RED_PEN = _wxPyStockPen(StockGDI.PEN_RED)
TRANSPARENT_PEN = _wxPyStockPen(StockGDI.PEN_TRANSPARENT)
WHITE_PEN = _wxPyStockPen(StockGDI.PEN_WHITE)
BLACK_BRUSH = _wxPyStockBrush(StockGDI.BRUSH_BLACK)
BLUE_BRUSH = _wxPyStockBrush(StockGDI.BRUSH_BLUE)
CYAN_BRUSH = _wxPyStockBrush(StockGDI.BRUSH_CYAN)
GREEN_BRUSH = _wxPyStockBrush(StockGDI.BRUSH_GREEN)
GREY_BRUSH = _wxPyStockBrush(StockGDI.BRUSH_GREY)
LIGHT_GREY_BRUSH = _wxPyStockBrush(StockGDI.BRUSH_LIGHTGREY)
MEDIUM_GREY_BRUSH = _wxPyStockBrush(StockGDI.BRUSH_MEDIUMGREY)
RED_BRUSH = _wxPyStockBrush(StockGDI.BRUSH_RED)
TRANSPARENT_BRUSH = _wxPyStockBrush(StockGDI.BRUSH_TRANSPARENT)
WHITE_BRUSH = _wxPyStockBrush(StockGDI.BRUSH_WHITE)
BLACK = _wxPyStockColour(StockGDI.COLOUR_BLACK)
BLUE = _wxPyStockColour(StockGDI.COLOUR_BLUE)
CYAN = _wxPyStockColour(StockGDI.COLOUR_CYAN)
GREEN = _wxPyStockColour(StockGDI.COLOUR_GREEN)
LIGHT_GREY = _wxPyStockColour(StockGDI.COLOUR_LIGHTGREY)
RED = _wxPyStockColour(StockGDI.COLOUR_RED)
WHITE = _wxPyStockColour(StockGDI.COLOUR_WHITE)
CROSS_CURSOR = _wxPyStockCursor(StockGDI.CURSOR_CROSS)
HOURGLASS_CURSOR = _wxPyStockCursor(StockGDI.CURSOR_HOURGLASS)
STANDARD_CURSOR = _wxPyStockCursor(StockGDI.CURSOR_STANDARD)
class GDIObjListBase(object):
"""Proxy of C++ GDIObjListBase class"""
thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
@@ -4772,6 +4763,25 @@ def _wxPyInitTheBrushList(*args):
def _wxPyInitTheColourDatabase(*args):
"""_wxPyInitTheColourDatabase() -> ColourDatabase"""
return _gdi_._wxPyInitTheColourDatabase(*args)
# This function makes a class used to do delayed initialization of some
# stock wx objects. When they are used the first time then an init function
# is called to make the real instance, which is then used to replace the
# original instance and class seen by the programmer.
def _wxPyMakeDelayedInitWrapper(initFunc):
class _wxPyStockObjectWrapper(object):
def __init__(self, *args):
self._args = args
def __getattr__(self, name):
obj = initFunc(*self._args)
self.__class__ = obj.__class__
self.__dict__ = obj.__dict__
return getattr(self, name)
def __str__(self):
return self.__getattr__("__str__")()
def __repr__(self):
return self.__getattr__("__repr__")()
return _wxPyStockObjectWrapper
wxTheFontList = _wxPyMakeDelayedInitWrapper(_wxPyInitTheFontList)()
wxThePenList = _wxPyMakeDelayedInitWrapper(_wxPyInitThePenList)()
wxTheBrushList = _wxPyMakeDelayedInitWrapper(_wxPyInitTheBrushList)()
@@ -5013,14 +5023,42 @@ class RendererNative(object):
"""
return _gdi_.RendererNative_DrawDropArrow(*args, **kwargs)
def DrawCheckButton(*args, **kwargs):
def DrawCheckBox(*args, **kwargs):
"""
DrawCheckButton(self, Window win, DC dc, Rect rect, int flags=0)
DrawCheckBox(self, Window win, DC dc, Rect rect, int flags=0)
Draw a check button. Flags may use wx.CONTROL_CHECKED,
wx.CONTROL_UNDETERMINED and wx.CONTROL_CURRENT.
"""
return _gdi_.RendererNative_DrawCheckButton(*args, **kwargs)
return _gdi_.RendererNative_DrawCheckBox(*args, **kwargs)
def DrawPushButton(*args, **kwargs):
"""
DrawPushButton(self, Window win, DC dc, Rect rect, int flags=0)
Draw a blank button. Flags may be wx.CONTROL_PRESSED, wx.CONTROL_CURRENT and
wx.CONTROL_ISDEFAULT
"""
return _gdi_.RendererNative_DrawPushButton(*args, **kwargs)
def DrawItemSelectionRect(*args, **kwargs):
"""
DrawItemSelectionRect(self, Window win, DC dc, Rect rect, int flags=0)
Draw rectangle indicating that an item in e.g. a list control has been
selected or focused
The flags parameter may be:
==================== ============================================
wx.CONTROL_SELECTED item is selected, e.g. draw background
wx.CONTROL_CURRENT item is the current item, e.g. dotted border
wx.CONTROL_FOCUSED the whole control has focus, e.g. blue
background vs. grey otherwise
==================== ============================================
"""
return _gdi_.RendererNative_DrawItemSelectionRect(*args, **kwargs)
def GetSplitterParams(*args, **kwargs):
"""
wxPython/src/msw/_gdi_wrap.cpp
+208 -19
View File
@@ -2701,6 +2701,16 @@ namespace swig {
static const wxString wxPyEmptyString(wxEmptyString);
#define SWIG_From_long PyInt_FromLong
SWIGINTERNINLINE PyObject *
SWIG_From_int (int value)
{
return SWIG_From_long (value);
}
#include <limits.h>
#ifndef LLONG_MIN
# define LLONG_MIN LONG_LONG_MIN
@@ -2753,9 +2763,6 @@ SWIG_AsVal_unsigned_SS_char (PyObject * obj, unsigned char *val)
}
#define SWIG_From_long PyInt_FromLong
SWIGINTERNINLINE PyObject*
SWIG_From_unsigned_SS_long (unsigned long value)
{
@@ -2822,13 +2829,6 @@ SWIG_AsVal_int (PyObject * obj, int *val)
return res;
}
SWIGINTERNINLINE PyObject *
SWIG_From_int (int value)
{
return SWIG_From_long (value);
}
SWIGINTERN PyObject *wxPen_GetDashes(wxPen *self){
wxDash* dashes;
int count = self->GetDashes(&dashes);
@@ -3736,6 +3736,53 @@ fail:
}
SWIGINTERN PyObject *_wrap_Colour_GetAsString(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
PyObject *resultobj = 0;
wxColour *arg1 = (wxColour *) 0 ;
long arg2 = (long) wxC2S_NAME|wxC2S_CSS_SYNTAX ;
wxString result;
void *argp1 = 0 ;
int res1 = 0 ;
long val2 ;
int ecode2 = 0 ;
PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ;
char * kwnames[] = {
(char *) "self",(char *) "flags", NULL
};
if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:Colour_GetAsString",kwnames,&obj0,&obj1)) SWIG_fail;
res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxColour, 0 | 0 );
if (!SWIG_IsOK(res1)) {
SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Colour_GetAsString" "', expected argument " "1"" of type '" "wxColour const *""'");
}
arg1 = reinterpret_cast< wxColour * >(argp1);
if (obj1) {
ecode2 = SWIG_AsVal_long(obj1, &val2);
if (!SWIG_IsOK(ecode2)) {
SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Colour_GetAsString" "', expected argument " "2"" of type '" "long""'");
}
arg2 = static_cast< long >(val2);
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
result = ((wxColour const *)arg1)->GetAsString(arg2);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
{
#if wxUSE_UNICODE
resultobj = PyUnicode_FromWideChar((&result)->c_str(), (&result)->Len());
#else
resultobj = PyString_FromStringAndSize((&result)->c_str(), (&result)->Len());
#endif
}
return resultobj;
fail:
return NULL;
}
SWIGINTERN PyObject *_wrap_Colour_GetPixel(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
wxColour *arg1 = (wxColour *) 0 ;
@@ -25373,7 +25420,7 @@ fail:
}
SWIGINTERN PyObject *_wrap_RendererNative_DrawCheckButton(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
SWIGINTERN PyObject *_wrap_RendererNative_DrawCheckBox(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
PyObject *resultobj = 0;
wxRendererNative *arg1 = (wxRendererNative *) 0 ;
wxWindow *arg2 = (wxWindow *) 0 ;
@@ -25398,23 +25445,23 @@ SWIGINTERN PyObject *_wrap_RendererNative_DrawCheckButton(PyObject *SWIGUNUSEDPA
(char *) "self",(char *) "win",(char *) "dc",(char *) "rect",(char *) "flags", NULL
};
if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|O:RendererNative_DrawCheckButton",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|O:RendererNative_DrawCheckBox",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxRendererNative, 0 | 0 );
if (!SWIG_IsOK(res1)) {
SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "RendererNative_DrawCheckButton" "', expected argument " "1"" of type '" "wxRendererNative *""'");
SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "RendererNative_DrawCheckBox" "', expected argument " "1"" of type '" "wxRendererNative *""'");
}
arg1 = reinterpret_cast< wxRendererNative * >(argp1);
res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_wxWindow, 0 | 0 );
if (!SWIG_IsOK(res2)) {
SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "RendererNative_DrawCheckButton" "', expected argument " "2"" of type '" "wxWindow *""'");
SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "RendererNative_DrawCheckBox" "', expected argument " "2"" of type '" "wxWindow *""'");
}
arg2 = reinterpret_cast< wxWindow * >(argp2);
res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_wxDC, 0 );
if (!SWIG_IsOK(res3)) {
SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "RendererNative_DrawCheckButton" "', expected argument " "3"" of type '" "wxDC &""'");
SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "RendererNative_DrawCheckBox" "', expected argument " "3"" of type '" "wxDC &""'");
}
if (!argp3) {
SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "RendererNative_DrawCheckButton" "', expected argument " "3"" of type '" "wxDC &""'");
SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "RendererNative_DrawCheckBox" "', expected argument " "3"" of type '" "wxDC &""'");
}
arg3 = reinterpret_cast< wxDC * >(argp3);
{
@@ -25424,13 +25471,149 @@ SWIGINTERN PyObject *_wrap_RendererNative_DrawCheckButton(PyObject *SWIGUNUSEDPA
if (obj4) {
ecode5 = SWIG_AsVal_int(obj4, &val5);
if (!SWIG_IsOK(ecode5)) {
SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "RendererNative_DrawCheckButton" "', expected argument " "5"" of type '" "int""'");
SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "RendererNative_DrawCheckBox" "', expected argument " "5"" of type '" "int""'");
}
arg5 = static_cast< int >(val5);
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
(arg1)->DrawCheckButton(arg2,*arg3,(wxRect const &)*arg4,arg5);
(arg1)->DrawCheckBox(arg2,*arg3,(wxRect const &)*arg4,arg5);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
resultobj = SWIG_Py_Void();
return resultobj;
fail:
return NULL;
}
SWIGINTERN PyObject *_wrap_RendererNative_DrawPushButton(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
PyObject *resultobj = 0;
wxRendererNative *arg1 = (wxRendererNative *) 0 ;
wxWindow *arg2 = (wxWindow *) 0 ;
wxDC *arg3 = 0 ;
wxRect *arg4 = 0 ;
int arg5 = (int) 0 ;
void *argp1 = 0 ;
int res1 = 0 ;
void *argp2 = 0 ;
int res2 = 0 ;
void *argp3 = 0 ;
int res3 = 0 ;
wxRect temp4 ;
int val5 ;
int ecode5 = 0 ;
PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ;
PyObject * obj2 = 0 ;
PyObject * obj3 = 0 ;
PyObject * obj4 = 0 ;
char * kwnames[] = {
(char *) "self",(char *) "win",(char *) "dc",(char *) "rect",(char *) "flags", NULL
};
if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|O:RendererNative_DrawPushButton",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxRendererNative, 0 | 0 );
if (!SWIG_IsOK(res1)) {
SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "RendererNative_DrawPushButton" "', expected argument " "1"" of type '" "wxRendererNative *""'");
}
arg1 = reinterpret_cast< wxRendererNative * >(argp1);
res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_wxWindow, 0 | 0 );
if (!SWIG_IsOK(res2)) {
SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "RendererNative_DrawPushButton" "', expected argument " "2"" of type '" "wxWindow *""'");
}
arg2 = reinterpret_cast< wxWindow * >(argp2);
res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_wxDC, 0 );
if (!SWIG_IsOK(res3)) {
SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "RendererNative_DrawPushButton" "', expected argument " "3"" of type '" "wxDC &""'");
}
if (!argp3) {
SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "RendererNative_DrawPushButton" "', expected argument " "3"" of type '" "wxDC &""'");
}
arg3 = reinterpret_cast< wxDC * >(argp3);
{
arg4 = &temp4;
if ( ! wxRect_helper(obj3, &arg4)) SWIG_fail;
}
if (obj4) {
ecode5 = SWIG_AsVal_int(obj4, &val5);
if (!SWIG_IsOK(ecode5)) {
SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "RendererNative_DrawPushButton" "', expected argument " "5"" of type '" "int""'");
}
arg5 = static_cast< int >(val5);
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
(arg1)->DrawPushButton(arg2,*arg3,(wxRect const &)*arg4,arg5);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
resultobj = SWIG_Py_Void();
return resultobj;
fail:
return NULL;
}
SWIGINTERN PyObject *_wrap_RendererNative_DrawItemSelectionRect(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
PyObject *resultobj = 0;
wxRendererNative *arg1 = (wxRendererNative *) 0 ;
wxWindow *arg2 = (wxWindow *) 0 ;
wxDC *arg3 = 0 ;
wxRect *arg4 = 0 ;
int arg5 = (int) 0 ;
void *argp1 = 0 ;
int res1 = 0 ;
void *argp2 = 0 ;
int res2 = 0 ;
void *argp3 = 0 ;
int res3 = 0 ;
wxRect temp4 ;
int val5 ;
int ecode5 = 0 ;
PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ;
PyObject * obj2 = 0 ;
PyObject * obj3 = 0 ;
PyObject * obj4 = 0 ;
char * kwnames[] = {
(char *) "self",(char *) "win",(char *) "dc",(char *) "rect",(char *) "flags", NULL
};
if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|O:RendererNative_DrawItemSelectionRect",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxRendererNative, 0 | 0 );
if (!SWIG_IsOK(res1)) {
SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "RendererNative_DrawItemSelectionRect" "', expected argument " "1"" of type '" "wxRendererNative *""'");
}
arg1 = reinterpret_cast< wxRendererNative * >(argp1);
res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_wxWindow, 0 | 0 );
if (!SWIG_IsOK(res2)) {
SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "RendererNative_DrawItemSelectionRect" "', expected argument " "2"" of type '" "wxWindow *""'");
}
arg2 = reinterpret_cast< wxWindow * >(argp2);
res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_wxDC, 0 );
if (!SWIG_IsOK(res3)) {
SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "RendererNative_DrawItemSelectionRect" "', expected argument " "3"" of type '" "wxDC &""'");
}
if (!argp3) {
SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "RendererNative_DrawItemSelectionRect" "', expected argument " "3"" of type '" "wxDC &""'");
}
arg3 = reinterpret_cast< wxDC * >(argp3);
{
arg4 = &temp4;
if ( ! wxRect_helper(obj3, &arg4)) SWIG_fail;
}
if (obj4) {
ecode5 = SWIG_AsVal_int(obj4, &val5);
if (!SWIG_IsOK(ecode5)) {
SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "RendererNative_DrawItemSelectionRect" "', expected argument " "5"" of type '" "int""'");
}
arg5 = static_cast< int >(val5);
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
(arg1)->DrawItemSelectionRect(arg2,*arg3,(wxRect const &)*arg4,arg5);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
@@ -25625,6 +25808,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"Colour_Set", (PyCFunction) _wrap_Colour_Set, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"Colour_SetRGB", (PyCFunction) _wrap_Colour_SetRGB, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"Colour_SetFromName", (PyCFunction) _wrap_Colour_SetFromName, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"Colour_GetAsString", (PyCFunction) _wrap_Colour_GetAsString, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"Colour_GetPixel", (PyCFunction)_wrap_Colour_GetPixel, METH_O, NULL},
{ (char *)"Colour___eq__", (PyCFunction) _wrap_Colour___eq__, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"Colour___ne__", (PyCFunction) _wrap_Colour___ne__, METH_VARARGS | METH_KEYWORDS, NULL},
@@ -26236,7 +26420,9 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"RendererNative_DrawSplitterSash", (PyCFunction) _wrap_RendererNative_DrawSplitterSash, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"RendererNative_DrawComboBoxDropButton", (PyCFunction) _wrap_RendererNative_DrawComboBoxDropButton, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"RendererNative_DrawDropArrow", (PyCFunction) _wrap_RendererNative_DrawDropArrow, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"RendererNative_DrawCheckButton", (PyCFunction) _wrap_RendererNative_DrawCheckButton, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"RendererNative_DrawCheckBox", (PyCFunction) _wrap_RendererNative_DrawCheckBox, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"RendererNative_DrawPushButton", (PyCFunction) _wrap_RendererNative_DrawPushButton, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"RendererNative_DrawItemSelectionRect", (PyCFunction) _wrap_RendererNative_DrawItemSelectionRect, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"RendererNative_GetSplitterParams", (PyCFunction) _wrap_RendererNative_GetSplitterParams, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"RendererNative_Get", (PyCFunction)_wrap_RendererNative_Get, METH_NOARGS, NULL},
{ (char *)"RendererNative_GetGeneric", (PyCFunction)_wrap_RendererNative_GetGeneric, METH_NOARGS, NULL},
@@ -27703,6 +27889,9 @@ SWIGEXPORT void SWIG_init(void) {
SWIG_InstallConstants(d,swig_const_table);
SWIG_Python_SetConstant(d, "C2S_NAME",SWIG_From_int(static_cast< int >(wxC2S_NAME)));
SWIG_Python_SetConstant(d, "C2S_CSS_SYNTAX",SWIG_From_int(static_cast< int >(wxC2S_CSS_SYNTAX)));
SWIG_Python_SetConstant(d, "C2S_HTML_SYNTAX",SWIG_From_int(static_cast< int >(wxC2S_HTML_SYNTAX)));
SWIG_Python_SetConstant(d, "OutRegion",SWIG_From_int(static_cast< int >(wxOutRegion)));
SWIG_Python_SetConstant(d, "PartRegion",SWIG_From_int(static_cast< int >(wxPartRegion)));
SWIG_Python_SetConstant(d, "InRegion",SWIG_From_int(static_cast< int >(wxInRegion)));
wxPython/src/msw/_misc.py
+12 -11
View File
@@ -908,6 +908,7 @@ class BusyInfo(_core.Object):
_misc_.BusyInfo_swiginit(self,_misc_.new_BusyInfo(*args, **kwargs))
__swig_destroy__ = _misc_.delete_BusyInfo
__del__ = lambda self : None;
def Destroy(self): pass
BusyInfo_swigregister = _misc_.BusyInfo_swigregister
BusyInfo_swigregister(BusyInfo)
@@ -1224,7 +1225,7 @@ class Log(object):
EnableLogging = staticmethod(EnableLogging)
def OnLog(*args, **kwargs):
"""OnLog(wxLogLevel level, wxChar szString, time_t t)"""
"""OnLog(LogLevel level, wxChar szString, time_t t)"""
return _misc_.Log_OnLog(*args, **kwargs)
OnLog = staticmethod(OnLog)
@@ -1263,7 +1264,7 @@ class Log(object):
SetVerbose = staticmethod(SetVerbose)
def SetLogLevel(*args, **kwargs):
"""SetLogLevel(wxLogLevel logLevel)"""
"""SetLogLevel(LogLevel logLevel)"""
return _misc_.Log_SetLogLevel(*args, **kwargs)
SetLogLevel = staticmethod(SetLogLevel)
@@ -1273,7 +1274,7 @@ class Log(object):
DontCreateOnDemand = staticmethod(DontCreateOnDemand)
def SetTraceMask(*args, **kwargs):
"""SetTraceMask(wxTraceMask ulMask)"""
"""SetTraceMask(TraceMask ulMask)"""
return _misc_.Log_SetTraceMask(*args, **kwargs)
SetTraceMask = staticmethod(SetTraceMask)
@@ -1308,7 +1309,7 @@ class Log(object):
GetVerbose = staticmethod(GetVerbose)
def GetTraceMask(*args, **kwargs):
"""GetTraceMask() -> wxTraceMask"""
"""GetTraceMask() -> TraceMask"""
return _misc_.Log_GetTraceMask(*args, **kwargs)
GetTraceMask = staticmethod(GetTraceMask)
@@ -1318,7 +1319,7 @@ class Log(object):
IsAllowedTraceMask = staticmethod(IsAllowedTraceMask)
def GetLogLevel(*args, **kwargs):
"""GetLogLevel() -> wxLogLevel"""
"""GetLogLevel() -> LogLevel"""
return _misc_.Log_GetLogLevel(*args, **kwargs)
GetLogLevel = staticmethod(GetLogLevel)
@@ -1350,7 +1351,7 @@ def Log_EnableLogging(*args, **kwargs):
return _misc_.Log_EnableLogging(*args, **kwargs)
def Log_OnLog(*args, **kwargs):
"""Log_OnLog(wxLogLevel level, wxChar szString, time_t t)"""
"""Log_OnLog(LogLevel level, wxChar szString, time_t t)"""
return _misc_.Log_OnLog(*args, **kwargs)
def Log_FlushActive(*args):
@@ -1378,7 +1379,7 @@ def Log_SetVerbose(*args, **kwargs):
return _misc_.Log_SetVerbose(*args, **kwargs)
def Log_SetLogLevel(*args, **kwargs):
"""Log_SetLogLevel(wxLogLevel logLevel)"""
"""Log_SetLogLevel(LogLevel logLevel)"""
return _misc_.Log_SetLogLevel(*args, **kwargs)
def Log_DontCreateOnDemand(*args):
@@ -1386,7 +1387,7 @@ def Log_DontCreateOnDemand(*args):
return _misc_.Log_DontCreateOnDemand(*args)
def Log_SetTraceMask(*args, **kwargs):
"""Log_SetTraceMask(wxTraceMask ulMask)"""
"""Log_SetTraceMask(TraceMask ulMask)"""
return _misc_.Log_SetTraceMask(*args, **kwargs)
def Log_AddTraceMask(*args, **kwargs):
@@ -1414,7 +1415,7 @@ def Log_GetVerbose(*args):
return _misc_.Log_GetVerbose(*args)
def Log_GetTraceMask(*args):
"""Log_GetTraceMask() -> wxTraceMask"""
"""Log_GetTraceMask() -> TraceMask"""
return _misc_.Log_GetTraceMask(*args)
def Log_IsAllowedTraceMask(*args, **kwargs):
@@ -1422,7 +1423,7 @@ def Log_IsAllowedTraceMask(*args, **kwargs):
return _misc_.Log_IsAllowedTraceMask(*args, **kwargs)
def Log_GetLogLevel(*args):
"""Log_GetLogLevel() -> wxLogLevel"""
"""Log_GetLogLevel() -> LogLevel"""
return _misc_.Log_GetLogLevel(*args)
def Log_GetTimestamp(*args):
@@ -1980,7 +1981,7 @@ class JoystickEvent(_core.Event):
__repr__ = _swig_repr
def __init__(self, *args, **kwargs):
"""
__init__(self, wxEventType type=wxEVT_NULL, int state=0, int joystick=JOYSTICK1,
__init__(self, EventType type=wxEVT_NULL, int state=0, int joystick=JOYSTICK1,
int change=0) -> JoystickEvent
"""
_misc_.JoystickEvent_swiginit(self,_misc_.new_JoystickEvent(*args, **kwargs))
wxPython/src/msw/_misc_wrap.cpp
+9 -9
View File
@@ -5225,7 +5225,7 @@ SWIGINTERN PyObject *_wrap_StripMenuCodes(PyObject *SWIGUNUSEDPARM(self), PyObje
bool temp1 = false ;
PyObject * obj0 = 0 ;
char * kwnames[] = {
(char *) "_in", NULL
(char *) "in", NULL
};
if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:StripMenuCodes",kwnames,&obj0)) SWIG_fail;
@@ -32929,7 +32929,7 @@ SWIGINTERN PyObject *_wrap_DropTarget_OnEnter(PyObject *SWIGUNUSEDPARM(self), Py
PyObject * obj2 = 0 ;
PyObject * obj3 = 0 ;
char * kwnames[] = {
(char *) "self",(char *) "x",(char *) "y",(char *) "_def", NULL
(char *) "self",(char *) "x",(char *) "y",(char *) "def", NULL
};
if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:DropTarget_OnEnter",kwnames,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
@@ -32986,7 +32986,7 @@ SWIGINTERN PyObject *_wrap_DropTarget_OnDragOver(PyObject *SWIGUNUSEDPARM(self),
PyObject * obj2 = 0 ;
PyObject * obj3 = 0 ;
char * kwnames[] = {
(char *) "self",(char *) "x",(char *) "y",(char *) "_def", NULL
(char *) "self",(char *) "x",(char *) "y",(char *) "def", NULL
};
if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:DropTarget_OnDragOver",kwnames,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
@@ -33346,7 +33346,7 @@ SWIGINTERN PyObject *_wrap_TextDropTarget_OnEnter(PyObject *SWIGUNUSEDPARM(self)
PyObject * obj2 = 0 ;
PyObject * obj3 = 0 ;
char * kwnames[] = {
(char *) "self",(char *) "x",(char *) "y",(char *) "_def", NULL
(char *) "self",(char *) "x",(char *) "y",(char *) "def", NULL
};
if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:TextDropTarget_OnEnter",kwnames,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
@@ -33403,7 +33403,7 @@ SWIGINTERN PyObject *_wrap_TextDropTarget_OnDragOver(PyObject *SWIGUNUSEDPARM(se
PyObject * obj2 = 0 ;
PyObject * obj3 = 0 ;
char * kwnames[] = {
(char *) "self",(char *) "x",(char *) "y",(char *) "_def", NULL
(char *) "self",(char *) "x",(char *) "y",(char *) "def", NULL
};
if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:TextDropTarget_OnDragOver",kwnames,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
@@ -33537,7 +33537,7 @@ SWIGINTERN PyObject *_wrap_TextDropTarget_OnData(PyObject *SWIGUNUSEDPARM(self),
PyObject * obj2 = 0 ;
PyObject * obj3 = 0 ;
char * kwnames[] = {
(char *) "self",(char *) "x",(char *) "y",(char *) "_def", NULL
(char *) "self",(char *) "x",(char *) "y",(char *) "def", NULL
};
if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:TextDropTarget_OnData",kwnames,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
@@ -33734,7 +33734,7 @@ SWIGINTERN PyObject *_wrap_FileDropTarget_OnEnter(PyObject *SWIGUNUSEDPARM(self)
PyObject * obj2 = 0 ;
PyObject * obj3 = 0 ;
char * kwnames[] = {
(char *) "self",(char *) "x",(char *) "y",(char *) "_def", NULL
(char *) "self",(char *) "x",(char *) "y",(char *) "def", NULL
};
if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:FileDropTarget_OnEnter",kwnames,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
@@ -33791,7 +33791,7 @@ SWIGINTERN PyObject *_wrap_FileDropTarget_OnDragOver(PyObject *SWIGUNUSEDPARM(se
PyObject * obj2 = 0 ;
PyObject * obj3 = 0 ;
char * kwnames[] = {
(char *) "self",(char *) "x",(char *) "y",(char *) "_def", NULL
(char *) "self",(char *) "x",(char *) "y",(char *) "def", NULL
};
if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:FileDropTarget_OnDragOver",kwnames,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
@@ -33925,7 +33925,7 @@ SWIGINTERN PyObject *_wrap_FileDropTarget_OnData(PyObject *SWIGUNUSEDPARM(self),
PyObject * obj2 = 0 ;
PyObject * obj3 = 0 ;
char * kwnames[] = {
(char *) "self",(char *) "x",(char *) "y",(char *) "_def", NULL
(char *) "self",(char *) "x",(char *) "y",(char *) "def", NULL
};
if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:FileDropTarget_OnData",kwnames,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
wxPython/src/msw/_windows.py
+20 -17
View File
@@ -364,6 +364,10 @@ class TopLevelWindow(_core.Window):
"""IsMaximized(self) -> bool"""
return _windows_.TopLevelWindow_IsMaximized(*args, **kwargs)
def IsAlwaysMaximized(*args, **kwargs):
"""IsAlwaysMaximized(self) -> bool"""
return _windows_.TopLevelWindow_IsAlwaysMaximized(*args, **kwargs)
def IsIconized(*args, **kwargs):
"""IsIconized(self) -> bool"""
return _windows_.TopLevelWindow_IsIconized(*args, **kwargs)
@@ -1226,7 +1230,7 @@ class SplitterEvent(_core.NotifyEvent):
__repr__ = _swig_repr
def __init__(self, *args, **kwargs):
"""
__init__(self, wxEventType type=wxEVT_NULL, SplitterWindow splitter=(wxSplitterWindow *) NULL) -> SplitterEvent
__init__(self, EventType type=wxEVT_NULL, SplitterWindow splitter=(wxSplitterWindow *) NULL) -> SplitterEvent
This class represents the events generated by a splitter control.
"""
@@ -2025,6 +2029,10 @@ class TaskBarIcon(_core.EvtHandler):
"""PopupMenu(self, Menu menu) -> bool"""
return _windows_.TaskBarIcon_PopupMenu(*args, **kwargs)
def GetHandle(*args, **kwargs):
"""GetHandle(self) -> long"""
return _windows_.TaskBarIcon_GetHandle(*args, **kwargs)
TaskBarIcon_swigregister = _windows_.TaskBarIcon_swigregister
TaskBarIcon_swigregister(TaskBarIcon)
@@ -2033,7 +2041,7 @@ class TaskBarIconEvent(_core.Event):
thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
__repr__ = _swig_repr
def __init__(self, *args, **kwargs):
"""__init__(self, wxEventType evtType, wxTaskBarIcon tbIcon) -> TaskBarIconEvent"""
"""__init__(self, EventType evtType, wxTaskBarIcon tbIcon) -> TaskBarIconEvent"""
_windows_.TaskBarIconEvent_swiginit(self,_windows_.new_TaskBarIconEvent(*args, **kwargs))
TaskBarIconEvent_swigregister = _windows_.TaskBarIconEvent_swigregister
TaskBarIconEvent_swigregister(TaskBarIconEvent)
@@ -2205,14 +2213,6 @@ class DirDialog(Dialog):
"""
return _windows_.DirDialog_GetMessage(*args, **kwargs)
def GetStyle(*args, **kwargs):
"""
GetStyle(self) -> long
Returns the dialog style.
"""
return _windows_.DirDialog_GetStyle(*args, **kwargs)
def SetMessage(*args, **kwargs):
"""
SetMessage(self, String message)
@@ -2751,17 +2751,20 @@ class ProgressDialog(Frame):
def Update(*args, **kwargs):
"""
Update(self, int value, String newmsg=EmptyString) -> bool
Update(self, int value, String newmsg) --> (continue, skip)
Updates the dialog, setting the progress bar to the new value and, if
given changes the message above it. The value given should be less
than or equal to the maximum value given to the constructor and the
dialog is closed if it is equal to the maximum. Returns True unless
the Cancel button has been pressed.
dialog is closed if it is equal to the maximum. Returns a tuple of
boolean values, ``(continue, skip)`` where ``continue`` is ``True``
unless the Cancel button has been pressed, and ``skip`` is ``False``
unless the Skip button (if any) has been pressed.
If the ``continue`` return value is ``false``, the application can either
immediately destroy the dialog or ask the user for confirmation, and if the
abort is not confirmed the dialog may be resumed with `Resume` function.
If false is returned, the application can either immediately destroy
the dialog or ask the user for the confirmation and if the abort is
not confirmed the dialog may be resumed with Resume function.
"""
return _windows_.ProgressDialog_Update(*args, **kwargs)
@@ -2808,7 +2811,7 @@ class FindDialogEvent(_core.CommandEvent):
__repr__ = _swig_repr
def __init__(self, *args, **kwargs):
"""
__init__(self, wxEventType commandType=wxEVT_NULL, int id=0) -> FindDialogEvent
__init__(self, EventType commandType=wxEVT_NULL, int id=0) -> FindDialogEvent
Events for the FindReplaceDialog
"""
wxPython/src/msw/_windows_wrap.cpp
+253 -195
View File
File diff suppressed because it is too large Load Diff
wxPython/src/msw/calendar.py
+1 -1
View File
@@ -167,7 +167,7 @@ class CalendarEvent(_core.DateEvent):
thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
__repr__ = _swig_repr
def __init__(self, *args, **kwargs):
"""__init__(self, CalendarCtrl cal, wxEventType type) -> CalendarEvent"""
"""__init__(self, CalendarCtrl cal, EventType type) -> CalendarEvent"""
_calendar.CalendarEvent_swiginit(self,_calendar.new_CalendarEvent(*args, **kwargs))
def SetWeekDay(*args, **kwargs):
"""SetWeekDay(self, int wd)"""
wxPython/src/msw/grid.py
+11 -11
View File
@@ -1149,15 +1149,15 @@ class Grid(_windows.ScrolledWindow):
"""
return _grid.Grid_Create(*args, **kwargs)
wxGridSelectCells = _grid.Grid_wxGridSelectCells
wxGridSelectRows = _grid.Grid_wxGridSelectRows
wxGridSelectColumns = _grid.Grid_wxGridSelectColumns
GridSelectCells = _grid.Grid_GridSelectCells
GridSelectRows = _grid.Grid_GridSelectRows
GridSelectColumns = _grid.Grid_GridSelectColumns
SelectCells = wxGridSelectCells
SelectRows = wxGridSelectRows
SelectColumns = wxGridSelectColumns
def CreateGrid(*args, **kwargs):
"""CreateGrid(self, int numRows, int numCols, WXGRIDSELECTIONMODES selmode=wxGridSelectCells) -> bool"""
"""CreateGrid(self, int numRows, int numCols, WXGRIDSELECTIONMODES selmode=GridSelectCells) -> bool"""
return _grid.Grid_CreateGrid(*args, **kwargs)
def SetSelectionMode(*args, **kwargs):
@@ -1185,7 +1185,7 @@ class Grid(_windows.ScrolledWindow):
return _grid.Grid_GetTable(*args, **kwargs)
def SetTable(*args, **kwargs):
"""SetTable(self, GridTableBase table, bool takeOwnership=False, WXGRIDSELECTIONMODES selmode=wxGridSelectCells) -> bool"""
"""SetTable(self, GridTableBase table, bool takeOwnership=False, WXGRIDSELECTIONMODES selmode=GridSelectCells) -> bool"""
return _grid.Grid_SetTable(*args, **kwargs)
def ClearGrid(*args, **kwargs):
@@ -1999,7 +1999,7 @@ class GridEvent(_core.NotifyEvent):
__repr__ = _swig_repr
def __init__(self, *args, **kwargs):
"""
__init__(self, int id, wxEventType type, Grid obj, int row=-1, int col=-1,
__init__(self, int id, EventType type, Grid 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) -> GridEvent
@@ -2050,7 +2050,7 @@ class GridSizeEvent(_core.NotifyEvent):
__repr__ = _swig_repr
def __init__(self, *args, **kwargs):
"""
__init__(self, int id, wxEventType type, Grid obj, int rowOrCol=-1,
__init__(self, int id, EventType type, Grid obj, int rowOrCol=-1,
int x=-1, int y=-1, bool control=False, bool shift=False,
bool alt=False, bool meta=False) -> GridSizeEvent
"""
@@ -2092,10 +2092,10 @@ class GridRangeSelectEvent(_core.NotifyEvent):
__repr__ = _swig_repr
def __init__(self, *args, **kwargs):
"""
__init__(self, int id, wxEventType type, Grid obj, GridCellCoords topLeft,
__init__(self, int id, EventType type, Grid obj, GridCellCoords topLeft,
GridCellCoords bottomRight, bool sel=True,
bool control=False, bool shift=False,
bool alt=False, bool meta=False) -> GridRangeSelectEvent
bool control=False, bool shift=False, bool alt=False,
bool meta=False) -> GridRangeSelectEvent
"""
_grid.GridRangeSelectEvent_swiginit(self,_grid.new_GridRangeSelectEvent(*args, **kwargs))
def GetTopLeftCoords(*args, **kwargs):
@@ -2155,7 +2155,7 @@ class GridEditorCreatedEvent(_core.CommandEvent):
__repr__ = _swig_repr
def __init__(self, *args, **kwargs):
"""
__init__(self, int id, wxEventType type, Object obj, int row, int col,
__init__(self, int id, EventType type, Object obj, int row, int col,
Control ctrl) -> GridEditorCreatedEvent
"""
_grid.GridEditorCreatedEvent_swiginit(self,_grid.new_GridEditorCreatedEvent(*args, **kwargs))
wxPython/src/msw/grid_wrap.cpp
+3 -3
View File
@@ -22866,9 +22866,9 @@ SWIGEXPORT void SWIG_init(void) {
SWIG_Python_SetConstant(d, "GRIDTABLE_NOTIFY_COLS_INSERTED",SWIG_From_int(static_cast< int >(wxGRIDTABLE_NOTIFY_COLS_INSERTED)));
SWIG_Python_SetConstant(d, "GRIDTABLE_NOTIFY_COLS_APPENDED",SWIG_From_int(static_cast< int >(wxGRIDTABLE_NOTIFY_COLS_APPENDED)));
SWIG_Python_SetConstant(d, "GRIDTABLE_NOTIFY_COLS_DELETED",SWIG_From_int(static_cast< int >(wxGRIDTABLE_NOTIFY_COLS_DELETED)));
SWIG_Python_SetConstant(d, "Grid_wxGridSelectCells",SWIG_From_int(static_cast< int >(wxGrid::wxGridSelectCells)));
SWIG_Python_SetConstant(d, "Grid_wxGridSelectRows",SWIG_From_int(static_cast< int >(wxGrid::wxGridSelectRows)));
SWIG_Python_SetConstant(d, "Grid_wxGridSelectColumns",SWIG_From_int(static_cast< int >(wxGrid::wxGridSelectColumns)));
SWIG_Python_SetConstant(d, "Grid_GridSelectCells",SWIG_From_int(static_cast< int >(wxGrid::wxGridSelectCells)));
SWIG_Python_SetConstant(d, "Grid_GridSelectRows",SWIG_From_int(static_cast< int >(wxGrid::wxGridSelectRows)));
SWIG_Python_SetConstant(d, "Grid_GridSelectColumns",SWIG_From_int(static_cast< int >(wxGrid::wxGridSelectColumns)));
PyDict_SetItemString(d, "wxEVT_GRID_CELL_LEFT_CLICK", PyInt_FromLong(wxEVT_GRID_CELL_LEFT_CLICK));
PyDict_SetItemString(d, "wxEVT_GRID_CELL_RIGHT_CLICK", PyInt_FromLong(wxEVT_GRID_CELL_RIGHT_CLICK));
PyDict_SetItemString(d, "wxEVT_GRID_CELL_LEFT_DCLICK", PyInt_FromLong(wxEVT_GRID_CELL_LEFT_DCLICK));
wxPython/src/msw/html.py
+1 -1
View File
@@ -1613,7 +1613,7 @@ class HtmlWindowEvent(_core.NotifyEvent):
thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
__repr__ = _swig_repr
def __init__(self, *args, **kwargs):
"""__init__(self, wxEventType commandType=wxEVT_NULL, int id=0) -> HtmlWindowEvent"""
"""__init__(self, EventType commandType=wxEVT_NULL, int id=0) -> HtmlWindowEvent"""
_html.HtmlWindowEvent_swiginit(self,_html.new_HtmlWindowEvent(*args, **kwargs))
def SetURL(*args, **kwargs):
"""SetURL(self, String url)"""
wxPython/src/msw/html_wrap.cpp
+1 -1
View File
@@ -11804,7 +11804,7 @@ SWIGINTERN PyObject *_wrap_HtmlDCRenderer_Render(PyObject *SWIGUNUSEDPARM(self),
PyObject * obj6 = 0 ;
PyObject * obj7 = 0 ;
char * kwnames[] = {
(char *) "self",(char *) "x",(char *) "y",(char *) "_from",(char *) "dont_render",(char *) "maxHeight",(char *) "choices",(char *) "LCOUNT", NULL
(char *) "self",(char *) "x",(char *) "y",(char *) "from",(char *) "dont_render",(char *) "maxHeight",(char *) "choices",(char *) "LCOUNT", NULL
};
if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OOOOO:HtmlDCRenderer_Render",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) SWIG_fail;
wxPython/src/msw/media.py
+1 -1
View File
@@ -70,7 +70,7 @@ class MediaEvent(_core.NotifyEvent):
thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
__repr__ = _swig_repr
def __init__(self, *args, **kwargs):
"""__init__(self, wxEventType commandType=wxEVT_NULL, int id=0) -> MediaEvent"""
"""__init__(self, EventType commandType=wxEVT_NULL, int id=0) -> MediaEvent"""
_media.MediaEvent_swiginit(self,_media.new_MediaEvent(*args, **kwargs))
MediaEvent_swigregister = _media.MediaEvent_swigregister
MediaEvent_swigregister(MediaEvent)
wxPython/src/msw/wizard.py
+1 -1
View File
@@ -78,7 +78,7 @@ class WizardEvent(_core.NotifyEvent):
__repr__ = _swig_repr
def __init__(self, *args, **kwargs):
"""
__init__(self, wxEventType type=wxEVT_NULL, int id=-1, bool direction=True,
__init__(self, EventType type=wxEVT_NULL, int id=-1, bool direction=True,
WizardPage page=None) -> WizardEvent
"""
_wizard.WizardEvent_swiginit(self,_wizard.new_WizardEvent(*args, **kwargs))
wxPython/src/msw/xrc.py
+4 -4
View File
@@ -173,7 +173,7 @@ class XmlResource(_core.Object):
return _xrc.XmlResource_AttachUnknownControl(*args, **kwargs)
def GetXRCID(*args, **kwargs):
"""GetXRCID(String str_id) -> int"""
"""GetXRCID(wxChar str_id, int value_if_not_found=ID_NONE) -> int"""
return _xrc.XmlResource_GetXRCID(*args, **kwargs)
GetXRCID = staticmethod(GetXRCID)
@@ -225,7 +225,7 @@ def XmlResource_AddSubclassFactory(*args, **kwargs):
return _xrc.XmlResource_AddSubclassFactory(*args, **kwargs)
def XmlResource_GetXRCID(*args, **kwargs):
"""XmlResource_GetXRCID(String str_id) -> int"""
"""XmlResource_GetXRCID(wxChar str_id, int value_if_not_found=ID_NONE) -> int"""
return _xrc.XmlResource_GetXRCID(*args, **kwargs)
def XmlResource_Get(*args):
@@ -236,8 +236,8 @@ def XmlResource_Set(*args, **kwargs):
"""XmlResource_Set(XmlResource res) -> XmlResource"""
return _xrc.XmlResource_Set(*args, **kwargs)
def XRCID(str_id):
return XmlResource_GetXRCID(str_id)
def XRCID(str_id, value_if_not_found = wx.ID_NONE):
return XmlResource_GetXRCID(str_id, value_if_not_found)
def XRCCTRL(window, str_id, *ignoreargs):
return window.FindWindowById(XRCID(str_id))
wxPython/src/msw/xrc_wrap.cpp
+126 -117
View File
@@ -2473,97 +2473,98 @@ SWIG_Python_MustGetPtr(PyObject *obj, swig_type_info *ty, int argnum, int flags)
#define SWIGTYPE_p_wxBitmap swig_types[11]
#define SWIGTYPE_p_wxBoxSizer swig_types[12]
#define SWIGTYPE_p_wxCURHandler swig_types[13]
#define SWIGTYPE_p_wxChildFocusEvent swig_types[14]
#define SWIGTYPE_p_wxCloseEvent swig_types[15]
#define SWIGTYPE_p_wxColour swig_types[16]
#define SWIGTYPE_p_wxCommandEvent swig_types[17]
#define SWIGTYPE_p_wxContextMenuEvent swig_types[18]
#define SWIGTYPE_p_wxControl swig_types[19]
#define SWIGTYPE_p_wxControlWithItems swig_types[20]
#define SWIGTYPE_p_wxDateEvent swig_types[21]
#define SWIGTYPE_p_wxDialog swig_types[22]
#define SWIGTYPE_p_wxDisplayChangedEvent swig_types[23]
#define SWIGTYPE_p_wxDropFilesEvent swig_types[24]
#define SWIGTYPE_p_wxDuplexMode swig_types[25]
#define SWIGTYPE_p_wxEraseEvent swig_types[26]
#define SWIGTYPE_p_wxEvent swig_types[27]
#define SWIGTYPE_p_wxEvtHandler swig_types[28]
#define SWIGTYPE_p_wxFSFile swig_types[29]
#define SWIGTYPE_p_wxFileSystem swig_types[30]
#define SWIGTYPE_p_wxFlexGridSizer swig_types[31]
#define SWIGTYPE_p_wxFocusEvent swig_types[32]
#define SWIGTYPE_p_wxFont swig_types[33]
#define SWIGTYPE_p_wxFrame swig_types[34]
#define SWIGTYPE_p_wxGBSizerItem swig_types[35]
#define SWIGTYPE_p_wxGIFHandler swig_types[36]
#define SWIGTYPE_p_wxGridBagSizer swig_types[37]
#define SWIGTYPE_p_wxGridSizer swig_types[38]
#define SWIGTYPE_p_wxICOHandler swig_types[39]
#define SWIGTYPE_p_wxIcon swig_types[40]
#define SWIGTYPE_p_wxIconizeEvent swig_types[41]
#define SWIGTYPE_p_wxIdleEvent swig_types[42]
#define SWIGTYPE_p_wxImage swig_types[43]
#define SWIGTYPE_p_wxImageHandler swig_types[44]
#define SWIGTYPE_p_wxIndividualLayoutConstraint swig_types[45]
#define SWIGTYPE_p_wxInitDialogEvent swig_types[46]
#define SWIGTYPE_p_wxInputStream swig_types[47]
#define SWIGTYPE_p_wxJPEGHandler swig_types[48]
#define SWIGTYPE_p_wxKeyEvent swig_types[49]
#define SWIGTYPE_p_wxLayoutConstraints swig_types[50]
#define SWIGTYPE_p_wxMaximizeEvent swig_types[51]
#define SWIGTYPE_p_wxMenu swig_types[52]
#define SWIGTYPE_p_wxMenuBar swig_types[53]
#define SWIGTYPE_p_wxMenuEvent swig_types[54]
#define SWIGTYPE_p_wxMenuItem swig_types[55]
#define SWIGTYPE_p_wxMouseCaptureChangedEvent swig_types[56]
#define SWIGTYPE_p_wxMouseEvent swig_types[57]
#define SWIGTYPE_p_wxMoveEvent swig_types[58]
#define SWIGTYPE_p_wxNavigationKeyEvent swig_types[59]
#define SWIGTYPE_p_wxNcPaintEvent swig_types[60]
#define SWIGTYPE_p_wxNotifyEvent swig_types[61]
#define SWIGTYPE_p_wxObject swig_types[62]
#define SWIGTYPE_p_wxOutputStream swig_types[63]
#define SWIGTYPE_p_wxPCXHandler swig_types[64]
#define SWIGTYPE_p_wxPNGHandler swig_types[65]
#define SWIGTYPE_p_wxPNMHandler swig_types[66]
#define SWIGTYPE_p_wxPaintEvent swig_types[67]
#define SWIGTYPE_p_wxPaletteChangedEvent swig_types[68]
#define SWIGTYPE_p_wxPanel swig_types[69]
#define SWIGTYPE_p_wxPaperSize swig_types[70]
#define SWIGTYPE_p_wxPoint swig_types[71]
#define SWIGTYPE_p_wxPyApp swig_types[72]
#define SWIGTYPE_p_wxPyCommandEvent swig_types[73]
#define SWIGTYPE_p_wxPyEvent swig_types[74]
#define SWIGTYPE_p_wxPyImageHandler swig_types[75]
#define SWIGTYPE_p_wxPySizer swig_types[76]
#define SWIGTYPE_p_wxPyValidator swig_types[77]
#define SWIGTYPE_p_wxPyXmlResourceHandler swig_types[78]
#define SWIGTYPE_p_wxPyXmlSubclassFactory swig_types[79]
#define SWIGTYPE_p_wxQueryNewPaletteEvent swig_types[80]
#define SWIGTYPE_p_wxScrollEvent swig_types[81]
#define SWIGTYPE_p_wxScrollWinEvent swig_types[82]
#define SWIGTYPE_p_wxSetCursorEvent swig_types[83]
#define SWIGTYPE_p_wxShowEvent swig_types[84]
#define SWIGTYPE_p_wxSize swig_types[85]
#define SWIGTYPE_p_wxSizeEvent swig_types[86]
#define SWIGTYPE_p_wxSizer swig_types[87]
#define SWIGTYPE_p_wxSizerItem swig_types[88]
#define SWIGTYPE_p_wxStaticBoxSizer swig_types[89]
#define SWIGTYPE_p_wxStdDialogButtonSizer swig_types[90]
#define SWIGTYPE_p_wxSysColourChangedEvent swig_types[91]
#define SWIGTYPE_p_wxTIFFHandler swig_types[92]
#define SWIGTYPE_p_wxUpdateUIEvent swig_types[93]
#define SWIGTYPE_p_wxValidator swig_types[94]
#define SWIGTYPE_p_wxWindow swig_types[95]
#define SWIGTYPE_p_wxWindowCreateEvent swig_types[96]
#define SWIGTYPE_p_wxWindowDestroyEvent swig_types[97]
#define SWIGTYPE_p_wxXPMHandler swig_types[98]
#define SWIGTYPE_p_wxXmlDocument swig_types[99]
#define SWIGTYPE_p_wxXmlNode swig_types[100]
#define SWIGTYPE_p_wxXmlProperty swig_types[101]
#define SWIGTYPE_p_wxXmlResource swig_types[102]
static swig_type_info *swig_types[104];
static swig_module_info swig_module = {swig_types, 103, 0, 0, 0, 0};
#define SWIGTYPE_p_wxChar swig_types[14]
#define SWIGTYPE_p_wxChildFocusEvent swig_types[15]
#define SWIGTYPE_p_wxCloseEvent swig_types[16]
#define SWIGTYPE_p_wxColour swig_types[17]
#define SWIGTYPE_p_wxCommandEvent swig_types[18]
#define SWIGTYPE_p_wxContextMenuEvent swig_types[19]
#define SWIGTYPE_p_wxControl swig_types[20]
#define SWIGTYPE_p_wxControlWithItems swig_types[21]
#define SWIGTYPE_p_wxDateEvent swig_types[22]
#define SWIGTYPE_p_wxDialog swig_types[23]
#define SWIGTYPE_p_wxDisplayChangedEvent swig_types[24]
#define SWIGTYPE_p_wxDropFilesEvent swig_types[25]
#define SWIGTYPE_p_wxDuplexMode swig_types[26]
#define SWIGTYPE_p_wxEraseEvent swig_types[27]
#define SWIGTYPE_p_wxEvent swig_types[28]
#define SWIGTYPE_p_wxEvtHandler swig_types[29]
#define SWIGTYPE_p_wxFSFile swig_types[30]
#define SWIGTYPE_p_wxFileSystem swig_types[31]
#define SWIGTYPE_p_wxFlexGridSizer swig_types[32]
#define SWIGTYPE_p_wxFocusEvent swig_types[33]
#define SWIGTYPE_p_wxFont swig_types[34]
#define SWIGTYPE_p_wxFrame swig_types[35]
#define SWIGTYPE_p_wxGBSizerItem swig_types[36]
#define SWIGTYPE_p_wxGIFHandler swig_types[37]
#define SWIGTYPE_p_wxGridBagSizer swig_types[38]
#define SWIGTYPE_p_wxGridSizer swig_types[39]
#define SWIGTYPE_p_wxICOHandler swig_types[40]
#define SWIGTYPE_p_wxIcon swig_types[41]
#define SWIGTYPE_p_wxIconizeEvent swig_types[42]
#define SWIGTYPE_p_wxIdleEvent swig_types[43]
#define SWIGTYPE_p_wxImage swig_types[44]
#define SWIGTYPE_p_wxImageHandler swig_types[45]
#define SWIGTYPE_p_wxIndividualLayoutConstraint swig_types[46]
#define SWIGTYPE_p_wxInitDialogEvent swig_types[47]
#define SWIGTYPE_p_wxInputStream swig_types[48]
#define SWIGTYPE_p_wxJPEGHandler swig_types[49]
#define SWIGTYPE_p_wxKeyEvent swig_types[50]
#define SWIGTYPE_p_wxLayoutConstraints swig_types[51]
#define SWIGTYPE_p_wxMaximizeEvent swig_types[52]
#define SWIGTYPE_p_wxMenu swig_types[53]
#define SWIGTYPE_p_wxMenuBar swig_types[54]
#define SWIGTYPE_p_wxMenuEvent swig_types[55]
#define SWIGTYPE_p_wxMenuItem swig_types[56]
#define SWIGTYPE_p_wxMouseCaptureChangedEvent swig_types[57]
#define SWIGTYPE_p_wxMouseEvent swig_types[58]
#define SWIGTYPE_p_wxMoveEvent swig_types[59]
#define SWIGTYPE_p_wxNavigationKeyEvent swig_types[60]
#define SWIGTYPE_p_wxNcPaintEvent swig_types[61]
#define SWIGTYPE_p_wxNotifyEvent swig_types[62]
#define SWIGTYPE_p_wxObject swig_types[63]
#define SWIGTYPE_p_wxOutputStream swig_types[64]
#define SWIGTYPE_p_wxPCXHandler swig_types[65]
#define SWIGTYPE_p_wxPNGHandler swig_types[66]
#define SWIGTYPE_p_wxPNMHandler swig_types[67]
#define SWIGTYPE_p_wxPaintEvent swig_types[68]
#define SWIGTYPE_p_wxPaletteChangedEvent swig_types[69]
#define SWIGTYPE_p_wxPanel swig_types[70]
#define SWIGTYPE_p_wxPaperSize swig_types[71]
#define SWIGTYPE_p_wxPoint swig_types[72]
#define SWIGTYPE_p_wxPyApp swig_types[73]
#define SWIGTYPE_p_wxPyCommandEvent swig_types[74]
#define SWIGTYPE_p_wxPyEvent swig_types[75]
#define SWIGTYPE_p_wxPyImageHandler swig_types[76]
#define SWIGTYPE_p_wxPySizer swig_types[77]
#define SWIGTYPE_p_wxPyValidator swig_types[78]
#define SWIGTYPE_p_wxPyXmlResourceHandler swig_types[79]
#define SWIGTYPE_p_wxPyXmlSubclassFactory swig_types[80]
#define SWIGTYPE_p_wxQueryNewPaletteEvent swig_types[81]
#define SWIGTYPE_p_wxScrollEvent swig_types[82]
#define SWIGTYPE_p_wxScrollWinEvent swig_types[83]
#define SWIGTYPE_p_wxSetCursorEvent swig_types[84]
#define SWIGTYPE_p_wxShowEvent swig_types[85]
#define SWIGTYPE_p_wxSize swig_types[86]
#define SWIGTYPE_p_wxSizeEvent swig_types[87]
#define SWIGTYPE_p_wxSizer swig_types[88]
#define SWIGTYPE_p_wxSizerItem swig_types[89]
#define SWIGTYPE_p_wxStaticBoxSizer swig_types[90]
#define SWIGTYPE_p_wxStdDialogButtonSizer swig_types[91]
#define SWIGTYPE_p_wxSysColourChangedEvent swig_types[92]
#define SWIGTYPE_p_wxTIFFHandler swig_types[93]
#define SWIGTYPE_p_wxUpdateUIEvent swig_types[94]
#define SWIGTYPE_p_wxValidator swig_types[95]
#define SWIGTYPE_p_wxWindow swig_types[96]
#define SWIGTYPE_p_wxWindowCreateEvent swig_types[97]
#define SWIGTYPE_p_wxWindowDestroyEvent swig_types[98]
#define SWIGTYPE_p_wxXPMHandler swig_types[99]
#define SWIGTYPE_p_wxXmlDocument swig_types[100]
#define SWIGTYPE_p_wxXmlNode swig_types[101]
#define SWIGTYPE_p_wxXmlProperty swig_types[102]
#define SWIGTYPE_p_wxXmlResource swig_types[103]
static swig_type_info *swig_types[105];
static swig_module_info swig_module = {swig_types, 104, 0, 0, 0, 0};
#define SWIG_TypeQuery(name) SWIG_TypeQueryModule(&swig_module, &swig_module, name)
#define SWIG_MangledTypeQuery(name) SWIG_MangledTypeQueryModule(&swig_module, &swig_module, name)
@@ -4343,37 +4344,41 @@ fail:
SWIGINTERN PyObject *_wrap_XmlResource_GetXRCID(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
PyObject *resultobj = 0;
wxString *arg1 = 0 ;
wxChar *arg1 = (wxChar *) 0 ;
int arg2 = (int) wxID_NONE ;
int result;
bool temp1 = false ;
void *argp1 = 0 ;
int res1 = 0 ;
int val2 ;
int ecode2 = 0 ;
PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ;
char * kwnames[] = {
(char *) "str_id", NULL
(char *) "str_id",(char *) "value_if_not_found", NULL
};
if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:XmlResource_GetXRCID",kwnames,&obj0)) SWIG_fail;
{
arg1 = wxString_in_helper(obj0);
if (arg1 == NULL) SWIG_fail;
temp1 = true;
if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:XmlResource_GetXRCID",kwnames,&obj0,&obj1)) SWIG_fail;
res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxChar, 0 | 0 );
if (!SWIG_IsOK(res1)) {
SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "XmlResource_GetXRCID" "', expected argument " "1"" of type '" "wxChar const *""'");
}
arg1 = reinterpret_cast< wxChar * >(argp1);
if (obj1) {
ecode2 = SWIG_AsVal_int(obj1, &val2);
if (!SWIG_IsOK(ecode2)) {
SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "XmlResource_GetXRCID" "', expected argument " "2"" of type '" "int""'");
}
arg2 = static_cast< int >(val2);
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
result = (int)wxXmlResource::GetXRCID((wxString const &)*arg1);
result = (int)wxXmlResource::GetXRCID((wxChar const *)arg1,arg2);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
resultobj = SWIG_From_int(static_cast< int >(result));
{
if (temp1)
delete arg1;
}
return resultobj;
fail:
{
if (temp1)
delete arg1;
}
return NULL;
}
@@ -8466,6 +8471,15 @@ static PyMethodDef SwigMethods[] = {
/* -------- TYPE CONVERSION AND EQUIVALENCE RULES (BEGIN) -------- */
static void *_p_wxControlTo_p_wxWindow(void *x) {
return (void *)((wxWindow *) ((wxControl *) x));
}
static void *_p_wxControlWithItemsTo_p_wxWindow(void *x) {
return (void *)((wxWindow *) (wxControl *) ((wxControlWithItems *) x));
}
static void *_p_wxMenuBarTo_p_wxWindow(void *x) {
return (void *)((wxWindow *) ((wxMenuBar *) x));
}
static void *_p_wxLayoutConstraintsTo_p_wxObject(void *x) {
return (void *)((wxObject *) ((wxLayoutConstraints *) x));
}
@@ -8703,15 +8717,6 @@ static void *_p_wxPyValidatorTo_p_wxObject(void *x) {
static void *_p_wxValidatorTo_p_wxObject(void *x) {
return (void *)((wxObject *) (wxEvtHandler *) ((wxValidator *) x));
}
static void *_p_wxControlTo_p_wxWindow(void *x) {
return (void *)((wxWindow *) ((wxControl *) x));
}
static void *_p_wxControlWithItemsTo_p_wxWindow(void *x) {
return (void *)((wxWindow *) (wxControl *) ((wxControlWithItems *) x));
}
static void *_p_wxMenuBarTo_p_wxWindow(void *x) {
return (void *)((wxWindow *) ((wxMenuBar *) x));
}
static swig_type_info _swigt__p_char = {"_p_char", "char *", 0, 0, (void*)0, 0};
static swig_type_info _swigt__p_form_ops_t = {"_p_form_ops_t", "enum form_ops_t *|form_ops_t *", 0, 0, (void*)0, 0};
static swig_type_info _swigt__p_int = {"_p_int", "int *|wxEventType *", 0, 0, (void*)0, 0};
@@ -8720,6 +8725,7 @@ static swig_type_info _swigt__p_unsigned_int = {"_p_unsigned_int", "unsigned int
static swig_type_info _swigt__p_unsigned_long = {"_p_unsigned_long", "unsigned long *|wxUIntPtr *", 0, 0, (void*)0, 0};
static swig_type_info _swigt__p_wxArtClient = {"_p_wxArtClient", "wxArtClient *", 0, 0, (void*)0, 0};
static swig_type_info _swigt__p_wxBitmap = {"_p_wxBitmap", "wxBitmap *", 0, 0, (void*)0, 0};
static swig_type_info _swigt__p_wxChar = {"_p_wxChar", "wxChar *", 0, 0, (void*)0, 0};
static swig_type_info _swigt__p_wxColour = {"_p_wxColour", "wxColour *", 0, 0, (void*)0, 0};
static swig_type_info _swigt__p_wxDialog = {"_p_wxDialog", "wxDialog *", 0, 0, (void*)0, 0};
static swig_type_info _swigt__p_wxDuplexMode = {"_p_wxDuplexMode", "enum wxDuplexMode *|wxDuplexMode *", 0, 0, (void*)0, 0};
@@ -8831,6 +8837,7 @@ static swig_type_info *swig_type_initial[] = {
&_swigt__p_wxBitmap,
&_swigt__p_wxBoxSizer,
&_swigt__p_wxCURHandler,
&_swigt__p_wxChar,
&_swigt__p_wxChildFocusEvent,
&_swigt__p_wxCloseEvent,
&_swigt__p_wxColour,
@@ -8930,6 +8937,7 @@ static swig_cast_info _swigc__p_unsigned_int[] = { {&_swigt__p_unsigned_int, 0,
static swig_cast_info _swigc__p_unsigned_long[] = { {&_swigt__p_unsigned_long, 0, 0, 0},{0, 0, 0, 0}};
static swig_cast_info _swigc__p_wxArtClient[] = { {&_swigt__p_wxArtClient, 0, 0, 0},{0, 0, 0, 0}};
static swig_cast_info _swigc__p_wxBitmap[] = { {&_swigt__p_wxBitmap, 0, 0, 0},{0, 0, 0, 0}};
static swig_cast_info _swigc__p_wxChar[] = { {&_swigt__p_wxChar, 0, 0, 0},{0, 0, 0, 0}};
static swig_cast_info _swigc__p_wxColour[] = { {&_swigt__p_wxColour, 0, 0, 0},{0, 0, 0, 0}};
static swig_cast_info _swigc__p_wxDialog[] = { {&_swigt__p_wxDialog, 0, 0, 0},{0, 0, 0, 0}};
static swig_cast_info _swigc__p_wxDuplexMode[] = { {&_swigt__p_wxDuplexMode, 0, 0, 0},{0, 0, 0, 0}};
@@ -9041,6 +9049,7 @@ static swig_cast_info *swig_cast_initial[] = {
_swigc__p_wxBitmap,
_swigc__p_wxBoxSizer,
_swigc__p_wxCURHandler,
_swigc__p_wxChar,
_swigc__p_wxChildFocusEvent,
_swigc__p_wxCloseEvent,
_swigc__p_wxColour,