Applied fix for keybuttons not displaying properly on Mac.  Removed workaround code in NumKeypad.