Mirrors_UI_SDK/wxWidgets
1
0
Fork 0
mirror of https://github.com/wxWidgets/wxWidgets.git synced 2026-09-21 13:26:08 +08:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

reSWIGged

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28294 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2004-07-17 23:32:47 +00:00
parent dc5960727c
commit b0f7404b92
36 changed files with 592 additions and 562 deletions
Download Patch File Download Diff File Expand all files Collapse all files
wxPython/contrib/gizmos/gtk/gizmos_wrap.cpp
+32 -31
View File
File diff suppressed because one or more lines are too long
wxPython/contrib/gizmos/mac/gizmos_wrap.cpp
+32 -31
View File
File diff suppressed because one or more lines are too long
wxPython/contrib/gizmos/msw/gizmos_wrap.cpp
+32 -31
View File
File diff suppressed because one or more lines are too long
wxPython/contrib/ogl/gtk/ogl_wrap.cpp
+4 -12
View File
@@ -1998,9 +1998,7 @@ static PyObject *_wrap_new_PyShapeEvtHandler(PyObject *self, PyObject *args, PyO
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
{
resultobj = wxPyMake_wxShapeEvtHandler(result, 1);
}
resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxPyShapeEvtHandler, 1);
return resultobj;
fail:
return NULL;
@@ -3441,9 +3439,7 @@ static PyObject *_wrap_new_PyShape(PyObject *self, PyObject *args, PyObject *kwa
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
{
resultobj = wxPyMake_wxShapeEvtHandler(result, 1);
}
resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxPyShape, 1);
return resultobj;
fail:
return NULL;
@@ -20174,9 +20170,7 @@ static PyObject *_wrap_new_PyDivisionShape(PyObject *self, PyObject *args, PyObj
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
{
resultobj = wxPyMake_wxShapeEvtHandler(result, 1);
}
resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxPyDivisionShape, 1);
return resultobj;
fail:
return NULL;
@@ -31791,9 +31785,7 @@ static PyObject *_wrap_new_PyShapeCanvas(PyObject *self, PyObject *args, PyObjec
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
{
resultobj = wxPyMake_wxObject(result, 1);
}
resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxPyShapeCanvas, 1);
{
if (temp6)
delete arg6;
wxPython/contrib/ogl/mac/ogl_wrap.cpp
+4 -12
View File
@@ -1998,9 +1998,7 @@ static PyObject *_wrap_new_PyShapeEvtHandler(PyObject *self, PyObject *args, PyO
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
{
resultobj = wxPyMake_wxShapeEvtHandler(result, 1);
}
resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxPyShapeEvtHandler, 1);
return resultobj;
fail:
return NULL;
@@ -3441,9 +3439,7 @@ static PyObject *_wrap_new_PyShape(PyObject *self, PyObject *args, PyObject *kwa
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
{
resultobj = wxPyMake_wxShapeEvtHandler(result, 1);
}
resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxPyShape, 1);
return resultobj;
fail:
return NULL;
@@ -20174,9 +20170,7 @@ static PyObject *_wrap_new_PyDivisionShape(PyObject *self, PyObject *args, PyObj
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
{
resultobj = wxPyMake_wxShapeEvtHandler(result, 1);
}
resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxPyDivisionShape, 1);
return resultobj;
fail:
return NULL;
@@ -31791,9 +31785,7 @@ static PyObject *_wrap_new_PyShapeCanvas(PyObject *self, PyObject *args, PyObjec
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
{
resultobj = wxPyMake_wxObject(result, 1);
}
resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxPyShapeCanvas, 1);
{
if (temp6)
delete arg6;
wxPython/contrib/ogl/msw/ogl_wrap.cpp
+4 -12
View File
@@ -1998,9 +1998,7 @@ static PyObject *_wrap_new_PyShapeEvtHandler(PyObject *self, PyObject *args, PyO
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
{
resultobj = wxPyMake_wxShapeEvtHandler(result, 1);
}
resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxPyShapeEvtHandler, 1);
return resultobj;
fail:
return NULL;
@@ -3441,9 +3439,7 @@ static PyObject *_wrap_new_PyShape(PyObject *self, PyObject *args, PyObject *kwa
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
{
resultobj = wxPyMake_wxShapeEvtHandler(result, 1);
}
resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxPyShape, 1);
return resultobj;
fail:
return NULL;
@@ -20174,9 +20170,7 @@ static PyObject *_wrap_new_PyDivisionShape(PyObject *self, PyObject *args, PyObj
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
{
resultobj = wxPyMake_wxShapeEvtHandler(result, 1);
}
resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxPyDivisionShape, 1);
return resultobj;
fail:
return NULL;
@@ -31791,9 +31785,7 @@ static PyObject *_wrap_new_PyShapeCanvas(PyObject *self, PyObject *args, PyObjec
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
{
resultobj = wxPyMake_wxObject(result, 1);
}
resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxPyShapeCanvas, 1);
{
if (temp6)
delete arg6;
wxPython/contrib/xrc/_xrc_rename.i
+1
View File
@@ -5,6 +5,7 @@
%rename(XRC_USE_LOCALE) wxXRC_USE_LOCALE;
%rename(XRC_NO_SUBCLASSING) wxXRC_NO_SUBCLASSING;
%rename(XRC_NO_RELOADING) wxXRC_NO_RELOADING;
%rename(XmlResource) wxXmlResource;
%rename(XML_ELEMENT_NODE) wxXML_ELEMENT_NODE;
%rename(XML_ATTRIBUTE_NODE) wxXML_ATTRIBUTE_NODE;
wxPython/contrib/xrc/gtk/xrc.py
+1
View File
@@ -19,6 +19,7 @@ WX_XMLRES_CURRENT_VERSION_RELEASE = _xrc.WX_XMLRES_CURRENT_VERSION_RELEASE
WX_XMLRES_CURRENT_VERSION_REVISION = _xrc.WX_XMLRES_CURRENT_VERSION_REVISION
XRC_USE_LOCALE = _xrc.XRC_USE_LOCALE
XRC_NO_SUBCLASSING = _xrc.XRC_NO_SUBCLASSING
XRC_NO_RELOADING = _xrc.XRC_NO_RELOADING
class XmlResource(_core.Object):
def __repr__(self):
return "<%s.%s; proxy of C++ wxXmlResource instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
wxPython/contrib/xrc/gtk/xrc_wrap.cpp
+1
View File
@@ -5760,6 +5760,7 @@ SWIGEXPORT(void) SWIG_init(void) {
PyDict_SetItemString(d,"WX_XMLRES_CURRENT_VERSION_REVISION", SWIG_FromInt((int)WX_XMLRES_CURRENT_VERSION_REVISION));
PyDict_SetItemString(d,"XRC_USE_LOCALE", SWIG_FromInt((int)wxXRC_USE_LOCALE));
PyDict_SetItemString(d,"XRC_NO_SUBCLASSING", SWIG_FromInt((int)wxXRC_NO_SUBCLASSING));
PyDict_SetItemString(d,"XRC_NO_RELOADING", SWIG_FromInt((int)wxXRC_NO_RELOADING));
PyDict_SetItemString(d,"XML_ELEMENT_NODE", SWIG_FromInt((int)wxXML_ELEMENT_NODE));
PyDict_SetItemString(d,"XML_ATTRIBUTE_NODE", SWIG_FromInt((int)wxXML_ATTRIBUTE_NODE));
PyDict_SetItemString(d,"XML_TEXT_NODE", SWIG_FromInt((int)wxXML_TEXT_NODE));
wxPython/contrib/xrc/mac/xrc.py
+1
View File
@@ -19,6 +19,7 @@ WX_XMLRES_CURRENT_VERSION_RELEASE = _xrc.WX_XMLRES_CURRENT_VERSION_RELEASE
WX_XMLRES_CURRENT_VERSION_REVISION = _xrc.WX_XMLRES_CURRENT_VERSION_REVISION
XRC_USE_LOCALE = _xrc.XRC_USE_LOCALE
XRC_NO_SUBCLASSING = _xrc.XRC_NO_SUBCLASSING
XRC_NO_RELOADING = _xrc.XRC_NO_RELOADING
class XmlResource(_core.Object):
def __repr__(self):
return "<%s.%s; proxy of C++ wxXmlResource instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
wxPython/contrib/xrc/mac/xrc_wrap.cpp
+1
View File
@@ -5760,6 +5760,7 @@ SWIGEXPORT(void) SWIG_init(void) {
PyDict_SetItemString(d,"WX_XMLRES_CURRENT_VERSION_REVISION", SWIG_FromInt((int)WX_XMLRES_CURRENT_VERSION_REVISION));
PyDict_SetItemString(d,"XRC_USE_LOCALE", SWIG_FromInt((int)wxXRC_USE_LOCALE));
PyDict_SetItemString(d,"XRC_NO_SUBCLASSING", SWIG_FromInt((int)wxXRC_NO_SUBCLASSING));
PyDict_SetItemString(d,"XRC_NO_RELOADING", SWIG_FromInt((int)wxXRC_NO_RELOADING));
PyDict_SetItemString(d,"XML_ELEMENT_NODE", SWIG_FromInt((int)wxXML_ELEMENT_NODE));
PyDict_SetItemString(d,"XML_ATTRIBUTE_NODE", SWIG_FromInt((int)wxXML_ATTRIBUTE_NODE));
PyDict_SetItemString(d,"XML_TEXT_NODE", SWIG_FromInt((int)wxXML_TEXT_NODE));
wxPython/contrib/xrc/msw/xrc.py
+1
View File
@@ -19,6 +19,7 @@ WX_XMLRES_CURRENT_VERSION_RELEASE = _xrc.WX_XMLRES_CURRENT_VERSION_RELEASE
WX_XMLRES_CURRENT_VERSION_REVISION = _xrc.WX_XMLRES_CURRENT_VERSION_REVISION
XRC_USE_LOCALE = _xrc.XRC_USE_LOCALE
XRC_NO_SUBCLASSING = _xrc.XRC_NO_SUBCLASSING
XRC_NO_RELOADING = _xrc.XRC_NO_RELOADING
class XmlResource(_core.Object):
def __repr__(self):
return "<%s.%s; proxy of C++ wxXmlResource instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
wxPython/contrib/xrc/msw/xrc_wrap.cpp
+1
View File
@@ -5760,6 +5760,7 @@ SWIGEXPORT(void) SWIG_init(void) {
PyDict_SetItemString(d,"WX_XMLRES_CURRENT_VERSION_REVISION", SWIG_FromInt((int)WX_XMLRES_CURRENT_VERSION_REVISION));
PyDict_SetItemString(d,"XRC_USE_LOCALE", SWIG_FromInt((int)wxXRC_USE_LOCALE));
PyDict_SetItemString(d,"XRC_NO_SUBCLASSING", SWIG_FromInt((int)wxXRC_NO_SUBCLASSING));
PyDict_SetItemString(d,"XRC_NO_RELOADING", SWIG_FromInt((int)wxXRC_NO_RELOADING));
PyDict_SetItemString(d,"XML_ELEMENT_NODE", SWIG_FromInt((int)wxXML_ELEMENT_NODE));
PyDict_SetItemString(d,"XML_ATTRIBUTE_NODE", SWIG_FromInt((int)wxXML_ATTRIBUTE_NODE));
PyDict_SetItemString(d,"XML_TEXT_NODE", SWIG_FromInt((int)wxXML_TEXT_NODE));
wxPython/src/gtk/_controls_wrap.cpp
+14 -42
View File
@@ -1126,9 +1126,7 @@ static PyObject *_wrap_new_Button(PyObject *self, PyObject *args, PyObject *kwar
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
{
resultobj = wxPyMake_wxObject(result, 1);
}
resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxButton, 1);
{
if (temp3)
delete arg3;
@@ -1167,9 +1165,7 @@ static PyObject *_wrap_new_PreButton(PyObject *self, PyObject *args, PyObject *k
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
{
resultobj = wxPyMake_wxObject(result, 1);
}
resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxButton, 1);
return resultobj;
fail:
return NULL;
@@ -1468,9 +1464,7 @@ static PyObject *_wrap_new_BitmapButton(PyObject *self, PyObject *args, PyObject
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
{
resultobj = wxPyMake_wxObject(result, 1);
}
resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxBitmapButton, 1);
{
if (temp8)
delete arg8;
@@ -1501,9 +1495,7 @@ static PyObject *_wrap_new_PreBitmapButton(PyObject *self, PyObject *args, PyObj
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
{
resultobj = wxPyMake_wxObject(result, 1);
}
resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxBitmapButton, 1);
return resultobj;
fail:
return NULL;
@@ -4469,9 +4461,7 @@ static PyObject *_wrap_new_StaticBox(PyObject *self, PyObject *args, PyObject *k
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
{
resultobj = wxPyMake_wxObject(result, 1);
}
resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxStaticBox, 1);
{
if (temp3)
delete arg3;
@@ -4510,9 +4500,7 @@ static PyObject *_wrap_new_PreStaticBox(PyObject *self, PyObject *args, PyObject
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
{
resultobj = wxPyMake_wxObject(result, 1);
}
resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxStaticBox, 1);
return resultobj;
fail:
return NULL;
@@ -8052,9 +8040,7 @@ static PyObject *_wrap_new_TextCtrl(PyObject *self, PyObject *args, PyObject *kw
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
{
resultobj = wxPyMake_wxObject(result, 1);
}
resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxTextCtrl, 1);
{
if (temp3)
delete arg3;
@@ -8093,9 +8079,7 @@ static PyObject *_wrap_new_PreTextCtrl(PyObject *self, PyObject *args, PyObject
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
{
resultobj = wxPyMake_wxObject(result, 1);
}
resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxTextCtrl, 1);
return resultobj;
fail:
return NULL;
@@ -15024,9 +15008,7 @@ static PyObject *_wrap_new_Notebook(PyObject *self, PyObject *args, PyObject *kw
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
{
resultobj = wxPyMake_wxObject(result, 1);
}
resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxNotebook, 1);
{
if (temp6)
delete arg6;
@@ -15057,9 +15039,7 @@ static PyObject *_wrap_new_PreNotebook(PyObject *self, PyObject *args, PyObject
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
{
resultobj = wxPyMake_wxObject(result, 1);
}
resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxNotebook, 1);
return resultobj;
fail:
return NULL;
@@ -18439,9 +18419,7 @@ static PyObject *_wrap_new_ToolBar(PyObject *self, PyObject *args, PyObject *kwa
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
{
resultobj = wxPyMake_wxObject(result, 1);
}
resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxToolBar, 1);
{
if (temp6)
delete arg6;
@@ -18472,9 +18450,7 @@ static PyObject *_wrap_new_PreToolBar(PyObject *self, PyObject *args, PyObject *
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
{
resultobj = wxPyMake_wxObject(result, 1);
}
resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxToolBar, 1);
return resultobj;
fail:
return NULL;
@@ -25007,9 +24983,7 @@ static PyObject *_wrap_new_TreeCtrl(PyObject *self, PyObject *args, PyObject *kw
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
{
resultobj = wxPyMake_wxObject(result, 1);
}
resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxPyTreeCtrl, 1);
{
if (temp7)
delete arg7;
@@ -25040,9 +25014,7 @@ static PyObject *_wrap_new_PreTreeCtrl(PyObject *self, PyObject *args, PyObject
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
{
resultobj = wxPyMake_wxObject(result, 1);
}
resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxPyTreeCtrl, 1);
return resultobj;
fail:
return NULL;
wxPython/src/gtk/_core.py
+1
View File
@@ -4323,6 +4323,7 @@ class NavigationKeyEvent(Event):
"""SetCurrentFocus(self, Window win)"""
return _core_.NavigationKeyEvent_SetCurrentFocus(*args, **kwargs)
IsBackward = _core_.NavigationKeyEvent_IsBackward
IsForward = _core_.NavigationKeyEvent_IsForward
WinChange = _core_.NavigationKeyEvent_WinChange
wxPython/src/gtk/_core_wrap.cpp
+12 -28
View File
@@ -1605,7 +1605,8 @@ static wxPySizerItemInfo wxPySizerItemTypeHelper(PyObject* item, bool checkSize,
}
void wxSizer__setOORInfo(wxSizer *self,PyObject *_self){
self->SetClientObject(new wxPyOORClientData(_self));
if (!self->GetClientObject())
self->SetClientObject(new wxPyOORClientData(_self));
}
void wxSizer_Add(wxSizer *self,PyObject *item,int proportion,int flag,int border,PyObject *userData){
@@ -11783,9 +11784,7 @@ static PyObject *_wrap_new_EvtHandler(PyObject *self, PyObject *args, PyObject *
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
{
resultobj = wxPyMake_wxObject(result, 1);
}
resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxEvtHandler, 1);
return resultobj;
fail:
return NULL;
@@ -19492,9 +19491,7 @@ static PyObject *_wrap_new_PyApp(PyObject *self, PyObject *args, PyObject *kwarg
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
{
resultobj = wxPyMake_wxObject(result, 1);
}
resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxPyApp, 1);
return resultobj;
fail:
return NULL;
@@ -21520,9 +21517,7 @@ static PyObject *_wrap_new_Window(PyObject *self, PyObject *args, PyObject *kwar
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
{
resultobj = wxPyMake_wxObject(result, 1);
}
resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxWindow, 1);
{
if (temp6)
delete arg6;
@@ -21553,9 +21548,7 @@ static PyObject *_wrap_new_PreWindow(PyObject *self, PyObject *args, PyObject *k
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
{
resultobj = wxPyMake_wxObject(result, 1);
}
resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxWindow, 1);
return resultobj;
fail:
return NULL;
@@ -28499,9 +28492,7 @@ static PyObject *_wrap_new_Validator(PyObject *self, PyObject *args, PyObject *k
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
{
resultobj = wxPyMake_wxObject(result, 1);
}
resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxValidator, 1);
return resultobj;
fail:
return NULL;
@@ -28852,9 +28843,7 @@ static PyObject *_wrap_new_Menu(PyObject *self, PyObject *args, PyObject *kwargs
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
{
resultobj = wxPyMake_wxObject(result, 1);
}
resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxMenu, 1);
{
if (temp1)
delete arg1;
@@ -31039,9 +31028,7 @@ static PyObject *_wrap_new_MenuBar(PyObject *self, PyObject *args, PyObject *kwa
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
{
resultobj = wxPyMake_wxObject(result, 1);
}
resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxMenuBar, 1);
return resultobj;
fail:
return NULL;
@@ -33016,9 +33003,7 @@ static PyObject *_wrap_new_Control(PyObject *self, PyObject *args, PyObject *kwa
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
{
resultobj = wxPyMake_wxObject(result, 1);
}
resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxControl, 1);
{
if (temp7)
delete arg7;
@@ -33049,9 +33034,7 @@ static PyObject *_wrap_new_PreControl(PyObject *self, PyObject *args, PyObject *
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
{
resultobj = wxPyMake_wxObject(result, 1);
}
resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxControl, 1);
return resultobj;
fail:
return NULL;
@@ -42820,6 +42803,7 @@ SWIGEXPORT(void) SWIG_init(void) {
PyDict_SetItemString(d,"MOUSE_BTN_RIGHT", SWIG_FromInt((int)wxMOUSE_BTN_RIGHT));
PyDict_SetItemString(d,"UPDATE_UI_PROCESS_ALL", SWIG_FromInt((int)wxUPDATE_UI_PROCESS_ALL));
PyDict_SetItemString(d,"UPDATE_UI_PROCESS_SPECIFIED", SWIG_FromInt((int)wxUPDATE_UI_PROCESS_SPECIFIED));
PyDict_SetItemString(d,"NavigationKeyEvent_IsBackward", SWIG_FromInt((int)wxNavigationKeyEvent::IsBackward));
PyDict_SetItemString(d,"NavigationKeyEvent_IsForward", SWIG_FromInt((int)wxNavigationKeyEvent::IsForward));
PyDict_SetItemString(d,"NavigationKeyEvent_WinChange", SWIG_FromInt((int)wxNavigationKeyEvent::WinChange));
PyDict_SetItemString(d,"IDLE_PROCESS_ALL", SWIG_FromInt((int)wxIDLE_PROCESS_ALL));
wxPython/src/gtk/_windows_wrap.cpp
+14 -42
View File
@@ -1399,9 +1399,7 @@ static PyObject *_wrap_new_Panel(PyObject *self, PyObject *args, PyObject *kwarg
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
{
resultobj = wxPyMake_wxObject(result, 1);
}
resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxPanel, 1);
{
if (temp6)
delete arg6;
@@ -1432,9 +1430,7 @@ static PyObject *_wrap_new_PrePanel(PyObject *self, PyObject *args, PyObject *kw
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
{
resultobj = wxPyMake_wxObject(result, 1);
}
resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxPanel, 1);
return resultobj;
fail:
return NULL;
@@ -1652,9 +1648,7 @@ static PyObject *_wrap_new_ScrolledWindow(PyObject *self, PyObject *args, PyObje
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
{
resultobj = wxPyMake_wxObject(result, 1);
}
resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxScrolledWindow, 1);
{
if (temp6)
delete arg6;
@@ -1685,9 +1679,7 @@ static PyObject *_wrap_new_PreScrolledWindow(PyObject *self, PyObject *args, PyO
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
{
resultobj = wxPyMake_wxObject(result, 1);
}
resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxScrolledWindow, 1);
return resultobj;
fail:
return NULL;
@@ -3164,9 +3156,7 @@ static PyObject *_wrap_new_Frame(PyObject *self, PyObject *args, PyObject *kwarg
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
{
resultobj = wxPyMake_wxObject(result, 1);
}
resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxFrame, 1);
{
if (temp3)
delete arg3;
@@ -3205,9 +3195,7 @@ static PyObject *_wrap_new_PreFrame(PyObject *self, PyObject *args, PyObject *kw
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
{
resultobj = wxPyMake_wxObject(result, 1);
}
resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxFrame, 1);
return resultobj;
fail:
return NULL;
@@ -4107,9 +4095,7 @@ static PyObject *_wrap_new_Dialog(PyObject *self, PyObject *args, PyObject *kwar
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
{
resultobj = wxPyMake_wxObject(result, 1);
}
resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxDialog, 1);
{
if (temp3)
delete arg3;
@@ -4148,9 +4134,7 @@ static PyObject *_wrap_new_PreDialog(PyObject *self, PyObject *args, PyObject *k
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
{
resultobj = wxPyMake_wxObject(result, 1);
}
resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxDialog, 1);
return resultobj;
fail:
return NULL;
@@ -5085,9 +5069,7 @@ static PyObject *_wrap_new_StatusBar(PyObject *self, PyObject *args, PyObject *k
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
{
resultobj = wxPyMake_wxObject(result, 1);
}
resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxStatusBar, 1);
{
if (temp4)
delete arg4;
@@ -5118,9 +5100,7 @@ static PyObject *_wrap_new_PreStatusBar(PyObject *self, PyObject *args, PyObject
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
{
resultobj = wxPyMake_wxObject(result, 1);
}
resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxStatusBar, 1);
return resultobj;
fail:
return NULL;
@@ -15088,9 +15068,7 @@ static PyObject *_wrap_new_MDIChildFrame(PyObject *self, PyObject *args, PyObjec
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
{
resultobj = wxPyMake_wxObject(result, 1);
}
resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxMDIChildFrame, 1);
{
if (temp3)
delete arg3;
@@ -15129,9 +15107,7 @@ static PyObject *_wrap_new_PreMDIChildFrame(PyObject *self, PyObject *args, PyOb
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
{
resultobj = wxPyMake_wxObject(result, 1);
}
resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxMDIChildFrame, 1);
return resultobj;
fail:
return NULL;
@@ -15352,9 +15328,7 @@ static PyObject *_wrap_new_MDIClientWindow(PyObject *self, PyObject *args, PyObj
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
{
resultobj = wxPyMake_wxObject(result, 1);
}
resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxMDIClientWindow, 1);
return resultobj;
fail:
return NULL;
@@ -15377,9 +15351,7 @@ static PyObject *_wrap_new_PreMDIClientWindow(PyObject *self, PyObject *args, Py
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
{
resultobj = wxPyMake_wxObject(result, 1);
}
resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxMDIClientWindow, 1);
return resultobj;
fail:
return NULL;
wxPython/src/gtk/grid_wrap.cpp
+36 -22
View File
@@ -336,7 +336,8 @@ PyObject* wxPyMake_##TYPE(TYPE* source, bool setThisOwn) { \
wxPyOORClientData* data = (wxPyOORClientData*)source->GetClientObject(); \
if (data) { \
target = data->m_obj; \
Py_INCREF(target); \
if (target) \
Py_INCREF(target); \
} \
/* Otherwise make a new wrapper for it the old fashioned way and \
give it the OOR treatment */ \
@@ -781,8 +782,21 @@ SWIG_FromCharPtr(const char* cptr)
}
}
#define wxGRID_DEFAULT_NUMBER_ROWS WXGRID_DEFAULT_NUMBER_ROWS
#define wxGRID_DEFAULT_NUMBER_COLS WXGRID_DEFAULT_NUMBER_COLS
#define wxGRID_DEFAULT_ROW_HEIGHT WXGRID_DEFAULT_ROW_HEIGHT
#define wxGRID_DEFAULT_COL_WIDTH WXGRID_DEFAULT_COL_WIDTH
#define wxGRID_DEFAULT_COL_LABEL_HEIGHT WXGRID_DEFAULT_COL_LABEL_HEIGHT
#define wxGRID_DEFAULT_ROW_LABEL_WIDTH WXGRID_DEFAULT_ROW_LABEL_WIDTH
#define wxGRID_LABEL_EDGE_ZONE WXGRID_LABEL_EDGE_ZONE
#define wxGRID_MIN_ROW_HEIGHT WXGRID_MIN_ROW_HEIGHT
#define wxGRID_MIN_COL_WIDTH WXGRID_MIN_COL_WIDTH
#define wxGRID_DEFAULT_SCROLLBAR_WIDTH WXGRID_DEFAULT_SCROLLBAR_WIDTH
void wxGridCellRenderer__setOORInfo(wxGridCellRenderer *self,PyObject *_self){
self->SetClientObject(new wxPyOORClientData(_self));
if (!self->GetClientObject())
self->SetClientObject(new wxPyOORClientData(_self));
}
#include <limits.h>
@@ -969,7 +983,8 @@ IMP_PYCALLBACK__STRING( wxPyGridCellRenderer, wxGridCellRenderer, SetParameters)
void wxGridCellEditor__setOORInfo(wxGridCellEditor *self,PyObject *_self){
self->SetClientObject(new wxPyOORClientData(_self));
if (!self->GetClientObject())
self->SetClientObject(new wxPyOORClientData(_self));
}
class wxPyGridCellEditor : public wxGridCellEditor
@@ -1097,7 +1112,8 @@ IMP_PYCALLBACK_STRING__constpure(wxPyGridCellEditor, wxGridCellEditor, GetValue)
void wxGridCellAttr__setOORInfo(wxGridCellAttr *self,PyObject *_self){
self->SetClientObject(new wxPyOORClientData(_self));
if (!self->GetClientObject())
self->SetClientObject(new wxPyOORClientData(_self));
}
static PyObject* t_output_helper(PyObject* target, PyObject* o) {
@@ -1127,7 +1143,8 @@ static PyObject* t_output_helper(PyObject* target, PyObject* o) {
}
void wxGridCellAttrProvider__setOORInfo(wxGridCellAttrProvider *self,PyObject *_self){
self->SetClientObject(new wxPyOORClientData(_self));
if (!self->GetClientObject())
self->SetClientObject(new wxPyOORClientData(_self));
}
SWIGSTATICINLINE(unsigned long)
@@ -1172,7 +1189,8 @@ public:
};
void wxGridTableBase__setOORInfo(wxGridTableBase *self,PyObject *_self){
self->SetClientObject(new wxPyOORClientData(_self));
if (!self->GetClientObject())
self->SetClientObject(new wxPyOORClientData(_self));
}
SWIGSTATICINLINE(int)
@@ -8108,9 +8126,7 @@ static PyObject *_wrap_new_Grid(PyObject *self, PyObject *args, PyObject *kwargs
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
{
resultobj = wxPyMake_wxObject(result, 1);
}
resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxGrid, 1);
{
if (temp6)
delete arg6;
@@ -8141,9 +8157,7 @@ static PyObject *_wrap_new_PreGrid(PyObject *self, PyObject *args, PyObject *kwa
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
{
resultobj = wxPyMake_wxObject(result, 1);
}
resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxGrid, 1);
return resultobj;
fail:
return NULL;
@@ -17269,16 +17283,16 @@ SWIGEXPORT(void) SWIG_init(void) {
PyDict_SetItemString(d,"GRID_VALUE_DATETIME", SWIG_FromCharPtr("datetime"));
SWIG_addvarlink(SWIG_globals,(char*)"GridNoCellCoords",_wrap_GridNoCellCoords_get, _wrap_GridNoCellCoords_set);
SWIG_addvarlink(SWIG_globals,(char*)"GridNoCellRect",_wrap_GridNoCellRect_get, _wrap_GridNoCellRect_set);
PyDict_SetItemString(d,"GRID_DEFAULT_NUMBER_ROWS", SWIG_FromInt((int)WXGRID_DEFAULT_NUMBER_ROWS));
PyDict_SetItemString(d,"GRID_DEFAULT_NUMBER_COLS", SWIG_FromInt((int)WXGRID_DEFAULT_NUMBER_COLS));
PyDict_SetItemString(d,"GRID_DEFAULT_ROW_HEIGHT", SWIG_FromInt((int)WXGRID_DEFAULT_ROW_HEIGHT));
PyDict_SetItemString(d,"GRID_DEFAULT_COL_WIDTH", SWIG_FromInt((int)WXGRID_DEFAULT_COL_WIDTH));
PyDict_SetItemString(d,"GRID_DEFAULT_COL_LABEL_HEIGHT", SWIG_FromInt((int)WXGRID_DEFAULT_COL_LABEL_HEIGHT));
PyDict_SetItemString(d,"GRID_DEFAULT_ROW_LABEL_WIDTH", SWIG_FromInt((int)WXGRID_DEFAULT_ROW_LABEL_WIDTH));
PyDict_SetItemString(d,"GRID_LABEL_EDGE_ZONE", SWIG_FromInt((int)WXGRID_LABEL_EDGE_ZONE));
PyDict_SetItemString(d,"GRID_MIN_ROW_HEIGHT", SWIG_FromInt((int)WXGRID_MIN_ROW_HEIGHT));
PyDict_SetItemString(d,"GRID_MIN_COL_WIDTH", SWIG_FromInt((int)WXGRID_MIN_COL_WIDTH));
PyDict_SetItemString(d,"GRID_DEFAULT_SCROLLBAR_WIDTH", SWIG_FromInt((int)WXGRID_DEFAULT_SCROLLBAR_WIDTH));
PyDict_SetItemString(d,"GRID_DEFAULT_NUMBER_ROWS", SWIG_FromInt((int)wxGRID_DEFAULT_NUMBER_ROWS));
PyDict_SetItemString(d,"GRID_DEFAULT_NUMBER_COLS", SWIG_FromInt((int)wxGRID_DEFAULT_NUMBER_COLS));
PyDict_SetItemString(d,"GRID_DEFAULT_ROW_HEIGHT", SWIG_FromInt((int)wxGRID_DEFAULT_ROW_HEIGHT));
PyDict_SetItemString(d,"GRID_DEFAULT_COL_WIDTH", SWIG_FromInt((int)wxGRID_DEFAULT_COL_WIDTH));
PyDict_SetItemString(d,"GRID_DEFAULT_COL_LABEL_HEIGHT", SWIG_FromInt((int)wxGRID_DEFAULT_COL_LABEL_HEIGHT));
PyDict_SetItemString(d,"GRID_DEFAULT_ROW_LABEL_WIDTH", SWIG_FromInt((int)wxGRID_DEFAULT_ROW_LABEL_WIDTH));
PyDict_SetItemString(d,"GRID_LABEL_EDGE_ZONE", SWIG_FromInt((int)wxGRID_LABEL_EDGE_ZONE));
PyDict_SetItemString(d,"GRID_MIN_ROW_HEIGHT", SWIG_FromInt((int)wxGRID_MIN_ROW_HEIGHT));
PyDict_SetItemString(d,"GRID_MIN_COL_WIDTH", SWIG_FromInt((int)wxGRID_MIN_COL_WIDTH));
PyDict_SetItemString(d,"GRID_DEFAULT_SCROLLBAR_WIDTH", SWIG_FromInt((int)wxGRID_DEFAULT_SCROLLBAR_WIDTH));
PyDict_SetItemString(d,"GridCellAttr_Any", SWIG_FromInt((int)wxGridCellAttr::Any));
PyDict_SetItemString(d,"GridCellAttr_Default", SWIG_FromInt((int)wxGridCellAttr::Default));
PyDict_SetItemString(d,"GridCellAttr_Cell", SWIG_FromInt((int)wxGridCellAttr::Cell));
wxPython/src/gtk/html.py
+8
View File
@@ -1077,6 +1077,14 @@ class HtmlWindow(_windows.ScrolledWindow):
"""SelectAll(self)"""
return _html.HtmlWindow_SelectAll(*args, **kwargs)
def SelectionToText(*args, **kwargs):
"""SelectionToText(self) -> String"""
return _html.HtmlWindow_SelectionToText(*args, **kwargs)
def ToText(*args, **kwargs):
"""ToText(self) -> String"""
return _html.HtmlWindow_ToText(*args, **kwargs)
def base_OnLinkClicked(*args, **kwargs):
"""base_OnLinkClicked(self, HtmlLinkInfo link)"""
return _html.HtmlWindow_base_OnLinkClicked(*args, **kwargs)
wxPython/src/gtk/html_wrap.cpp
+68 -6
View File
@@ -5893,9 +5893,7 @@ static PyObject *_wrap_new_HtmlWindow(PyObject *self, PyObject *args, PyObject *
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
{
resultobj = wxPyMake_wxObject(result, 1);
}
resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxPyHtmlWindow, 1);
{
if (temp6)
delete arg6;
@@ -5926,9 +5924,7 @@ static PyObject *_wrap_new_PreHtmlWindow(PyObject *self, PyObject *args, PyObjec
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
{
resultobj = wxPyMake_wxObject(result, 1);
}
resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxPyHtmlWindow, 1);
return resultobj;
fail:
return NULL;
@@ -7008,6 +7004,70 @@ static PyObject *_wrap_HtmlWindow_SelectAll(PyObject *self, PyObject *args, PyOb
}
static PyObject *_wrap_HtmlWindow_SelectionToText(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject *resultobj;
wxPyHtmlWindow *arg1 = (wxPyHtmlWindow *) 0 ;
wxString result;
PyObject * obj0 = 0 ;
char *kwnames[] = {
(char *) "self", NULL
};
if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:HtmlWindow_SelectionToText",kwnames,&obj0)) goto fail;
if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyHtmlWindow,
SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
result = (arg1)->SelectionToText();
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;
}
static PyObject *_wrap_HtmlWindow_ToText(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject *resultobj;
wxPyHtmlWindow *arg1 = (wxPyHtmlWindow *) 0 ;
wxString result;
PyObject * obj0 = 0 ;
char *kwnames[] = {
(char *) "self", NULL
};
if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:HtmlWindow_ToText",kwnames,&obj0)) goto fail;
if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyHtmlWindow,
SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
result = (arg1)->ToText();
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;
}
static PyObject *_wrap_HtmlWindow_base_OnLinkClicked(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject *resultobj;
wxPyHtmlWindow *arg1 = (wxPyHtmlWindow *) 0 ;
@@ -10751,6 +10811,8 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"HtmlWindow_SelectWord", (PyCFunction) _wrap_HtmlWindow_SelectWord, METH_VARARGS | METH_KEYWORDS },
{ (char *)"HtmlWindow_SelectLine", (PyCFunction) _wrap_HtmlWindow_SelectLine, METH_VARARGS | METH_KEYWORDS },
{ (char *)"HtmlWindow_SelectAll", (PyCFunction) _wrap_HtmlWindow_SelectAll, METH_VARARGS | METH_KEYWORDS },
{ (char *)"HtmlWindow_SelectionToText", (PyCFunction) _wrap_HtmlWindow_SelectionToText, METH_VARARGS | METH_KEYWORDS },
{ (char *)"HtmlWindow_ToText", (PyCFunction) _wrap_HtmlWindow_ToText, METH_VARARGS | METH_KEYWORDS },
{ (char *)"HtmlWindow_base_OnLinkClicked", (PyCFunction) _wrap_HtmlWindow_base_OnLinkClicked, METH_VARARGS | METH_KEYWORDS },
{ (char *)"HtmlWindow_base_OnSetTitle", (PyCFunction) _wrap_HtmlWindow_base_OnSetTitle, METH_VARARGS | METH_KEYWORDS },
{ (char *)"HtmlWindow_base_OnCellMouseHover", (PyCFunction) _wrap_HtmlWindow_base_OnCellMouseHover, METH_VARARGS | METH_KEYWORDS },
wxPython/src/mac/_controls_wrap.cpp
+14 -42
View File
@@ -1123,9 +1123,7 @@ static PyObject *_wrap_new_Button(PyObject *self, PyObject *args, PyObject *kwar
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
{
resultobj = wxPyMake_wxObject(result, 1);
}
resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxButton, 1);
{
if (temp3)
delete arg3;
@@ -1164,9 +1162,7 @@ static PyObject *_wrap_new_PreButton(PyObject *self, PyObject *args, PyObject *k
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
{
resultobj = wxPyMake_wxObject(result, 1);
}
resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxButton, 1);
return resultobj;
fail:
return NULL;
@@ -1465,9 +1461,7 @@ static PyObject *_wrap_new_BitmapButton(PyObject *self, PyObject *args, PyObject
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
{
resultobj = wxPyMake_wxObject(result, 1);
}
resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxBitmapButton, 1);
{
if (temp8)
delete arg8;
@@ -1498,9 +1492,7 @@ static PyObject *_wrap_new_PreBitmapButton(PyObject *self, PyObject *args, PyObj
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
{
resultobj = wxPyMake_wxObject(result, 1);
}
resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxBitmapButton, 1);
return resultobj;
fail:
return NULL;
@@ -4466,9 +4458,7 @@ static PyObject *_wrap_new_StaticBox(PyObject *self, PyObject *args, PyObject *k
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
{
resultobj = wxPyMake_wxObject(result, 1);
}
resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxStaticBox, 1);
{
if (temp3)
delete arg3;
@@ -4507,9 +4497,7 @@ static PyObject *_wrap_new_PreStaticBox(PyObject *self, PyObject *args, PyObject
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
{
resultobj = wxPyMake_wxObject(result, 1);
}
resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxStaticBox, 1);
return resultobj;
fail:
return NULL;
@@ -8023,9 +8011,7 @@ static PyObject *_wrap_new_TextCtrl(PyObject *self, PyObject *args, PyObject *kw
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
{
resultobj = wxPyMake_wxObject(result, 1);
}
resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxTextCtrl, 1);
{
if (temp3)
delete arg3;
@@ -8064,9 +8050,7 @@ static PyObject *_wrap_new_PreTextCtrl(PyObject *self, PyObject *args, PyObject
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
{
resultobj = wxPyMake_wxObject(result, 1);
}
resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxTextCtrl, 1);
return resultobj;
fail:
return NULL;
@@ -14995,9 +14979,7 @@ static PyObject *_wrap_new_Notebook(PyObject *self, PyObject *args, PyObject *kw
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
{
resultobj = wxPyMake_wxObject(result, 1);
}
resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxNotebook, 1);
{
if (temp6)
delete arg6;
@@ -15028,9 +15010,7 @@ static PyObject *_wrap_new_PreNotebook(PyObject *self, PyObject *args, PyObject
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
{
resultobj = wxPyMake_wxObject(result, 1);
}
resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxNotebook, 1);
return resultobj;
fail:
return NULL;
@@ -18410,9 +18390,7 @@ static PyObject *_wrap_new_ToolBar(PyObject *self, PyObject *args, PyObject *kwa
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
{
resultobj = wxPyMake_wxObject(result, 1);
}
resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxToolBar, 1);
{
if (temp6)
delete arg6;
@@ -18443,9 +18421,7 @@ static PyObject *_wrap_new_PreToolBar(PyObject *self, PyObject *args, PyObject *
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
{
resultobj = wxPyMake_wxObject(result, 1);
}
resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxToolBar, 1);
return resultobj;
fail:
return NULL;
@@ -24978,9 +24954,7 @@ static PyObject *_wrap_new_TreeCtrl(PyObject *self, PyObject *args, PyObject *kw
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
{
resultobj = wxPyMake_wxObject(result, 1);
}
resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxPyTreeCtrl, 1);
{
if (temp7)
delete arg7;
@@ -25011,9 +24985,7 @@ static PyObject *_wrap_new_PreTreeCtrl(PyObject *self, PyObject *args, PyObject
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
{
resultobj = wxPyMake_wxObject(result, 1);
}
resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxPyTreeCtrl, 1);
return resultobj;
fail:
return NULL;
wxPython/src/mac/_core_wrap.cpp
+11 -28
View File
@@ -1605,7 +1605,8 @@ static wxPySizerItemInfo wxPySizerItemTypeHelper(PyObject* item, bool checkSize,
}
void wxSizer__setOORInfo(wxSizer *self,PyObject *_self){
self->SetClientObject(new wxPyOORClientData(_self));
if (!self->GetClientObject())
self->SetClientObject(new wxPyOORClientData(_self));
}
void wxSizer_Add(wxSizer *self,PyObject *item,int proportion,int flag,int border,PyObject *userData){
@@ -11783,9 +11784,7 @@ static PyObject *_wrap_new_EvtHandler(PyObject *self, PyObject *args, PyObject *
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
{
resultobj = wxPyMake_wxObject(result, 1);
}
resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxEvtHandler, 1);
return resultobj;
fail:
return NULL;
@@ -19492,9 +19491,7 @@ static PyObject *_wrap_new_PyApp(PyObject *self, PyObject *args, PyObject *kwarg
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
{
resultobj = wxPyMake_wxObject(result, 1);
}
resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxPyApp, 1);
return resultobj;
fail:
return NULL;
@@ -21520,9 +21517,7 @@ static PyObject *_wrap_new_Window(PyObject *self, PyObject *args, PyObject *kwar
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
{
resultobj = wxPyMake_wxObject(result, 1);
}
resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxWindow, 1);
{
if (temp6)
delete arg6;
@@ -21553,9 +21548,7 @@ static PyObject *_wrap_new_PreWindow(PyObject *self, PyObject *args, PyObject *k
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
{
resultobj = wxPyMake_wxObject(result, 1);
}
resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxWindow, 1);
return resultobj;
fail:
return NULL;
@@ -28499,9 +28492,7 @@ static PyObject *_wrap_new_Validator(PyObject *self, PyObject *args, PyObject *k
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
{
resultobj = wxPyMake_wxObject(result, 1);
}
resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxValidator, 1);
return resultobj;
fail:
return NULL;
@@ -28852,9 +28843,7 @@ static PyObject *_wrap_new_Menu(PyObject *self, PyObject *args, PyObject *kwargs
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
{
resultobj = wxPyMake_wxObject(result, 1);
}
resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxMenu, 1);
{
if (temp1)
delete arg1;
@@ -31039,9 +31028,7 @@ static PyObject *_wrap_new_MenuBar(PyObject *self, PyObject *args, PyObject *kwa
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
{
resultobj = wxPyMake_wxObject(result, 1);
}
resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxMenuBar, 1);
return resultobj;
fail:
return NULL;
@@ -33016,9 +33003,7 @@ static PyObject *_wrap_new_Control(PyObject *self, PyObject *args, PyObject *kwa
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
{
resultobj = wxPyMake_wxObject(result, 1);
}
resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxControl, 1);
{
if (temp7)
delete arg7;
@@ -33049,9 +33034,7 @@ static PyObject *_wrap_new_PreControl(PyObject *self, PyObject *args, PyObject *
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
{
resultobj = wxPyMake_wxObject(result, 1);
}
resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxControl, 1);
return resultobj;
fail:
return NULL;
wxPython/src/mac/_windows_wrap.cpp
+14 -42
View File
@@ -1394,9 +1394,7 @@ static PyObject *_wrap_new_Panel(PyObject *self, PyObject *args, PyObject *kwarg
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
{
resultobj = wxPyMake_wxObject(result, 1);
}
resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxPanel, 1);
{
if (temp6)
delete arg6;
@@ -1427,9 +1425,7 @@ static PyObject *_wrap_new_PrePanel(PyObject *self, PyObject *args, PyObject *kw
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
{
resultobj = wxPyMake_wxObject(result, 1);
}
resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxPanel, 1);
return resultobj;
fail:
return NULL;
@@ -1647,9 +1643,7 @@ static PyObject *_wrap_new_ScrolledWindow(PyObject *self, PyObject *args, PyObje
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
{
resultobj = wxPyMake_wxObject(result, 1);
}
resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxScrolledWindow, 1);
{
if (temp6)
delete arg6;
@@ -1680,9 +1674,7 @@ static PyObject *_wrap_new_PreScrolledWindow(PyObject *self, PyObject *args, PyO
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
{
resultobj = wxPyMake_wxObject(result, 1);
}
resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxScrolledWindow, 1);
return resultobj;
fail:
return NULL;
@@ -3278,9 +3270,7 @@ static PyObject *_wrap_new_Frame(PyObject *self, PyObject *args, PyObject *kwarg
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
{
resultobj = wxPyMake_wxObject(result, 1);
}
resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxFrame, 1);
{
if (temp3)
delete arg3;
@@ -3319,9 +3309,7 @@ static PyObject *_wrap_new_PreFrame(PyObject *self, PyObject *args, PyObject *kw
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
{
resultobj = wxPyMake_wxObject(result, 1);
}
resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxFrame, 1);
return resultobj;
fail:
return NULL;
@@ -4221,9 +4209,7 @@ static PyObject *_wrap_new_Dialog(PyObject *self, PyObject *args, PyObject *kwar
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
{
resultobj = wxPyMake_wxObject(result, 1);
}
resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxDialog, 1);
{
if (temp3)
delete arg3;
@@ -4262,9 +4248,7 @@ static PyObject *_wrap_new_PreDialog(PyObject *self, PyObject *args, PyObject *k
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
{
resultobj = wxPyMake_wxObject(result, 1);
}
resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxDialog, 1);
return resultobj;
fail:
return NULL;
@@ -5199,9 +5183,7 @@ static PyObject *_wrap_new_StatusBar(PyObject *self, PyObject *args, PyObject *k
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
{
resultobj = wxPyMake_wxObject(result, 1);
}
resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxStatusBar, 1);
{
if (temp4)
delete arg4;
@@ -5232,9 +5214,7 @@ static PyObject *_wrap_new_PreStatusBar(PyObject *self, PyObject *args, PyObject
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
{
resultobj = wxPyMake_wxObject(result, 1);
}
resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxStatusBar, 1);
return resultobj;
fail:
return NULL;
@@ -14862,9 +14842,7 @@ static PyObject *_wrap_new_MDIChildFrame(PyObject *self, PyObject *args, PyObjec
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
{
resultobj = wxPyMake_wxObject(result, 1);
}
resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxMDIChildFrame, 1);
{
if (temp3)
delete arg3;
@@ -14903,9 +14881,7 @@ static PyObject *_wrap_new_PreMDIChildFrame(PyObject *self, PyObject *args, PyOb
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
{
resultobj = wxPyMake_wxObject(result, 1);
}
resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxMDIChildFrame, 1);
return resultobj;
fail:
return NULL;
@@ -15126,9 +15102,7 @@ static PyObject *_wrap_new_MDIClientWindow(PyObject *self, PyObject *args, PyObj
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
{
resultobj = wxPyMake_wxObject(result, 1);
}
resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxMDIClientWindow, 1);
return resultobj;
fail:
return NULL;
@@ -15151,9 +15125,7 @@ static PyObject *_wrap_new_PreMDIClientWindow(PyObject *self, PyObject *args, Py
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
{
resultobj = wxPyMake_wxObject(result, 1);
}
resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxMDIClientWindow, 1);
return resultobj;
fail:
return NULL;
wxPython/src/mac/grid_wrap.cpp
+36 -22
View File
@@ -336,7 +336,8 @@ PyObject* wxPyMake_##TYPE(TYPE* source, bool setThisOwn) { \
wxPyOORClientData* data = (wxPyOORClientData*)source->GetClientObject(); \
if (data) { \
target = data->m_obj; \
Py_INCREF(target); \
if (target) \
Py_INCREF(target); \
} \
/* Otherwise make a new wrapper for it the old fashioned way and \
give it the OOR treatment */ \
@@ -781,8 +782,21 @@ SWIG_FromCharPtr(const char* cptr)
}
}
#define wxGRID_DEFAULT_NUMBER_ROWS WXGRID_DEFAULT_NUMBER_ROWS
#define wxGRID_DEFAULT_NUMBER_COLS WXGRID_DEFAULT_NUMBER_COLS
#define wxGRID_DEFAULT_ROW_HEIGHT WXGRID_DEFAULT_ROW_HEIGHT
#define wxGRID_DEFAULT_COL_WIDTH WXGRID_DEFAULT_COL_WIDTH
#define wxGRID_DEFAULT_COL_LABEL_HEIGHT WXGRID_DEFAULT_COL_LABEL_HEIGHT
#define wxGRID_DEFAULT_ROW_LABEL_WIDTH WXGRID_DEFAULT_ROW_LABEL_WIDTH
#define wxGRID_LABEL_EDGE_ZONE WXGRID_LABEL_EDGE_ZONE
#define wxGRID_MIN_ROW_HEIGHT WXGRID_MIN_ROW_HEIGHT
#define wxGRID_MIN_COL_WIDTH WXGRID_MIN_COL_WIDTH
#define wxGRID_DEFAULT_SCROLLBAR_WIDTH WXGRID_DEFAULT_SCROLLBAR_WIDTH
void wxGridCellRenderer__setOORInfo(wxGridCellRenderer *self,PyObject *_self){
self->SetClientObject(new wxPyOORClientData(_self));
if (!self->GetClientObject())
self->SetClientObject(new wxPyOORClientData(_self));
}
#include <limits.h>
@@ -969,7 +983,8 @@ IMP_PYCALLBACK__STRING( wxPyGridCellRenderer, wxGridCellRenderer, SetParameters)
void wxGridCellEditor__setOORInfo(wxGridCellEditor *self,PyObject *_self){
self->SetClientObject(new wxPyOORClientData(_self));
if (!self->GetClientObject())
self->SetClientObject(new wxPyOORClientData(_self));
}
class wxPyGridCellEditor : public wxGridCellEditor
@@ -1097,7 +1112,8 @@ IMP_PYCALLBACK_STRING__constpure(wxPyGridCellEditor, wxGridCellEditor, GetValue)
void wxGridCellAttr__setOORInfo(wxGridCellAttr *self,PyObject *_self){
self->SetClientObject(new wxPyOORClientData(_self));
if (!self->GetClientObject())
self->SetClientObject(new wxPyOORClientData(_self));
}
static PyObject* t_output_helper(PyObject* target, PyObject* o) {
@@ -1127,7 +1143,8 @@ static PyObject* t_output_helper(PyObject* target, PyObject* o) {
}
void wxGridCellAttrProvider__setOORInfo(wxGridCellAttrProvider *self,PyObject *_self){
self->SetClientObject(new wxPyOORClientData(_self));
if (!self->GetClientObject())
self->SetClientObject(new wxPyOORClientData(_self));
}
SWIGSTATICINLINE(unsigned long)
@@ -1172,7 +1189,8 @@ public:
};
void wxGridTableBase__setOORInfo(wxGridTableBase *self,PyObject *_self){
self->SetClientObject(new wxPyOORClientData(_self));
if (!self->GetClientObject())
self->SetClientObject(new wxPyOORClientData(_self));
}
SWIGSTATICINLINE(int)
@@ -8108,9 +8126,7 @@ static PyObject *_wrap_new_Grid(PyObject *self, PyObject *args, PyObject *kwargs
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
{
resultobj = wxPyMake_wxObject(result, 1);
}
resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxGrid, 1);
{
if (temp6)
delete arg6;
@@ -8141,9 +8157,7 @@ static PyObject *_wrap_new_PreGrid(PyObject *self, PyObject *args, PyObject *kwa
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
{
resultobj = wxPyMake_wxObject(result, 1);
}
resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxGrid, 1);
return resultobj;
fail:
return NULL;
@@ -17269,16 +17283,16 @@ SWIGEXPORT(void) SWIG_init(void) {
PyDict_SetItemString(d,"GRID_VALUE_DATETIME", SWIG_FromCharPtr("datetime"));
SWIG_addvarlink(SWIG_globals,(char*)"GridNoCellCoords",_wrap_GridNoCellCoords_get, _wrap_GridNoCellCoords_set);
SWIG_addvarlink(SWIG_globals,(char*)"GridNoCellRect",_wrap_GridNoCellRect_get, _wrap_GridNoCellRect_set);
PyDict_SetItemString(d,"GRID_DEFAULT_NUMBER_ROWS", SWIG_FromInt((int)WXGRID_DEFAULT_NUMBER_ROWS));
PyDict_SetItemString(d,"GRID_DEFAULT_NUMBER_COLS", SWIG_FromInt((int)WXGRID_DEFAULT_NUMBER_COLS));
PyDict_SetItemString(d,"GRID_DEFAULT_ROW_HEIGHT", SWIG_FromInt((int)WXGRID_DEFAULT_ROW_HEIGHT));
PyDict_SetItemString(d,"GRID_DEFAULT_COL_WIDTH", SWIG_FromInt((int)WXGRID_DEFAULT_COL_WIDTH));
PyDict_SetItemString(d,"GRID_DEFAULT_COL_LABEL_HEIGHT", SWIG_FromInt((int)WXGRID_DEFAULT_COL_LABEL_HEIGHT));
PyDict_SetItemString(d,"GRID_DEFAULT_ROW_LABEL_WIDTH", SWIG_FromInt((int)WXGRID_DEFAULT_ROW_LABEL_WIDTH));
PyDict_SetItemString(d,"GRID_LABEL_EDGE_ZONE", SWIG_FromInt((int)WXGRID_LABEL_EDGE_ZONE));
PyDict_SetItemString(d,"GRID_MIN_ROW_HEIGHT", SWIG_FromInt((int)WXGRID_MIN_ROW_HEIGHT));
PyDict_SetItemString(d,"GRID_MIN_COL_WIDTH", SWIG_FromInt((int)WXGRID_MIN_COL_WIDTH));
PyDict_SetItemString(d,"GRID_DEFAULT_SCROLLBAR_WIDTH", SWIG_FromInt((int)WXGRID_DEFAULT_SCROLLBAR_WIDTH));
PyDict_SetItemString(d,"GRID_DEFAULT_NUMBER_ROWS", SWIG_FromInt((int)wxGRID_DEFAULT_NUMBER_ROWS));
PyDict_SetItemString(d,"GRID_DEFAULT_NUMBER_COLS", SWIG_FromInt((int)wxGRID_DEFAULT_NUMBER_COLS));
PyDict_SetItemString(d,"GRID_DEFAULT_ROW_HEIGHT", SWIG_FromInt((int)wxGRID_DEFAULT_ROW_HEIGHT));
PyDict_SetItemString(d,"GRID_DEFAULT_COL_WIDTH", SWIG_FromInt((int)wxGRID_DEFAULT_COL_WIDTH));
PyDict_SetItemString(d,"GRID_DEFAULT_COL_LABEL_HEIGHT", SWIG_FromInt((int)wxGRID_DEFAULT_COL_LABEL_HEIGHT));
PyDict_SetItemString(d,"GRID_DEFAULT_ROW_LABEL_WIDTH", SWIG_FromInt((int)wxGRID_DEFAULT_ROW_LABEL_WIDTH));
PyDict_SetItemString(d,"GRID_LABEL_EDGE_ZONE", SWIG_FromInt((int)wxGRID_LABEL_EDGE_ZONE));
PyDict_SetItemString(d,"GRID_MIN_ROW_HEIGHT", SWIG_FromInt((int)wxGRID_MIN_ROW_HEIGHT));
PyDict_SetItemString(d,"GRID_MIN_COL_WIDTH", SWIG_FromInt((int)wxGRID_MIN_COL_WIDTH));
PyDict_SetItemString(d,"GRID_DEFAULT_SCROLLBAR_WIDTH", SWIG_FromInt((int)wxGRID_DEFAULT_SCROLLBAR_WIDTH));
PyDict_SetItemString(d,"GridCellAttr_Any", SWIG_FromInt((int)wxGridCellAttr::Any));
PyDict_SetItemString(d,"GridCellAttr_Default", SWIG_FromInt((int)wxGridCellAttr::Default));
PyDict_SetItemString(d,"GridCellAttr_Cell", SWIG_FromInt((int)wxGridCellAttr::Cell));
wxPython/src/mac/html.py
+8
View File
@@ -1077,6 +1077,14 @@ class HtmlWindow(_windows.ScrolledWindow):
"""SelectAll(self)"""
return _html.HtmlWindow_SelectAll(*args, **kwargs)
def SelectionToText(*args, **kwargs):
"""SelectionToText(self) -> String"""
return _html.HtmlWindow_SelectionToText(*args, **kwargs)
def ToText(*args, **kwargs):
"""ToText(self) -> String"""
return _html.HtmlWindow_ToText(*args, **kwargs)
def base_OnLinkClicked(*args, **kwargs):
"""base_OnLinkClicked(self, HtmlLinkInfo link)"""
return _html.HtmlWindow_base_OnLinkClicked(*args, **kwargs)
wxPython/src/mac/html_wrap.cpp
+68 -6
View File
@@ -5893,9 +5893,7 @@ static PyObject *_wrap_new_HtmlWindow(PyObject *self, PyObject *args, PyObject *
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
{
resultobj = wxPyMake_wxObject(result, 1);
}
resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxPyHtmlWindow, 1);
{
if (temp6)
delete arg6;
@@ -5926,9 +5924,7 @@ static PyObject *_wrap_new_PreHtmlWindow(PyObject *self, PyObject *args, PyObjec
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
{
resultobj = wxPyMake_wxObject(result, 1);
}
resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxPyHtmlWindow, 1);
return resultobj;
fail:
return NULL;
@@ -7008,6 +7004,70 @@ static PyObject *_wrap_HtmlWindow_SelectAll(PyObject *self, PyObject *args, PyOb
}
static PyObject *_wrap_HtmlWindow_SelectionToText(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject *resultobj;
wxPyHtmlWindow *arg1 = (wxPyHtmlWindow *) 0 ;
wxString result;
PyObject * obj0 = 0 ;
char *kwnames[] = {
(char *) "self", NULL
};
if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:HtmlWindow_SelectionToText",kwnames,&obj0)) goto fail;
if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyHtmlWindow,
SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
result = (arg1)->SelectionToText();
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;
}
static PyObject *_wrap_HtmlWindow_ToText(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject *resultobj;
wxPyHtmlWindow *arg1 = (wxPyHtmlWindow *) 0 ;
wxString result;
PyObject * obj0 = 0 ;
char *kwnames[] = {
(char *) "self", NULL
};
if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:HtmlWindow_ToText",kwnames,&obj0)) goto fail;
if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyHtmlWindow,
SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
result = (arg1)->ToText();
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;
}
static PyObject *_wrap_HtmlWindow_base_OnLinkClicked(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject *resultobj;
wxPyHtmlWindow *arg1 = (wxPyHtmlWindow *) 0 ;
@@ -10751,6 +10811,8 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"HtmlWindow_SelectWord", (PyCFunction) _wrap_HtmlWindow_SelectWord, METH_VARARGS | METH_KEYWORDS },
{ (char *)"HtmlWindow_SelectLine", (PyCFunction) _wrap_HtmlWindow_SelectLine, METH_VARARGS | METH_KEYWORDS },
{ (char *)"HtmlWindow_SelectAll", (PyCFunction) _wrap_HtmlWindow_SelectAll, METH_VARARGS | METH_KEYWORDS },
{ (char *)"HtmlWindow_SelectionToText", (PyCFunction) _wrap_HtmlWindow_SelectionToText, METH_VARARGS | METH_KEYWORDS },
{ (char *)"HtmlWindow_ToText", (PyCFunction) _wrap_HtmlWindow_ToText, METH_VARARGS | METH_KEYWORDS },
{ (char *)"HtmlWindow_base_OnLinkClicked", (PyCFunction) _wrap_HtmlWindow_base_OnLinkClicked, METH_VARARGS | METH_KEYWORDS },
{ (char *)"HtmlWindow_base_OnSetTitle", (PyCFunction) _wrap_HtmlWindow_base_OnSetTitle, METH_VARARGS | METH_KEYWORDS },
{ (char *)"HtmlWindow_base_OnCellMouseHover", (PyCFunction) _wrap_HtmlWindow_base_OnCellMouseHover, METH_VARARGS | METH_KEYWORDS },
wxPython/src/msw/_controls_wrap.cpp
+14 -42
View File
@@ -1123,9 +1123,7 @@ static PyObject *_wrap_new_Button(PyObject *self, PyObject *args, PyObject *kwar
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
{
resultobj = wxPyMake_wxObject(result, 1);
}
resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxButton, 1);
{
if (temp3)
delete arg3;
@@ -1164,9 +1162,7 @@ static PyObject *_wrap_new_PreButton(PyObject *self, PyObject *args, PyObject *k
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
{
resultobj = wxPyMake_wxObject(result, 1);
}
resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxButton, 1);
return resultobj;
fail:
return NULL;
@@ -1465,9 +1461,7 @@ static PyObject *_wrap_new_BitmapButton(PyObject *self, PyObject *args, PyObject
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
{
resultobj = wxPyMake_wxObject(result, 1);
}
resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxBitmapButton, 1);
{
if (temp8)
delete arg8;
@@ -1498,9 +1492,7 @@ static PyObject *_wrap_new_PreBitmapButton(PyObject *self, PyObject *args, PyObj
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
{
resultobj = wxPyMake_wxObject(result, 1);
}
resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxBitmapButton, 1);
return resultobj;
fail:
return NULL;
@@ -4466,9 +4458,7 @@ static PyObject *_wrap_new_StaticBox(PyObject *self, PyObject *args, PyObject *k
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
{
resultobj = wxPyMake_wxObject(result, 1);
}
resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxStaticBox, 1);
{
if (temp3)
delete arg3;
@@ -4507,9 +4497,7 @@ static PyObject *_wrap_new_PreStaticBox(PyObject *self, PyObject *args, PyObject
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
{
resultobj = wxPyMake_wxObject(result, 1);
}
resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxStaticBox, 1);
return resultobj;
fail:
return NULL;
@@ -8049,9 +8037,7 @@ static PyObject *_wrap_new_TextCtrl(PyObject *self, PyObject *args, PyObject *kw
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
{
resultobj = wxPyMake_wxObject(result, 1);
}
resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxTextCtrl, 1);
{
if (temp3)
delete arg3;
@@ -8090,9 +8076,7 @@ static PyObject *_wrap_new_PreTextCtrl(PyObject *self, PyObject *args, PyObject
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
{
resultobj = wxPyMake_wxObject(result, 1);
}
resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxTextCtrl, 1);
return resultobj;
fail:
return NULL;
@@ -15083,9 +15067,7 @@ static PyObject *_wrap_new_Notebook(PyObject *self, PyObject *args, PyObject *kw
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
{
resultobj = wxPyMake_wxObject(result, 1);
}
resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxNotebook, 1);
{
if (temp6)
delete arg6;
@@ -15116,9 +15098,7 @@ static PyObject *_wrap_new_PreNotebook(PyObject *self, PyObject *args, PyObject
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
{
resultobj = wxPyMake_wxObject(result, 1);
}
resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxNotebook, 1);
return resultobj;
fail:
return NULL;
@@ -18534,9 +18514,7 @@ static PyObject *_wrap_new_ToolBar(PyObject *self, PyObject *args, PyObject *kwa
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
{
resultobj = wxPyMake_wxObject(result, 1);
}
resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxToolBar, 1);
{
if (temp6)
delete arg6;
@@ -18567,9 +18545,7 @@ static PyObject *_wrap_new_PreToolBar(PyObject *self, PyObject *args, PyObject *
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
{
resultobj = wxPyMake_wxObject(result, 1);
}
resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxToolBar, 1);
return resultobj;
fail:
return NULL;
@@ -25130,9 +25106,7 @@ static PyObject *_wrap_new_TreeCtrl(PyObject *self, PyObject *args, PyObject *kw
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
{
resultobj = wxPyMake_wxObject(result, 1);
}
resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxPyTreeCtrl, 1);
{
if (temp7)
delete arg7;
@@ -25163,9 +25137,7 @@ static PyObject *_wrap_new_PreTreeCtrl(PyObject *self, PyObject *args, PyObject
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
{
resultobj = wxPyMake_wxObject(result, 1);
}
resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxPyTreeCtrl, 1);
return resultobj;
fail:
return NULL;
wxPython/src/msw/_core.py
+1
View File
@@ -4323,6 +4323,7 @@ class NavigationKeyEvent(Event):
"""SetCurrentFocus(self, Window win)"""
return _core_.NavigationKeyEvent_SetCurrentFocus(*args, **kwargs)
IsBackward = _core_.NavigationKeyEvent_IsBackward
IsForward = _core_.NavigationKeyEvent_IsForward
WinChange = _core_.NavigationKeyEvent_WinChange
wxPython/src/msw/_core_wrap.cpp
+12 -28
View File
@@ -1603,7 +1603,8 @@ static wxPySizerItemInfo wxPySizerItemTypeHelper(PyObject* item, bool checkSize,
}
void wxSizer__setOORInfo(wxSizer *self,PyObject *_self){
self->SetClientObject(new wxPyOORClientData(_self));
if (!self->GetClientObject())
self->SetClientObject(new wxPyOORClientData(_self));
}
void wxSizer_Add(wxSizer *self,PyObject *item,int proportion,int flag,int border,PyObject *userData){
@@ -11781,9 +11782,7 @@ static PyObject *_wrap_new_EvtHandler(PyObject *self, PyObject *args, PyObject *
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
{
resultobj = wxPyMake_wxObject(result, 1);
}
resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxEvtHandler, 1);
return resultobj;
fail:
return NULL;
@@ -19490,9 +19489,7 @@ static PyObject *_wrap_new_PyApp(PyObject *self, PyObject *args, PyObject *kwarg
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
{
resultobj = wxPyMake_wxObject(result, 1);
}
resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxPyApp, 1);
return resultobj;
fail:
return NULL;
@@ -21518,9 +21515,7 @@ static PyObject *_wrap_new_Window(PyObject *self, PyObject *args, PyObject *kwar
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
{
resultobj = wxPyMake_wxObject(result, 1);
}
resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxWindow, 1);
{
if (temp6)
delete arg6;
@@ -21551,9 +21546,7 @@ static PyObject *_wrap_new_PreWindow(PyObject *self, PyObject *args, PyObject *k
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
{
resultobj = wxPyMake_wxObject(result, 1);
}
resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxWindow, 1);
return resultobj;
fail:
return NULL;
@@ -28560,9 +28553,7 @@ static PyObject *_wrap_new_Validator(PyObject *self, PyObject *args, PyObject *k
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
{
resultobj = wxPyMake_wxObject(result, 1);
}
resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxValidator, 1);
return resultobj;
fail:
return NULL;
@@ -28913,9 +28904,7 @@ static PyObject *_wrap_new_Menu(PyObject *self, PyObject *args, PyObject *kwargs
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
{
resultobj = wxPyMake_wxObject(result, 1);
}
resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxMenu, 1);
{
if (temp1)
delete arg1;
@@ -31100,9 +31089,7 @@ static PyObject *_wrap_new_MenuBar(PyObject *self, PyObject *args, PyObject *kwa
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
{
resultobj = wxPyMake_wxObject(result, 1);
}
resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxMenuBar, 1);
return resultobj;
fail:
return NULL;
@@ -33516,9 +33503,7 @@ static PyObject *_wrap_new_Control(PyObject *self, PyObject *args, PyObject *kwa
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
{
resultobj = wxPyMake_wxObject(result, 1);
}
resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxControl, 1);
{
if (temp7)
delete arg7;
@@ -33549,9 +33534,7 @@ static PyObject *_wrap_new_PreControl(PyObject *self, PyObject *args, PyObject *
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
{
resultobj = wxPyMake_wxObject(result, 1);
}
resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxControl, 1);
return resultobj;
fail:
return NULL;
@@ -43336,6 +43319,7 @@ SWIGEXPORT(void) SWIG_init(void) {
PyDict_SetItemString(d,"MOUSE_BTN_RIGHT", SWIG_FromInt((int)wxMOUSE_BTN_RIGHT));
PyDict_SetItemString(d,"UPDATE_UI_PROCESS_ALL", SWIG_FromInt((int)wxUPDATE_UI_PROCESS_ALL));
PyDict_SetItemString(d,"UPDATE_UI_PROCESS_SPECIFIED", SWIG_FromInt((int)wxUPDATE_UI_PROCESS_SPECIFIED));
PyDict_SetItemString(d,"NavigationKeyEvent_IsBackward", SWIG_FromInt((int)wxNavigationKeyEvent::IsBackward));
PyDict_SetItemString(d,"NavigationKeyEvent_IsForward", SWIG_FromInt((int)wxNavigationKeyEvent::IsForward));
PyDict_SetItemString(d,"NavigationKeyEvent_WinChange", SWIG_FromInt((int)wxNavigationKeyEvent::WinChange));
PyDict_SetItemString(d,"IDLE_PROCESS_ALL", SWIG_FromInt((int)wxIDLE_PROCESS_ALL));
wxPython/src/msw/_gdi_wrap.cpp
+9 -3
View File
@@ -747,11 +747,17 @@ IMP_PYCALLBACK_BOOL_STRINGSTRING(wxPyFontEnumerator, wxFontEnumerator, OnFontEnc
PyObject *wxPyFontEnumerator_GetEncodings(wxPyFontEnumerator *self){
wxArrayString* arr = self->GetEncodings();
return wxArrayString2PyList_helper(*arr);
if (arr)
return wxArrayString2PyList_helper(*arr);
else
return PyList_New(0);
}
PyObject *wxPyFontEnumerator_GetFacenames(wxPyFontEnumerator *self){
wxArrayString* arr = self->GetFacenames();
return wxArrayString2PyList_helper(*arr);
if (arr)
return wxArrayString2PyList_helper(*arr);
else
return PyList_New(0);
}
@@ -9226,7 +9232,7 @@ static PyObject *_wrap_Font_GetNoAntiAliasing(PyObject *self, PyObject *args, Py
SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
result = (bool)(arg1)->GetNoAntiAliasing();
result = (bool)((wxFont const *)arg1)->GetNoAntiAliasing();
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
wxPython/src/msw/_windows_wrap.cpp
+14 -42
View File
@@ -1399,9 +1399,7 @@ static PyObject *_wrap_new_Panel(PyObject *self, PyObject *args, PyObject *kwarg
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
{
resultobj = wxPyMake_wxObject(result, 1);
}
resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxPanel, 1);
{
if (temp6)
delete arg6;
@@ -1432,9 +1430,7 @@ static PyObject *_wrap_new_PrePanel(PyObject *self, PyObject *args, PyObject *kw
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
{
resultobj = wxPyMake_wxObject(result, 1);
}
resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxPanel, 1);
return resultobj;
fail:
return NULL;
@@ -1652,9 +1648,7 @@ static PyObject *_wrap_new_ScrolledWindow(PyObject *self, PyObject *args, PyObje
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
{
resultobj = wxPyMake_wxObject(result, 1);
}
resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxScrolledWindow, 1);
{
if (temp6)
delete arg6;
@@ -1685,9 +1679,7 @@ static PyObject *_wrap_new_PreScrolledWindow(PyObject *self, PyObject *args, PyO
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
{
resultobj = wxPyMake_wxObject(result, 1);
}
resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxScrolledWindow, 1);
return resultobj;
fail:
return NULL;
@@ -3226,9 +3218,7 @@ static PyObject *_wrap_new_Frame(PyObject *self, PyObject *args, PyObject *kwarg
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
{
resultobj = wxPyMake_wxObject(result, 1);
}
resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxFrame, 1);
{
if (temp3)
delete arg3;
@@ -3267,9 +3257,7 @@ static PyObject *_wrap_new_PreFrame(PyObject *self, PyObject *args, PyObject *kw
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
{
resultobj = wxPyMake_wxObject(result, 1);
}
resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxFrame, 1);
return resultobj;
fail:
return NULL;
@@ -4169,9 +4157,7 @@ static PyObject *_wrap_new_Dialog(PyObject *self, PyObject *args, PyObject *kwar
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
{
resultobj = wxPyMake_wxObject(result, 1);
}
resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxDialog, 1);
{
if (temp3)
delete arg3;
@@ -4210,9 +4196,7 @@ static PyObject *_wrap_new_PreDialog(PyObject *self, PyObject *args, PyObject *k
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
{
resultobj = wxPyMake_wxObject(result, 1);
}
resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxDialog, 1);
return resultobj;
fail:
return NULL;
@@ -5147,9 +5131,7 @@ static PyObject *_wrap_new_StatusBar(PyObject *self, PyObject *args, PyObject *k
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
{
resultobj = wxPyMake_wxObject(result, 1);
}
resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxStatusBar, 1);
{
if (temp4)
delete arg4;
@@ -5180,9 +5162,7 @@ static PyObject *_wrap_new_PreStatusBar(PyObject *self, PyObject *args, PyObject
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
{
resultobj = wxPyMake_wxObject(result, 1);
}
resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxStatusBar, 1);
return resultobj;
fail:
return NULL;
@@ -15236,9 +15216,7 @@ static PyObject *_wrap_new_MDIChildFrame(PyObject *self, PyObject *args, PyObjec
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
{
resultobj = wxPyMake_wxObject(result, 1);
}
resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxMDIChildFrame, 1);
{
if (temp3)
delete arg3;
@@ -15277,9 +15255,7 @@ static PyObject *_wrap_new_PreMDIChildFrame(PyObject *self, PyObject *args, PyOb
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
{
resultobj = wxPyMake_wxObject(result, 1);
}
resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxMDIChildFrame, 1);
return resultobj;
fail:
return NULL;
@@ -15500,9 +15476,7 @@ static PyObject *_wrap_new_MDIClientWindow(PyObject *self, PyObject *args, PyObj
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
{
resultobj = wxPyMake_wxObject(result, 1);
}
resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxMDIClientWindow, 1);
return resultobj;
fail:
return NULL;
@@ -15525,9 +15499,7 @@ static PyObject *_wrap_new_PreMDIClientWindow(PyObject *self, PyObject *args, Py
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
{
resultobj = wxPyMake_wxObject(result, 1);
}
resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxMDIClientWindow, 1);
return resultobj;
fail:
return NULL;
wxPython/src/msw/grid_wrap.cpp
+36 -22
View File
@@ -336,7 +336,8 @@ PyObject* wxPyMake_##TYPE(TYPE* source, bool setThisOwn) { \
wxPyOORClientData* data = (wxPyOORClientData*)source->GetClientObject(); \
if (data) { \
target = data->m_obj; \
Py_INCREF(target); \
if (target) \
Py_INCREF(target); \
} \
/* Otherwise make a new wrapper for it the old fashioned way and \
give it the OOR treatment */ \
@@ -781,8 +782,21 @@ SWIG_FromCharPtr(const char* cptr)
}
}
#define wxGRID_DEFAULT_NUMBER_ROWS WXGRID_DEFAULT_NUMBER_ROWS
#define wxGRID_DEFAULT_NUMBER_COLS WXGRID_DEFAULT_NUMBER_COLS
#define wxGRID_DEFAULT_ROW_HEIGHT WXGRID_DEFAULT_ROW_HEIGHT
#define wxGRID_DEFAULT_COL_WIDTH WXGRID_DEFAULT_COL_WIDTH
#define wxGRID_DEFAULT_COL_LABEL_HEIGHT WXGRID_DEFAULT_COL_LABEL_HEIGHT
#define wxGRID_DEFAULT_ROW_LABEL_WIDTH WXGRID_DEFAULT_ROW_LABEL_WIDTH
#define wxGRID_LABEL_EDGE_ZONE WXGRID_LABEL_EDGE_ZONE
#define wxGRID_MIN_ROW_HEIGHT WXGRID_MIN_ROW_HEIGHT
#define wxGRID_MIN_COL_WIDTH WXGRID_MIN_COL_WIDTH
#define wxGRID_DEFAULT_SCROLLBAR_WIDTH WXGRID_DEFAULT_SCROLLBAR_WIDTH
void wxGridCellRenderer__setOORInfo(wxGridCellRenderer *self,PyObject *_self){
self->SetClientObject(new wxPyOORClientData(_self));
if (!self->GetClientObject())
self->SetClientObject(new wxPyOORClientData(_self));
}
#include <limits.h>
@@ -969,7 +983,8 @@ IMP_PYCALLBACK__STRING( wxPyGridCellRenderer, wxGridCellRenderer, SetParameters)
void wxGridCellEditor__setOORInfo(wxGridCellEditor *self,PyObject *_self){
self->SetClientObject(new wxPyOORClientData(_self));
if (!self->GetClientObject())
self->SetClientObject(new wxPyOORClientData(_self));
}
class wxPyGridCellEditor : public wxGridCellEditor
@@ -1097,7 +1112,8 @@ IMP_PYCALLBACK_STRING__constpure(wxPyGridCellEditor, wxGridCellEditor, GetValue)
void wxGridCellAttr__setOORInfo(wxGridCellAttr *self,PyObject *_self){
self->SetClientObject(new wxPyOORClientData(_self));
if (!self->GetClientObject())
self->SetClientObject(new wxPyOORClientData(_self));
}
static PyObject* t_output_helper(PyObject* target, PyObject* o) {
@@ -1127,7 +1143,8 @@ static PyObject* t_output_helper(PyObject* target, PyObject* o) {
}
void wxGridCellAttrProvider__setOORInfo(wxGridCellAttrProvider *self,PyObject *_self){
self->SetClientObject(new wxPyOORClientData(_self));
if (!self->GetClientObject())
self->SetClientObject(new wxPyOORClientData(_self));
}
SWIGSTATICINLINE(unsigned long)
@@ -1172,7 +1189,8 @@ public:
};
void wxGridTableBase__setOORInfo(wxGridTableBase *self,PyObject *_self){
self->SetClientObject(new wxPyOORClientData(_self));
if (!self->GetClientObject())
self->SetClientObject(new wxPyOORClientData(_self));
}
SWIGSTATICINLINE(int)
@@ -8108,9 +8126,7 @@ static PyObject *_wrap_new_Grid(PyObject *self, PyObject *args, PyObject *kwargs
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
{
resultobj = wxPyMake_wxObject(result, 1);
}
resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxGrid, 1);
{
if (temp6)
delete arg6;
@@ -8141,9 +8157,7 @@ static PyObject *_wrap_new_PreGrid(PyObject *self, PyObject *args, PyObject *kwa
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
{
resultobj = wxPyMake_wxObject(result, 1);
}
resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxGrid, 1);
return resultobj;
fail:
return NULL;
@@ -17269,16 +17283,16 @@ SWIGEXPORT(void) SWIG_init(void) {
PyDict_SetItemString(d,"GRID_VALUE_DATETIME", SWIG_FromCharPtr("datetime"));
SWIG_addvarlink(SWIG_globals,(char*)"GridNoCellCoords",_wrap_GridNoCellCoords_get, _wrap_GridNoCellCoords_set);
SWIG_addvarlink(SWIG_globals,(char*)"GridNoCellRect",_wrap_GridNoCellRect_get, _wrap_GridNoCellRect_set);
PyDict_SetItemString(d,"GRID_DEFAULT_NUMBER_ROWS", SWIG_FromInt((int)WXGRID_DEFAULT_NUMBER_ROWS));
PyDict_SetItemString(d,"GRID_DEFAULT_NUMBER_COLS", SWIG_FromInt((int)WXGRID_DEFAULT_NUMBER_COLS));
PyDict_SetItemString(d,"GRID_DEFAULT_ROW_HEIGHT", SWIG_FromInt((int)WXGRID_DEFAULT_ROW_HEIGHT));
PyDict_SetItemString(d,"GRID_DEFAULT_COL_WIDTH", SWIG_FromInt((int)WXGRID_DEFAULT_COL_WIDTH));
PyDict_SetItemString(d,"GRID_DEFAULT_COL_LABEL_HEIGHT", SWIG_FromInt((int)WXGRID_DEFAULT_COL_LABEL_HEIGHT));
PyDict_SetItemString(d,"GRID_DEFAULT_ROW_LABEL_WIDTH", SWIG_FromInt((int)WXGRID_DEFAULT_ROW_LABEL_WIDTH));
PyDict_SetItemString(d,"GRID_LABEL_EDGE_ZONE", SWIG_FromInt((int)WXGRID_LABEL_EDGE_ZONE));
PyDict_SetItemString(d,"GRID_MIN_ROW_HEIGHT", SWIG_FromInt((int)WXGRID_MIN_ROW_HEIGHT));
PyDict_SetItemString(d,"GRID_MIN_COL_WIDTH", SWIG_FromInt((int)WXGRID_MIN_COL_WIDTH));
PyDict_SetItemString(d,"GRID_DEFAULT_SCROLLBAR_WIDTH", SWIG_FromInt((int)WXGRID_DEFAULT_SCROLLBAR_WIDTH));
PyDict_SetItemString(d,"GRID_DEFAULT_NUMBER_ROWS", SWIG_FromInt((int)wxGRID_DEFAULT_NUMBER_ROWS));
PyDict_SetItemString(d,"GRID_DEFAULT_NUMBER_COLS", SWIG_FromInt((int)wxGRID_DEFAULT_NUMBER_COLS));
PyDict_SetItemString(d,"GRID_DEFAULT_ROW_HEIGHT", SWIG_FromInt((int)wxGRID_DEFAULT_ROW_HEIGHT));
PyDict_SetItemString(d,"GRID_DEFAULT_COL_WIDTH", SWIG_FromInt((int)wxGRID_DEFAULT_COL_WIDTH));
PyDict_SetItemString(d,"GRID_DEFAULT_COL_LABEL_HEIGHT", SWIG_FromInt((int)wxGRID_DEFAULT_COL_LABEL_HEIGHT));
PyDict_SetItemString(d,"GRID_DEFAULT_ROW_LABEL_WIDTH", SWIG_FromInt((int)wxGRID_DEFAULT_ROW_LABEL_WIDTH));
PyDict_SetItemString(d,"GRID_LABEL_EDGE_ZONE", SWIG_FromInt((int)wxGRID_LABEL_EDGE_ZONE));
PyDict_SetItemString(d,"GRID_MIN_ROW_HEIGHT", SWIG_FromInt((int)wxGRID_MIN_ROW_HEIGHT));
PyDict_SetItemString(d,"GRID_MIN_COL_WIDTH", SWIG_FromInt((int)wxGRID_MIN_COL_WIDTH));
PyDict_SetItemString(d,"GRID_DEFAULT_SCROLLBAR_WIDTH", SWIG_FromInt((int)wxGRID_DEFAULT_SCROLLBAR_WIDTH));
PyDict_SetItemString(d,"GridCellAttr_Any", SWIG_FromInt((int)wxGridCellAttr::Any));
PyDict_SetItemString(d,"GridCellAttr_Default", SWIG_FromInt((int)wxGridCellAttr::Default));
PyDict_SetItemString(d,"GridCellAttr_Cell", SWIG_FromInt((int)wxGridCellAttr::Cell));
wxPython/src/msw/html.py
+8
View File
@@ -1077,6 +1077,14 @@ class HtmlWindow(_windows.ScrolledWindow):
"""SelectAll(self)"""
return _html.HtmlWindow_SelectAll(*args, **kwargs)
def SelectionToText(*args, **kwargs):
"""SelectionToText(self) -> String"""
return _html.HtmlWindow_SelectionToText(*args, **kwargs)
def ToText(*args, **kwargs):
"""ToText(self) -> String"""
return _html.HtmlWindow_ToText(*args, **kwargs)
def base_OnLinkClicked(*args, **kwargs):
"""base_OnLinkClicked(self, HtmlLinkInfo link)"""
return _html.HtmlWindow_base_OnLinkClicked(*args, **kwargs)
wxPython/src/msw/html_wrap.cpp
+68 -6
View File
@@ -5893,9 +5893,7 @@ static PyObject *_wrap_new_HtmlWindow(PyObject *self, PyObject *args, PyObject *
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
{
resultobj = wxPyMake_wxObject(result, 1);
}
resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxPyHtmlWindow, 1);
{
if (temp6)
delete arg6;
@@ -5926,9 +5924,7 @@ static PyObject *_wrap_new_PreHtmlWindow(PyObject *self, PyObject *args, PyObjec
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
{
resultobj = wxPyMake_wxObject(result, 1);
}
resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxPyHtmlWindow, 1);
return resultobj;
fail:
return NULL;
@@ -7008,6 +7004,70 @@ static PyObject *_wrap_HtmlWindow_SelectAll(PyObject *self, PyObject *args, PyOb
}
static PyObject *_wrap_HtmlWindow_SelectionToText(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject *resultobj;
wxPyHtmlWindow *arg1 = (wxPyHtmlWindow *) 0 ;
wxString result;
PyObject * obj0 = 0 ;
char *kwnames[] = {
(char *) "self", NULL
};
if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:HtmlWindow_SelectionToText",kwnames,&obj0)) goto fail;
if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyHtmlWindow,
SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
result = (arg1)->SelectionToText();
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;
}
static PyObject *_wrap_HtmlWindow_ToText(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject *resultobj;
wxPyHtmlWindow *arg1 = (wxPyHtmlWindow *) 0 ;
wxString result;
PyObject * obj0 = 0 ;
char *kwnames[] = {
(char *) "self", NULL
};
if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:HtmlWindow_ToText",kwnames,&obj0)) goto fail;
if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyHtmlWindow,
SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
result = (arg1)->ToText();
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;
}
static PyObject *_wrap_HtmlWindow_base_OnLinkClicked(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject *resultobj;
wxPyHtmlWindow *arg1 = (wxPyHtmlWindow *) 0 ;
@@ -10751,6 +10811,8 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"HtmlWindow_SelectWord", (PyCFunction) _wrap_HtmlWindow_SelectWord, METH_VARARGS | METH_KEYWORDS },
{ (char *)"HtmlWindow_SelectLine", (PyCFunction) _wrap_HtmlWindow_SelectLine, METH_VARARGS | METH_KEYWORDS },
{ (char *)"HtmlWindow_SelectAll", (PyCFunction) _wrap_HtmlWindow_SelectAll, METH_VARARGS | METH_KEYWORDS },
{ (char *)"HtmlWindow_SelectionToText", (PyCFunction) _wrap_HtmlWindow_SelectionToText, METH_VARARGS | METH_KEYWORDS },
{ (char *)"HtmlWindow_ToText", (PyCFunction) _wrap_HtmlWindow_ToText, METH_VARARGS | METH_KEYWORDS },
{ (char *)"HtmlWindow_base_OnLinkClicked", (PyCFunction) _wrap_HtmlWindow_base_OnLinkClicked, METH_VARARGS | METH_KEYWORDS },
{ (char *)"HtmlWindow_base_OnSetTitle", (PyCFunction) _wrap_HtmlWindow_base_OnSetTitle, METH_VARARGS | METH_KEYWORDS },
{ (char *)"HtmlWindow_base_OnCellMouseHover", (PyCFunction) _wrap_HtmlWindow_base_OnCellMouseHover, METH_VARARGS | METH_KEYWORDS },
wxPython/wxPython/grid.py
+10 -10
View File
@@ -31,16 +31,16 @@ wxGRID_VALUE_CHOICEINT = wx.grid.GRID_VALUE_CHOICEINT
wxGRID_VALUE_DATETIME = wx.grid.GRID_VALUE_DATETIME
wxGridNoCellCoords = wx.grid.GridNoCellCoords
wxGridNoCellRect = wx.grid.GridNoCellRect
WXGRID_DEFAULT_NUMBER_ROWS = wx.grid.WXGRID_DEFAULT_NUMBER_ROWS
WXGRID_DEFAULT_NUMBER_COLS = wx.grid.WXGRID_DEFAULT_NUMBER_COLS
WXGRID_DEFAULT_ROW_HEIGHT = wx.grid.WXGRID_DEFAULT_ROW_HEIGHT
WXGRID_DEFAULT_COL_WIDTH = wx.grid.WXGRID_DEFAULT_COL_WIDTH
WXGRID_DEFAULT_COL_LABEL_HEIGHT = wx.grid.WXGRID_DEFAULT_COL_LABEL_HEIGHT
WXGRID_DEFAULT_ROW_LABEL_WIDTH = wx.grid.WXGRID_DEFAULT_ROW_LABEL_WIDTH
WXGRID_LABEL_EDGE_ZONE = wx.grid.WXGRID_LABEL_EDGE_ZONE
WXGRID_MIN_ROW_HEIGHT = wx.grid.WXGRID_MIN_ROW_HEIGHT
WXGRID_MIN_COL_WIDTH = wx.grid.WXGRID_MIN_COL_WIDTH
WXGRID_DEFAULT_SCROLLBAR_WIDTH = wx.grid.WXGRID_DEFAULT_SCROLLBAR_WIDTH
wxGRID_DEFAULT_NUMBER_ROWS = wx.grid.GRID_DEFAULT_NUMBER_ROWS
wxGRID_DEFAULT_NUMBER_COLS = wx.grid.GRID_DEFAULT_NUMBER_COLS
wxGRID_DEFAULT_ROW_HEIGHT = wx.grid.GRID_DEFAULT_ROW_HEIGHT
wxGRID_DEFAULT_COL_WIDTH = wx.grid.GRID_DEFAULT_COL_WIDTH
wxGRID_DEFAULT_COL_LABEL_HEIGHT = wx.grid.GRID_DEFAULT_COL_LABEL_HEIGHT
wxGRID_DEFAULT_ROW_LABEL_WIDTH = wx.grid.GRID_DEFAULT_ROW_LABEL_WIDTH
wxGRID_LABEL_EDGE_ZONE = wx.grid.GRID_LABEL_EDGE_ZONE
wxGRID_MIN_ROW_HEIGHT = wx.grid.GRID_MIN_ROW_HEIGHT
wxGRID_MIN_COL_WIDTH = wx.grid.GRID_MIN_COL_WIDTH
wxGRID_DEFAULT_SCROLLBAR_WIDTH = wx.grid.GRID_DEFAULT_SCROLLBAR_WIDTH
wxGridCellRenderer = wx.grid.GridCellRenderer
wxGridCellRendererPtr = wx.grid.GridCellRendererPtr
wxPyGridCellRenderer = wx.grid.PyGridCellRenderer
wxPython/wxPython/xrc.py
+1
View File
@@ -32,6 +32,7 @@ WX_XMLRES_CURRENT_VERSION_RELEASE = wx.xrc.WX_XMLRES_CURRENT_VERSION_RELEASE
WX_XMLRES_CURRENT_VERSION_REVISION = wx.xrc.WX_XMLRES_CURRENT_VERSION_REVISION
wxXRC_USE_LOCALE = wx.xrc.XRC_USE_LOCALE
wxXRC_NO_SUBCLASSING = wx.xrc.XRC_NO_SUBCLASSING
wxXRC_NO_RELOADING = wx.xrc.XRC_NO_RELOADING
wxXmlResource = wx.xrc.XmlResource
wxXmlResourcePtr = wx.xrc.XmlResourcePtr
wxEmptyXmlResource = wx.xrc.EmptyXmlResource