> The fix looks good to me. To answer your questions: > > 1. Using the XAWT macro is correct. It is only defined if we're building the > XToolkit, which we don't on the Mac. However, everywhere else we actually > check > > #ifdef MACOSX > // ... do Mac stuff > #else > // ... do X11/Linux/Solaris/etc. stuff > #endif > > We're unlikely to start supporting XToolkit/XAWT on Mac in the future, so is > there a reason not to use the MACOSX macro instead for consistency with the > rest of the code?
I'm ambivalent, but XAWT is platform neutral, which leads to another question: would there ever be a reason to not use X11 on Linux/Solaris? For example, I understand Wayland is starting to see some movement as an X alternative, particularly on Ubuntu. Likely not a concern now, but it could make future porting work easier if it's decided to be adopted. I think realistically, the below issue would need to be addressed first which would make this a moot point. I've no problems changing these to MACOSX.. > 2. Regarding factoring out the X11 code: firstly we need to rename > src/solaris/ to src/_nix/ (where _nix could stand for UNIX and whatnot). In > that case, moving X11-specific code and OSX-specific code into their > corresponding directories would make sense. Obviously, this is a huge project > and I don't see this happening any time soon. Agreed, and a bit outside the scope of my issue here :) -DrD-
