jyapayne/PySide
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix bug 966 - "QX11Info.display() missing"

Browse source
This commit is contained in:
Hugo Parente Lima 2011-08-31 15:24:40 -03:00
commit 08d202e824
3 changed files with 28 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

19
PySide/QtGui/typesystem_gui_x11.xml
View file

@ -23,10 +23,21 @@
<rejection class="" function-name="qt_x11_getX11InfoForWindow"/> <rejection class="" function-name="qt_x11_getX11InfoForWindow"/>
<rejection class="QX11Info" field-name="x11data"/> <rejection class="QX11Info" field-name="x11data"/>
<value-type name="QX11Info"> <value-type name="QX11Info">
<!-- ### Both methods return void pointers, for which particular cases no handling was discussed. --> <add-function signature="display()" return-type="unsigned long" static="yes">
<modify-function signature="visual()const" remove="all"/> <inject-code>
<modify-function signature="appVisual(int)" remove="all"/> %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> </value-type>
<object-type name="QX11EmbedContainer"> <object-type name="QX11EmbedContainer">
<enum-type name="Error"/> <enum-type name="Error"/>

2
tests/QtGui/CMakeLists.txt
View file

@ -160,6 +160,6 @@ PYSIDE_TEST(virtual_pure_override_test.py)
PYSIDE_TEST(wrong_return_test.py) PYSIDE_TEST(wrong_return_test.py)
if(X11) if(Q_WS_X11)
PYSIDE_TEST(x11_symbols_test.py) PYSIDE_TEST(x11_symbols_test.py)
endif() endif()

17
tests/QtGui/x11_symbols_test.py
View file

@ -3,15 +3,22 @@
import unittest import unittest
from PySide.QtGui import QPixmap from PySide.QtGui import *
class X11Test(unittest.TestCase): class X11Test(unittest.TestCase):
def test(self): def test(self):
self.assert_('handle' in dir(QPixmap)) qpixmapFuncs = dir(QPixmap)
self.assert_('x11Info' in dir(QPixmap)) self.assert_('handle' in qpixmapFuncs)
self.assert_('x11PictureHandle' in dir(QPixmap)) self.assert_('x11Info' in qpixmapFuncs)
self.assert_('x11SetDefaultScreen' in dir(QPixmap)) 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__': if __name__ == '__main__':
unittest.main() unittest.main()