diff options
author | Martin Pitt <martin.pitt@ubuntu.com> | 2011-10-19 14:35:11 +0200 |
---|---|---|
committer | Martin Pitt <martin.pitt@ubuntu.com> | 2011-10-19 14:35:11 +0200 |
commit | 8deaec6b9abd87f02060c9feec773d4693e89028 (patch) | |
tree | 34057ae965140432038252311f17c8fad0493ea3 | |
parent | f395fb131caf7ca550acd17138d8061926ef4f92 (diff) | |
download | pygobject-8deaec6b9abd87f02060c9feec773d4693e89028.tar.gz |
Gdk overrides: Unbreak for Gdk-2.0
Fix regression from commit 31db3ed: Gdk 2.0 did not yet have atom_intern(), so
only do this for Gdk >= 3.0.
https://launchpad.net/bugs/875399
-rw-r--r-- | gi/overrides/Gdk.py | 95 |
1 files changed, 48 insertions, 47 deletions
diff --git a/gi/overrides/Gdk.py b/gi/overrides/Gdk.py index d94201e7..c48a2423 100644 --- a/gi/overrides/Gdk.py +++ b/gi/overrides/Gdk.py @@ -293,53 +293,54 @@ def color_parse(color): return color # constants -SELECTION_PRIMARY = Gdk.atom_intern('PRIMARY', True) -__all__.append('SELECTION_PRIMARY') - -SELECTION_SECONDARY = Gdk.atom_intern('SECONDARY', True) -__all__.append('SELECTION_SECONDARY') - -SELECTION_CLIPBOARD = Gdk.atom_intern('CLIPBOARD', True) -__all__.append('SELECTION_CLIPBOARD') - -TARGET_BITMAP = Gdk.atom_intern('BITMAP', True) -__all__.append('TARGET_BITMAP') - -TARGET_COLORMAP = Gdk.atom_intern('COLORMAP', True) -__all__.append('TARGET_COLORMAP') - -TARGET_DRAWABLE = Gdk.atom_intern('DRAWABLE', True) -__all__.append('TARGET_DRAWABLE') - -TARGET_PIXMAP = Gdk.atom_intern('PIXMAP', True) -__all__.append('TARGET_PIXMAP') - -TARGET_STRING = Gdk.atom_intern('STRING', True) -__all__.append('TARGET_STRING') - -SELECTION_TYPE_ATOM = Gdk.atom_intern('ATOM', True) -__all__.append('SELECTION_TYPE_ATOM') - -SELECTION_TYPE_BITMAP = Gdk.atom_intern('BITMAP', True) -__all__.append('SELECTION_TYPE_BITMAP') - -SELECTION_TYPE_COLORMAP = Gdk.atom_intern('COLORMAP', True) -__all__.append('SELECTION_TYPE_COLORMAP') - -SELECTION_TYPE_DRAWABLE = Gdk.atom_intern('DRAWABLE', True) -__all__.append('SELECTION_TYPE_DRAWABLE') - -SELECTION_TYPE_INTEGER = Gdk.atom_intern('INTEGER', True) -__all__.append('SELECTION_TYPE_INTEGER') - -SELECTION_TYPE_PIXMAP = Gdk.atom_intern('PIXMAP', True) -__all__.append('SELECTION_TYPE_PIXMAP') - -SELECTION_TYPE_WINDOW = Gdk.atom_intern('WINDOW', True) -__all__.append('SELECTION_TYPE_WINDOW') - -SELECTION_TYPE_STRING = Gdk.atom_intern('STRING', True) -__all__.append('SELECTION_TYPE_STRING') +if Gdk._version >= '3.0': + SELECTION_PRIMARY = Gdk.atom_intern('PRIMARY', True) + __all__.append('SELECTION_PRIMARY') + + SELECTION_SECONDARY = Gdk.atom_intern('SECONDARY', True) + __all__.append('SELECTION_SECONDARY') + + SELECTION_CLIPBOARD = Gdk.atom_intern('CLIPBOARD', True) + __all__.append('SELECTION_CLIPBOARD') + + TARGET_BITMAP = Gdk.atom_intern('BITMAP', True) + __all__.append('TARGET_BITMAP') + + TARGET_COLORMAP = Gdk.atom_intern('COLORMAP', True) + __all__.append('TARGET_COLORMAP') + + TARGET_DRAWABLE = Gdk.atom_intern('DRAWABLE', True) + __all__.append('TARGET_DRAWABLE') + + TARGET_PIXMAP = Gdk.atom_intern('PIXMAP', True) + __all__.append('TARGET_PIXMAP') + + TARGET_STRING = Gdk.atom_intern('STRING', True) + __all__.append('TARGET_STRING') + + SELECTION_TYPE_ATOM = Gdk.atom_intern('ATOM', True) + __all__.append('SELECTION_TYPE_ATOM') + + SELECTION_TYPE_BITMAP = Gdk.atom_intern('BITMAP', True) + __all__.append('SELECTION_TYPE_BITMAP') + + SELECTION_TYPE_COLORMAP = Gdk.atom_intern('COLORMAP', True) + __all__.append('SELECTION_TYPE_COLORMAP') + + SELECTION_TYPE_DRAWABLE = Gdk.atom_intern('DRAWABLE', True) + __all__.append('SELECTION_TYPE_DRAWABLE') + + SELECTION_TYPE_INTEGER = Gdk.atom_intern('INTEGER', True) + __all__.append('SELECTION_TYPE_INTEGER') + + SELECTION_TYPE_PIXMAP = Gdk.atom_intern('PIXMAP', True) + __all__.append('SELECTION_TYPE_PIXMAP') + + SELECTION_TYPE_WINDOW = Gdk.atom_intern('WINDOW', True) + __all__.append('SELECTION_TYPE_WINDOW') + + SELECTION_TYPE_STRING = Gdk.atom_intern('STRING', True) + __all__.append('SELECTION_TYPE_STRING') import sys |