fix all the occurence where a drawable where considered as a union
fix all the occurence where a drawable where considered as a union

topcat/xcb-win32,stapelberg/libxcb,topcat/xcb-win32,OpenInkpot-archive/iplinux-libxcb,topcat/xcb-win32,stapelberg/libxcb,topcat/xcb-win32,OpenInkpot-archive/iplinux-libxcb,topcat/xcb-win32,OpenInkpot-archive/iplinux-libxcb,stapelberg/libxcb