diff options
| author | renatofilho <renato.filho@openbossa.org> | 2010-09-20 15:12:23 -0300 |
|---|---|---|
| committer | renatofilho <renato.filho@openbossa.org> | 2010-09-20 15:53:12 -0300 |
| commit | 0c0a5c128dcccc54ce08f53faec480d5d51f3425 (patch) | |
| tree | 5eb1ac9834984ce13a37c843d4ae9dde9ee5ed64 /PySide | |
| parent | 80c2ebe62694815e2023b5fbafb9242fbdd1f2c9 (diff) | |
Fixed QApplication static functions return policy.
Fixes bug #363.
Reviewer: Luciano Wolf <luciano.wolf@openbossa.org>
Marcelo Lira <marcelo.lira@openbossa.org>
Diffstat (limited to 'PySide')
| -rw-r--r-- | PySide/QtGui/typesystem_gui_common.xml | 46 | ||||
| -rw-r--r-- | PySide/typesystem_templates.xml | 6 |
2 files changed, 49 insertions, 3 deletions
diff --git a/PySide/QtGui/typesystem_gui_common.xml b/PySide/QtGui/typesystem_gui_common.xml index a3ed01d16..22372783e 100644 --- a/PySide/QtGui/typesystem_gui_common.xml +++ b/PySide/QtGui/typesystem_gui_common.xml @@ -4290,9 +4290,49 @@ </inject-code> </modify-function> <modify-function signature="style()"> - <inject-code class="target" position="end"> - Shiboken::setParent(%CONVERTTOPYTHON[QApplication*](qApp), %PYARG_0); - </inject-code> + <inject-code class="target" position="end"> + <insert-template name="set_qapp_parent_for_orphan"/> + </inject-code> + </modify-function> + <modify-function signature="desktop()"> + <inject-code class="target" position="end"> + <insert-template name="set_qapp_parent_for_orphan"/> + </inject-code> + </modify-function> + <modify-function signature="clipboard()"> + <inject-code class="target" position="end"> + <insert-template name="set_qapp_parent_for_orphan"/> + </inject-code> + </modify-function> + <modify-function signature="focusWidget()"> + <inject-code class="target" position="end"> + <insert-template name="set_qapp_parent_for_orphan"/> + </inject-code> + </modify-function> + <modify-function signature="overrideCursor()"> + <inject-code class="target" position="end"> + <insert-template name="set_qapp_parent_for_orphan"/> + </inject-code> + </modify-function> + <modify-function signature="topLevelAt(const QPoint&)"> + <inject-code class="target" position="end"> + <insert-template name="set_qapp_parent_for_orphan"/> + </inject-code> + </modify-function> + <modify-function signature="topLevelAt(int, int)"> + <inject-code class="target" position="end"> + <insert-template name="set_qapp_parent_for_orphan"/> + </inject-code> + </modify-function> + <modify-function signature="widgetAt(const QPoint&)"> + <inject-code class="target" position="end"> + <insert-template name="set_qapp_parent_for_orphan"/> + </inject-code> + </modify-function> + <modify-function signature="widgetAt(int, int)"> + <inject-code class="target" position="end"> + <insert-template name="set_qapp_parent_for_orphan"/> + </inject-code> </modify-function> </object-type> <object-type name="QCommandLinkButton"/> diff --git a/PySide/typesystem_templates.xml b/PySide/typesystem_templates.xml index e2e6fc4a8..959fe7e20 100644 --- a/PySide/typesystem_templates.xml +++ b/PySide/typesystem_templates.xml @@ -181,5 +181,11 @@ %RETURN_TYPE retval_ = %CPPSELF.%FUNCTION_NAME(%1, %2, %3, %4, %5); %PYARG_0 = Shiboken::makeTuple(retval_, %4); </template> + + <template name="set_qapp_parent_for_orphan"> + Shiboken::SbkBaseWrapper* _pySelf = reinterpret_cast<Shiboken::SbkBaseWrapper*>(%PYARG_0); + if (!_pySelf->parentInfo) + Shiboken::setParent(%CONVERTTOPYTHON[QApplication*](qApp), %PYARG_0); + </template> </typesystem> |