diff options
| -rw-r--r-- | PySide/QtGui/typesystem_gui_x11.xml | 19 | ||||
| -rw-r--r-- | tests/QtGui/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | tests/QtGui/x11_symbols_test.py | 17 |
3 files changed, 28 insertions, 10 deletions
diff --git a/PySide/QtGui/typesystem_gui_x11.xml b/PySide/QtGui/typesystem_gui_x11.xml index 96bfb24f9..54d88826f 100644 --- a/PySide/QtGui/typesystem_gui_x11.xml +++ b/PySide/QtGui/typesystem_gui_x11.xml @@ -23,10 +23,21 @@ <rejection class="" function-name="qt_x11_getX11InfoForWindow"/> <rejection class="QX11Info" field-name="x11data"/> <value-type name="QX11Info"> - <!-- ### Both methods return void pointers, for which particular cases no handling was discussed. --> - <modify-function signature="visual()const" remove="all"/> - <modify-function signature="appVisual(int)" remove="all"/> - <!-- ### --> + <add-function signature="display()" return-type="unsigned long" static="yes"> + <inject-code> + %PYARG_0 = PyLong_FromVoidPtr(%TYPE::%FUNCTION_NAME()); + </inject-code> + </add-function> + <modify-function signature="visual()const"> + <inject-code> + %PYARG_0 = PyLong_FromVoidPtr(%CPPSELF.%FUNCTION_NAME()); + </inject-code> + </modify-function> + <modify-function signature="appVisual(int)"> + <inject-code> + %PYARG_0 = PyLong_FromVoidPtr(%CPPSELF.%FUNCTION_NAME()); + </inject-code> + </modify-function> </value-type> <object-type name="QX11EmbedContainer"> <enum-type name="Error"/> diff --git a/tests/QtGui/CMakeLists.txt b/tests/QtGui/CMakeLists.txt index d4ea1902f..75f576f33 100644 --- a/tests/QtGui/CMakeLists.txt +++ b/tests/QtGui/CMakeLists.txt @@ -160,6 +160,6 @@ PYSIDE_TEST(virtual_pure_override_test.py) PYSIDE_TEST(wrong_return_test.py) -if(X11) +if(Q_WS_X11) PYSIDE_TEST(x11_symbols_test.py) endif() diff --git a/tests/QtGui/x11_symbols_test.py b/tests/QtGui/x11_symbols_test.py index 29cce150e..6a38eed59 100644 --- a/tests/QtGui/x11_symbols_test.py +++ b/tests/QtGui/x11_symbols_test.py @@ -3,15 +3,22 @@ import unittest -from PySide.QtGui import QPixmap +from PySide.QtGui import * class X11Test(unittest.TestCase): def test(self): - self.assert_('handle' in dir(QPixmap)) - self.assert_('x11Info' in dir(QPixmap)) - self.assert_('x11PictureHandle' in dir(QPixmap)) - self.assert_('x11SetDefaultScreen' in dir(QPixmap)) + qpixmapFuncs = dir(QPixmap) + self.assert_('handle' in qpixmapFuncs) + self.assert_('x11Info' in qpixmapFuncs) + self.assert_('x11PictureHandle' in qpixmapFuncs) + self.assert_('x11SetDefaultScreen' in qpixmapFuncs) + + def testX11Functions(self): + qx11infoFuncs = dir(QX11Info) + self.assert_('display' in qx11infoFuncs) + self.assert_('appVisual' in qx11infoFuncs) + self.assert_('visual' in qx11infoFuncs) if __name__ == '__main__': unittest.main() |