From 242b7b46ad32ddf0a0730e18c4d88781a2a5c663 Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Fri, 28 Nov 2003 18:45:05 +0000 Subject: [PATCH] reSWIGged git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24682 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- wxPython/src/gtk/core.py | 73 +++++++++++++++++----------------- wxPython/src/gtk/core_wrap.cpp | 68 +++++++++++++++---------------- wxPython/src/gtk/gdi.py | 9 ++++- wxPython/src/gtk/gdi_wrap.cpp | 43 +++++++++++++++++++- wxPython/src/gtk/misc.py | 5 +++ wxPython/wxPython/core.py | 2 + wxPython/wxPython/gdi.py | 2 + wxPython/wxPython/misc.py | 3 ++ 8 files changed, 131 insertions(+), 74 deletions(-) diff --git a/wxPython/src/gtk/core.py b/wxPython/src/gtk/core.py index d85d7254e6..5e8b1efba6 100644 --- a/wxPython/src/gtk/core.py +++ b/wxPython/src/gtk/core.py @@ -664,6 +664,7 @@ class Size(object): return "<%s.%s; proxy of C++ wxSize instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) width = property(_core.Size_width_get, _core.Size_width_set) height = property(_core.Size_height_get, _core.Size_height_set) + x = width; y = height def __init__(self, *args, **kwargs): """ __init__(int w=0, int h=0) -> Size @@ -3135,6 +3136,7 @@ class CommandEvent(Event): """IsChecked() -> bool""" return _core.CommandEvent_IsChecked(*args, **kwargs) + Checked = IsChecked def IsSelection(*args, **kwargs): """IsSelection() -> bool""" return _core.CommandEvent_IsSelection(*args, **kwargs) @@ -6233,7 +6235,7 @@ class Menu(EvtHandler): def Append(*args, **kwargs): """ - Append(int itemid, wxString text, wxString help=wxPyEmptyString, + Append(int id, wxString text, wxString help=wxPyEmptyString, wxItemKind kind=ITEM_NORMAL) """ return _core.Menu_Append(*args, **kwargs) @@ -6243,15 +6245,15 @@ class Menu(EvtHandler): return _core.Menu_AppendSeparator(*args, **kwargs) def AppendCheckItem(*args, **kwargs): - """AppendCheckItem(int itemid, wxString text, wxString help=wxPyEmptyString)""" + """AppendCheckItem(int id, wxString text, wxString help=wxPyEmptyString)""" return _core.Menu_AppendCheckItem(*args, **kwargs) def AppendRadioItem(*args, **kwargs): - """AppendRadioItem(int itemid, wxString text, wxString help=wxPyEmptyString)""" + """AppendRadioItem(int id, wxString text, wxString help=wxPyEmptyString)""" return _core.Menu_AppendRadioItem(*args, **kwargs) def AppendMenu(*args, **kwargs): - """AppendMenu(int itemid, wxString text, Menu submenu, wxString help=wxPyEmptyString)""" + """AppendMenu(int id, wxString text, Menu submenu, wxString help=wxPyEmptyString)""" return _core.Menu_AppendMenu(*args, **kwargs) def AppendItem(*args, **kwargs): @@ -6268,7 +6270,7 @@ class Menu(EvtHandler): def Insert(*args, **kwargs): """ - Insert(size_t pos, int itemid, wxString text, wxString help=wxPyEmptyString, + Insert(size_t pos, int id, wxString text, wxString help=wxPyEmptyString, wxItemKind kind=ITEM_NORMAL) """ return _core.Menu_Insert(*args, **kwargs) @@ -6278,18 +6280,15 @@ class Menu(EvtHandler): return _core.Menu_InsertSeparator(*args, **kwargs) def InsertCheckItem(*args, **kwargs): - """InsertCheckItem(size_t pos, int itemid, wxString text, wxString help=wxPyEmptyString)""" + """InsertCheckItem(size_t pos, int id, wxString text, wxString help=wxPyEmptyString)""" return _core.Menu_InsertCheckItem(*args, **kwargs) def InsertRadioItem(*args, **kwargs): - """InsertRadioItem(size_t pos, int itemid, wxString text, wxString help=wxPyEmptyString)""" + """InsertRadioItem(size_t pos, int id, wxString text, wxString help=wxPyEmptyString)""" return _core.Menu_InsertRadioItem(*args, **kwargs) def InsertMenu(*args, **kwargs): - """ - InsertMenu(size_t pos, int itemid, wxString text, Menu submenu, - wxString help=wxPyEmptyString) - """ + """InsertMenu(size_t pos, int id, wxString text, Menu submenu, wxString help=wxPyEmptyString)""" return _core.Menu_InsertMenu(*args, **kwargs) def PrependItem(*args, **kwargs): @@ -6298,7 +6297,7 @@ class Menu(EvtHandler): def Prepend(*args, **kwargs): """ - Prepend(int itemid, wxString text, wxString help=wxPyEmptyString, + Prepend(int id, wxString text, wxString help=wxPyEmptyString, wxItemKind kind=ITEM_NORMAL) """ return _core.Menu_Prepend(*args, **kwargs) @@ -6308,19 +6307,19 @@ class Menu(EvtHandler): return _core.Menu_PrependSeparator(*args, **kwargs) def PrependCheckItem(*args, **kwargs): - """PrependCheckItem(int itemid, wxString text, wxString help=wxPyEmptyString)""" + """PrependCheckItem(int id, wxString text, wxString help=wxPyEmptyString)""" return _core.Menu_PrependCheckItem(*args, **kwargs) def PrependRadioItem(*args, **kwargs): - """PrependRadioItem(int itemid, wxString text, wxString help=wxPyEmptyString)""" + """PrependRadioItem(int id, wxString text, wxString help=wxPyEmptyString)""" return _core.Menu_PrependRadioItem(*args, **kwargs) def PrependMenu(*args, **kwargs): - """PrependMenu(int itemid, wxString text, Menu submenu, wxString help=wxPyEmptyString)""" + """PrependMenu(int id, wxString text, Menu submenu, wxString help=wxPyEmptyString)""" return _core.Menu_PrependMenu(*args, **kwargs) def Remove(*args, **kwargs): - """Remove(int itemid) -> MenuItem""" + """Remove(int id) -> MenuItem""" return _core.Menu_Remove(*args, **kwargs) def RemoveItem(*args, **kwargs): @@ -6328,7 +6327,7 @@ class Menu(EvtHandler): return _core.Menu_RemoveItem(*args, **kwargs) def Delete(*args, **kwargs): - """Delete(int itemid) -> bool""" + """Delete(int id) -> bool""" return _core.Menu_Delete(*args, **kwargs) def DeleteItem(*args, **kwargs): @@ -6345,7 +6344,7 @@ class Menu(EvtHandler): def DestroyId(*args, **kwargs): """ - DestroyId(int itemid) -> bool + DestroyId(int id) -> bool Deletes the C++ object this Python object is a proxy for. """ @@ -6372,7 +6371,7 @@ class Menu(EvtHandler): return _core.Menu_FindItem(*args, **kwargs) def FindItemById(*args, **kwargs): - """FindItemById(int itemid) -> MenuItem""" + """FindItemById(int id) -> MenuItem""" return _core.Menu_FindItemById(*args, **kwargs) def FindItemByPosition(*args, **kwargs): @@ -6380,35 +6379,35 @@ class Menu(EvtHandler): return _core.Menu_FindItemByPosition(*args, **kwargs) def Enable(*args, **kwargs): - """Enable(int itemid, bool enable)""" + """Enable(int id, bool enable)""" return _core.Menu_Enable(*args, **kwargs) def IsEnabled(*args, **kwargs): - """IsEnabled(int itemid) -> bool""" + """IsEnabled(int id) -> bool""" return _core.Menu_IsEnabled(*args, **kwargs) def Check(*args, **kwargs): - """Check(int itemid, bool check)""" + """Check(int id, bool check)""" return _core.Menu_Check(*args, **kwargs) def IsChecked(*args, **kwargs): - """IsChecked(int itemid) -> bool""" + """IsChecked(int id) -> bool""" return _core.Menu_IsChecked(*args, **kwargs) def SetLabel(*args, **kwargs): - """SetLabel(int itemid, wxString label)""" + """SetLabel(int id, wxString label)""" return _core.Menu_SetLabel(*args, **kwargs) def GetLabel(*args, **kwargs): - """GetLabel(int itemid) -> wxString""" + """GetLabel(int id) -> wxString""" return _core.Menu_GetLabel(*args, **kwargs) def SetHelpString(*args, **kwargs): - """SetHelpString(int itemid, wxString helpString)""" + """SetHelpString(int id, wxString helpString)""" return _core.Menu_SetHelpString(*args, **kwargs) def GetHelpString(*args, **kwargs): - """GetHelpString(int itemid) -> wxString""" + """GetHelpString(int id) -> wxString""" return _core.Menu_GetHelpString(*args, **kwargs) def SetTitle(*args, **kwargs): @@ -6534,7 +6533,7 @@ class MenuBar(Window): return _core.MenuBar_FindMenuItem(*args, **kwargs) def FindItemById(*args, **kwargs): - """FindItemById(int itemid) -> MenuItem""" + """FindItemById(int id) -> MenuItem""" return _core.MenuBar_FindItemById(*args, **kwargs) def FindMenu(*args, **kwargs): @@ -6542,35 +6541,35 @@ class MenuBar(Window): return _core.MenuBar_FindMenu(*args, **kwargs) def Enable(*args, **kwargs): - """Enable(int itemid, bool enable)""" + """Enable(int id, bool enable)""" return _core.MenuBar_Enable(*args, **kwargs) def Check(*args, **kwargs): - """Check(int itemid, bool check)""" + """Check(int id, bool check)""" return _core.MenuBar_Check(*args, **kwargs) def IsChecked(*args, **kwargs): - """IsChecked(int itemid) -> bool""" + """IsChecked(int id) -> bool""" return _core.MenuBar_IsChecked(*args, **kwargs) def IsEnabled(*args, **kwargs): - """IsEnabled(int itemid) -> bool""" + """IsEnabled(int id) -> bool""" return _core.MenuBar_IsEnabled(*args, **kwargs) def SetLabel(*args, **kwargs): - """SetLabel(int itemid, wxString label)""" + """SetLabel(int id, wxString label)""" return _core.MenuBar_SetLabel(*args, **kwargs) def GetLabel(*args, **kwargs): - """GetLabel(int itemid) -> wxString""" + """GetLabel(int id) -> wxString""" return _core.MenuBar_GetLabel(*args, **kwargs) def SetHelpString(*args, **kwargs): - """SetHelpString(int itemid, wxString helpString)""" + """SetHelpString(int id, wxString helpString)""" return _core.MenuBar_SetHelpString(*args, **kwargs) def GetHelpString(*args, **kwargs): - """GetHelpString(int itemid) -> wxString""" + """GetHelpString(int id) -> wxString""" return _core.MenuBar_GetHelpString(*args, **kwargs) def GetFrame(*args, **kwargs): @@ -6621,7 +6620,7 @@ class MenuItem(Object): return _core.MenuItem_SetMenu(*args, **kwargs) def SetId(*args, **kwargs): - """SetId(int itemid)""" + """SetId(int id)""" return _core.MenuItem_SetId(*args, **kwargs) def GetId(*args, **kwargs): diff --git a/wxPython/src/gtk/core_wrap.cpp b/wxPython/src/gtk/core_wrap.cpp index e8691b4d69..359ef56e97 100644 --- a/wxPython/src/gtk/core_wrap.cpp +++ b/wxPython/src/gtk/core_wrap.cpp @@ -24849,7 +24849,7 @@ static PyObject *_wrap_Menu_Append(PyObject *self, PyObject *args, PyObject *kwa PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; char *kwnames[] = { - (char *) "self",(char *) "itemid",(char *) "text",(char *) "help",(char *) "kind", NULL + (char *) "self",(char *) "id",(char *) "text",(char *) "help",(char *) "kind", NULL }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiO|Oi:Menu_Append",kwnames,&obj0,&arg2,&obj2,&obj3,&arg5)) goto fail; @@ -24933,7 +24933,7 @@ static PyObject *_wrap_Menu_AppendCheckItem(PyObject *self, PyObject *args, PyOb PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; char *kwnames[] = { - (char *) "self",(char *) "itemid",(char *) "text",(char *) "help", NULL + (char *) "self",(char *) "id",(char *) "text",(char *) "help", NULL }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiO|O:Menu_AppendCheckItem",kwnames,&obj0,&arg2,&obj2,&obj3)) goto fail; @@ -24993,7 +24993,7 @@ static PyObject *_wrap_Menu_AppendRadioItem(PyObject *self, PyObject *args, PyOb PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; char *kwnames[] = { - (char *) "self",(char *) "itemid",(char *) "text",(char *) "help", NULL + (char *) "self",(char *) "id",(char *) "text",(char *) "help", NULL }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiO|O:Menu_AppendRadioItem",kwnames,&obj0,&arg2,&obj2,&obj3)) goto fail; @@ -25055,7 +25055,7 @@ static PyObject *_wrap_Menu_AppendMenu(PyObject *self, PyObject *args, PyObject PyObject * obj3 = 0 ; PyObject * obj4 = 0 ; char *kwnames[] = { - (char *) "self",(char *) "itemid",(char *) "text",(char *) "submenu",(char *) "help", NULL + (char *) "self",(char *) "id",(char *) "text",(char *) "submenu",(char *) "help", NULL }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiOO|O:Menu_AppendMenu",kwnames,&obj0,&arg2,&obj2,&obj3,&obj4)) goto fail; @@ -25202,7 +25202,7 @@ static PyObject *_wrap_Menu_Insert(PyObject *self, PyObject *args, PyObject *kwa PyObject * obj3 = 0 ; PyObject * obj4 = 0 ; char *kwnames[] = { - (char *) "self",(char *) "pos",(char *) "itemid",(char *) "text",(char *) "help",(char *) "kind", NULL + (char *) "self",(char *) "pos",(char *) "id",(char *) "text",(char *) "help",(char *) "kind", NULL }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOiO|Oi:Menu_Insert",kwnames,&obj0,&obj1,&arg3,&obj3,&obj4,&arg6)) goto fail; @@ -25294,7 +25294,7 @@ static PyObject *_wrap_Menu_InsertCheckItem(PyObject *self, PyObject *args, PyOb PyObject * obj3 = 0 ; PyObject * obj4 = 0 ; char *kwnames[] = { - (char *) "self",(char *) "pos",(char *) "itemid",(char *) "text",(char *) "help", NULL + (char *) "self",(char *) "pos",(char *) "id",(char *) "text",(char *) "help", NULL }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOiO|O:Menu_InsertCheckItem",kwnames,&obj0,&obj1,&arg3,&obj3,&obj4)) goto fail; @@ -25358,7 +25358,7 @@ static PyObject *_wrap_Menu_InsertRadioItem(PyObject *self, PyObject *args, PyOb PyObject * obj3 = 0 ; PyObject * obj4 = 0 ; char *kwnames[] = { - (char *) "self",(char *) "pos",(char *) "itemid",(char *) "text",(char *) "help", NULL + (char *) "self",(char *) "pos",(char *) "id",(char *) "text",(char *) "help", NULL }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOiO|O:Menu_InsertRadioItem",kwnames,&obj0,&obj1,&arg3,&obj3,&obj4)) goto fail; @@ -25424,7 +25424,7 @@ static PyObject *_wrap_Menu_InsertMenu(PyObject *self, PyObject *args, PyObject PyObject * obj4 = 0 ; PyObject * obj5 = 0 ; char *kwnames[] = { - (char *) "self",(char *) "pos",(char *) "itemid",(char *) "text",(char *) "submenu",(char *) "help", NULL + (char *) "self",(char *) "pos",(char *) "id",(char *) "text",(char *) "submenu",(char *) "help", NULL }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOiOO|O:Menu_InsertMenu",kwnames,&obj0,&obj1,&arg3,&obj3,&obj4,&obj5)) goto fail; @@ -25515,7 +25515,7 @@ static PyObject *_wrap_Menu_Prepend(PyObject *self, PyObject *args, PyObject *kw PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; char *kwnames[] = { - (char *) "self",(char *) "itemid",(char *) "text",(char *) "help",(char *) "kind", NULL + (char *) "self",(char *) "id",(char *) "text",(char *) "help",(char *) "kind", NULL }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiO|Oi:Menu_Prepend",kwnames,&obj0,&arg2,&obj2,&obj3,&arg5)) goto fail; @@ -25599,7 +25599,7 @@ static PyObject *_wrap_Menu_PrependCheckItem(PyObject *self, PyObject *args, PyO PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; char *kwnames[] = { - (char *) "self",(char *) "itemid",(char *) "text",(char *) "help", NULL + (char *) "self",(char *) "id",(char *) "text",(char *) "help", NULL }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiO|O:Menu_PrependCheckItem",kwnames,&obj0,&arg2,&obj2,&obj3)) goto fail; @@ -25659,7 +25659,7 @@ static PyObject *_wrap_Menu_PrependRadioItem(PyObject *self, PyObject *args, PyO PyObject * obj2 = 0 ; PyObject * obj3 = 0 ; char *kwnames[] = { - (char *) "self",(char *) "itemid",(char *) "text",(char *) "help", NULL + (char *) "self",(char *) "id",(char *) "text",(char *) "help", NULL }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiO|O:Menu_PrependRadioItem",kwnames,&obj0,&arg2,&obj2,&obj3)) goto fail; @@ -25721,7 +25721,7 @@ static PyObject *_wrap_Menu_PrependMenu(PyObject *self, PyObject *args, PyObject PyObject * obj3 = 0 ; PyObject * obj4 = 0 ; char *kwnames[] = { - (char *) "self",(char *) "itemid",(char *) "text",(char *) "submenu",(char *) "help", NULL + (char *) "self",(char *) "id",(char *) "text",(char *) "submenu",(char *) "help", NULL }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiOO|O:Menu_PrependMenu",kwnames,&obj0,&arg2,&obj2,&obj3,&obj4)) goto fail; @@ -25776,7 +25776,7 @@ static PyObject *_wrap_Menu_Remove(PyObject *self, PyObject *args, PyObject *kwa wxMenuItem *result; PyObject * obj0 = 0 ; char *kwnames[] = { - (char *) "self",(char *) "itemid", NULL + (char *) "self",(char *) "id", NULL }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Menu_Remove",kwnames,&obj0,&arg2)) goto fail; @@ -25834,7 +25834,7 @@ static PyObject *_wrap_Menu_Delete(PyObject *self, PyObject *args, PyObject *kwa bool result; PyObject * obj0 = 0 ; char *kwnames[] = { - (char *) "self",(char *) "itemid", NULL + (char *) "self",(char *) "id", NULL }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Menu_Delete",kwnames,&obj0,&arg2)) goto fail; @@ -25912,7 +25912,7 @@ static PyObject *_wrap_Menu_DestroyId(PyObject *self, PyObject *args, PyObject * bool result; PyObject * obj0 = 0 ; char *kwnames[] = { - (char *) "self",(char *) "itemid", NULL + (char *) "self",(char *) "id", NULL }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Menu_DestroyId",kwnames,&obj0,&arg2)) goto fail; @@ -26057,7 +26057,7 @@ static PyObject *_wrap_Menu_FindItemById(PyObject *self, PyObject *args, PyObjec wxMenuItem *result; PyObject * obj0 = 0 ; char *kwnames[] = { - (char *) "self",(char *) "itemid", NULL + (char *) "self",(char *) "id", NULL }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Menu_FindItemById",kwnames,&obj0,&arg2)) goto fail; @@ -26117,7 +26117,7 @@ static PyObject *_wrap_Menu_Enable(PyObject *self, PyObject *args, PyObject *kwa PyObject * obj0 = 0 ; PyObject * obj2 = 0 ; char *kwnames[] = { - (char *) "self",(char *) "itemid",(char *) "enable", NULL + (char *) "self",(char *) "id",(char *) "enable", NULL }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiO:Menu_Enable",kwnames,&obj0,&arg2,&obj2)) goto fail; @@ -26145,7 +26145,7 @@ static PyObject *_wrap_Menu_IsEnabled(PyObject *self, PyObject *args, PyObject * bool result; PyObject * obj0 = 0 ; char *kwnames[] = { - (char *) "self",(char *) "itemid", NULL + (char *) "self",(char *) "id", NULL }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Menu_IsEnabled",kwnames,&obj0,&arg2)) goto fail; @@ -26172,7 +26172,7 @@ static PyObject *_wrap_Menu_Check(PyObject *self, PyObject *args, PyObject *kwar PyObject * obj0 = 0 ; PyObject * obj2 = 0 ; char *kwnames[] = { - (char *) "self",(char *) "itemid",(char *) "check", NULL + (char *) "self",(char *) "id",(char *) "check", NULL }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiO:Menu_Check",kwnames,&obj0,&arg2,&obj2)) goto fail; @@ -26200,7 +26200,7 @@ static PyObject *_wrap_Menu_IsChecked(PyObject *self, PyObject *args, PyObject * bool result; PyObject * obj0 = 0 ; char *kwnames[] = { - (char *) "self",(char *) "itemid", NULL + (char *) "self",(char *) "id", NULL }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Menu_IsChecked",kwnames,&obj0,&arg2)) goto fail; @@ -26228,7 +26228,7 @@ static PyObject *_wrap_Menu_SetLabel(PyObject *self, PyObject *args, PyObject *k PyObject * obj0 = 0 ; PyObject * obj2 = 0 ; char *kwnames[] = { - (char *) "self",(char *) "itemid",(char *) "label", NULL + (char *) "self",(char *) "id",(char *) "label", NULL }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiO:Menu_SetLabel",kwnames,&obj0,&arg2,&obj2)) goto fail; @@ -26267,7 +26267,7 @@ static PyObject *_wrap_Menu_GetLabel(PyObject *self, PyObject *args, PyObject *k wxString result; PyObject * obj0 = 0 ; char *kwnames[] = { - (char *) "self",(char *) "itemid", NULL + (char *) "self",(char *) "id", NULL }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Menu_GetLabel",kwnames,&obj0,&arg2)) goto fail; @@ -26301,7 +26301,7 @@ static PyObject *_wrap_Menu_SetHelpString(PyObject *self, PyObject *args, PyObje PyObject * obj0 = 0 ; PyObject * obj2 = 0 ; char *kwnames[] = { - (char *) "self",(char *) "itemid",(char *) "helpString", NULL + (char *) "self",(char *) "id",(char *) "helpString", NULL }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiO:Menu_SetHelpString",kwnames,&obj0,&arg2,&obj2)) goto fail; @@ -26340,7 +26340,7 @@ static PyObject *_wrap_Menu_GetHelpString(PyObject *self, PyObject *args, PyObje wxString result; PyObject * obj0 = 0 ; char *kwnames[] = { - (char *) "self",(char *) "itemid", NULL + (char *) "self",(char *) "id", NULL }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:Menu_GetHelpString",kwnames,&obj0,&arg2)) goto fail; @@ -27220,7 +27220,7 @@ static PyObject *_wrap_MenuBar_FindItemById(PyObject *self, PyObject *args, PyOb wxMenuItem *result; PyObject * obj0 = 0 ; char *kwnames[] = { - (char *) "self",(char *) "itemid", NULL + (char *) "self",(char *) "id", NULL }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:MenuBar_FindItemById",kwnames,&obj0,&arg2)) goto fail; @@ -27290,7 +27290,7 @@ static PyObject *_wrap_MenuBar_Enable(PyObject *self, PyObject *args, PyObject * PyObject * obj0 = 0 ; PyObject * obj2 = 0 ; char *kwnames[] = { - (char *) "self",(char *) "itemid",(char *) "enable", NULL + (char *) "self",(char *) "id",(char *) "enable", NULL }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiO:MenuBar_Enable",kwnames,&obj0,&arg2,&obj2)) goto fail; @@ -27319,7 +27319,7 @@ static PyObject *_wrap_MenuBar_Check(PyObject *self, PyObject *args, PyObject *k PyObject * obj0 = 0 ; PyObject * obj2 = 0 ; char *kwnames[] = { - (char *) "self",(char *) "itemid",(char *) "check", NULL + (char *) "self",(char *) "id",(char *) "check", NULL }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiO:MenuBar_Check",kwnames,&obj0,&arg2,&obj2)) goto fail; @@ -27347,7 +27347,7 @@ static PyObject *_wrap_MenuBar_IsChecked(PyObject *self, PyObject *args, PyObjec bool result; PyObject * obj0 = 0 ; char *kwnames[] = { - (char *) "self",(char *) "itemid", NULL + (char *) "self",(char *) "id", NULL }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:MenuBar_IsChecked",kwnames,&obj0,&arg2)) goto fail; @@ -27373,7 +27373,7 @@ static PyObject *_wrap_MenuBar_IsEnabled(PyObject *self, PyObject *args, PyObjec bool result; PyObject * obj0 = 0 ; char *kwnames[] = { - (char *) "self",(char *) "itemid", NULL + (char *) "self",(char *) "id", NULL }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:MenuBar_IsEnabled",kwnames,&obj0,&arg2)) goto fail; @@ -27401,7 +27401,7 @@ static PyObject *_wrap_MenuBar_SetLabel(PyObject *self, PyObject *args, PyObject PyObject * obj0 = 0 ; PyObject * obj2 = 0 ; char *kwnames[] = { - (char *) "self",(char *) "itemid",(char *) "label", NULL + (char *) "self",(char *) "id",(char *) "label", NULL }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiO:MenuBar_SetLabel",kwnames,&obj0,&arg2,&obj2)) goto fail; @@ -27440,7 +27440,7 @@ static PyObject *_wrap_MenuBar_GetLabel(PyObject *self, PyObject *args, PyObject wxString result; PyObject * obj0 = 0 ; char *kwnames[] = { - (char *) "self",(char *) "itemid", NULL + (char *) "self",(char *) "id", NULL }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:MenuBar_GetLabel",kwnames,&obj0,&arg2)) goto fail; @@ -27474,7 +27474,7 @@ static PyObject *_wrap_MenuBar_SetHelpString(PyObject *self, PyObject *args, PyO PyObject * obj0 = 0 ; PyObject * obj2 = 0 ; char *kwnames[] = { - (char *) "self",(char *) "itemid",(char *) "helpString", NULL + (char *) "self",(char *) "id",(char *) "helpString", NULL }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OiO:MenuBar_SetHelpString",kwnames,&obj0,&arg2,&obj2)) goto fail; @@ -27513,7 +27513,7 @@ static PyObject *_wrap_MenuBar_GetHelpString(PyObject *self, PyObject *args, PyO wxString result; PyObject * obj0 = 0 ; char *kwnames[] = { - (char *) "self",(char *) "itemid", NULL + (char *) "self",(char *) "id", NULL }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:MenuBar_GetHelpString",kwnames,&obj0,&arg2)) goto fail; @@ -27782,7 +27782,7 @@ static PyObject *_wrap_MenuItem_SetId(PyObject *self, PyObject *args, PyObject * int arg2 ; PyObject * obj0 = 0 ; char *kwnames[] = { - (char *) "self",(char *) "itemid", NULL + (char *) "self",(char *) "id", NULL }; if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:MenuItem_SetId",kwnames,&obj0,&arg2)) goto fail; diff --git a/wxPython/src/gtk/gdi.py b/wxPython/src/gtk/gdi.py index 18b5466bb8..7252637aac 100644 --- a/wxPython/src/gtk/gdi.py +++ b/wxPython/src/gtk/gdi.py @@ -123,6 +123,9 @@ def ColourRGB(*args, **kwargs): val.thisown = 1 return val +Color = Colour +NamedColor = NamedColour + class Palette(GDIObject): def __repr__(self): return "<%s.%s; proxy of C++ wxPalette instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) @@ -2328,8 +2331,12 @@ class DC(core.Object): """SetPalette(Palette palette)""" return _gdi.DC_SetPalette(*args, **kwargs) + def SetClippingRegionXY(*args, **kwargs): + """SetClippingRegionXY(int x, int y, int width, int height)""" + return _gdi.DC_SetClippingRegionXY(*args, **kwargs) + def SetClippingRegion(*args, **kwargs): - """SetClippingRegion(int x, int y, int width, int height)""" + """SetClippingRegion(Point pt, Size sz)""" return _gdi.DC_SetClippingRegion(*args, **kwargs) def SetClippingRect(*args, **kwargs): diff --git a/wxPython/src/gtk/gdi_wrap.cpp b/wxPython/src/gtk/gdi_wrap.cpp index f67ecc37c2..e45013beb3 100644 --- a/wxPython/src/gtk/gdi_wrap.cpp +++ b/wxPython/src/gtk/gdi_wrap.cpp @@ -10839,7 +10839,7 @@ static PyObject *_wrap_DC_SetPalette(PyObject *self, PyObject *args, PyObject *k } -static PyObject *_wrap_DC_SetClippingRegion(PyObject *self, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_DC_SetClippingRegionXY(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxDC *arg1 = (wxDC *) 0 ; int arg2 ; @@ -10851,7 +10851,7 @@ static PyObject *_wrap_DC_SetClippingRegion(PyObject *self, PyObject *args, PyOb (char *) "self",(char *) "x",(char *) "y",(char *) "width",(char *) "height", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oiiii:DC_SetClippingRegion",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oiiii:DC_SetClippingRegionXY",kwnames,&obj0,&arg2,&arg3,&arg4,&arg5)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -10867,6 +10867,44 @@ static PyObject *_wrap_DC_SetClippingRegion(PyObject *self, PyObject *args, PyOb } +static PyObject *_wrap_DC_SetClippingRegion(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxDC *arg1 = (wxDC *) 0 ; + wxPoint *arg2 = 0 ; + wxSize *arg3 = 0 ; + wxPoint temp2 ; + wxSize temp3 ; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; + char *kwnames[] = { + (char *) "self",(char *) "pt",(char *) "sz", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:DC_SetClippingRegion",kwnames,&obj0,&obj1,&obj2)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + arg2 = &temp2; + if ( ! wxPoint_helper(obj1, &arg2)) SWIG_fail; + } + { + arg3 = &temp3; + if ( ! wxSize_helper(obj2, &arg3)) SWIG_fail; + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + (arg1)->SetClippingRegion((wxPoint const &)*arg2,(wxSize const &)*arg3); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + Py_INCREF(Py_None); resultobj = Py_None; + return resultobj; + fail: + return NULL; +} + + static PyObject *_wrap_DC_SetClippingRect(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxDC *arg1 = (wxDC *) 0 ; @@ -16103,6 +16141,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"DC_SetBackground", (PyCFunction) _wrap_DC_SetBackground, METH_VARARGS | METH_KEYWORDS }, { (char *)"DC_SetBackgroundMode", (PyCFunction) _wrap_DC_SetBackgroundMode, METH_VARARGS | METH_KEYWORDS }, { (char *)"DC_SetPalette", (PyCFunction) _wrap_DC_SetPalette, METH_VARARGS | METH_KEYWORDS }, + { (char *)"DC_SetClippingRegionXY", (PyCFunction) _wrap_DC_SetClippingRegionXY, METH_VARARGS | METH_KEYWORDS }, { (char *)"DC_SetClippingRegion", (PyCFunction) _wrap_DC_SetClippingRegion, METH_VARARGS | METH_KEYWORDS }, { (char *)"DC_SetClippingRect", (PyCFunction) _wrap_DC_SetClippingRect, METH_VARARGS | METH_KEYWORDS }, { (char *)"DC_SetClippingRegionAsRegion", (PyCFunction) _wrap_DC_SetClippingRegionAsRegion, METH_VARARGS | METH_KEYWORDS }, diff --git a/wxPython/src/gtk/misc.py b/wxPython/src/gtk/misc.py index 2c7f424821..12e5dde11c 100644 --- a/wxPython/src/gtk/misc.py +++ b/wxPython/src/gtk/misc.py @@ -164,6 +164,11 @@ def SystemSettings_SetScreenType(*args, **kwargs): """SystemSettings_SetScreenType(wxSystemScreenType screen)""" return _misc.SystemSettings_SetScreenType(*args, **kwargs) +# backwards compatibility aliasses +SystemSettings_GetSystemColour = SystemSettings_GetColour +SystemSettings_GetSystemFont = SystemSettings_GetFont +SystemSettings_GetSystemMetric = SystemSettings_GetMetric + class SystemOptions(core.Object): def __repr__(self): return "<%s.%s; proxy of C++ wxSystemOptions instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) diff --git a/wxPython/wxPython/core.py b/wxPython/wxPython/core.py index 5628e3b0bb..57d0ffc006 100644 --- a/wxPython/wxPython/core.py +++ b/wxPython/wxPython/core.py @@ -1012,6 +1012,8 @@ for k, v in wx.core.__dict__.iteritems(): d[k] = v elif k.startswith('WXK'): d[k] = v + elif k.startswith('__version__'): + d[k] = v del d, k, v diff --git a/wxPython/wxPython/gdi.py b/wxPython/wxPython/gdi.py index 0f277f27ea..303ebfd2b0 100644 --- a/wxPython/wxPython/gdi.py +++ b/wxPython/wxPython/gdi.py @@ -494,5 +494,7 @@ wxThePenList = wx.gdi.ThePenList wxTheBrushList = wx.gdi.TheBrushList wxTheColourDatabase = wx.gdi.TheColourDatabase wxEffects = wx.gdi.Effects +wxColor = wx.gdi.Color +wxNamedColor = wx.gdi.NamedColor diff --git a/wxPython/wxPython/misc.py b/wxPython/wxPython/misc.py index c48430afcf..cd70362b85 100644 --- a/wxPython/wxPython/misc.py +++ b/wxPython/wxPython/misc.py @@ -497,5 +497,8 @@ wxTheClipboard = wx.misc.TheClipboard wxClipboardLocker = wx.misc.ClipboardLocker wxPyTimer = wx.misc.PyTimer wxPyDropTarget = wx.misc.PyDropTarget +wxSystemSettings_GetSystemColour = wx.misc.SystemSettings_GetSystemColour +wxSystemSettings_GetSystemFont = wx.misc.SystemSettings_GetSystemFont +wxSystemSettings_GetSystemMetric = wx.misc.SystemSettings_GetSystemMetric -- 2.47.2