Index: source/jscpp/sjapplet_impl.cxx =================================================================== RCS file: /cvs/oi/sj2/source/jscpp/sjapplet_impl.cxx,v retrieving revision 1.26 retrieving revision 1.26.12.1 diff -u -r1.26 -r1.26.12.1 --- source/jscpp/sjapplet_impl.cxx 13 Oct 2005 17:05:18 -0000 1.26 +++ source/jscpp/sjapplet_impl.cxx 31 Jan 2006 01:00:22 -0000 1.26.12.1 @@ -55,7 +55,7 @@ #include #include -#ifdef UNX +#if defined(UNX) && !defined(QUARTZ) #define Time xlib_time #define Window xlib_window #define Font xlib_font @@ -128,7 +128,9 @@ // ensure that all operations for the window contained in pEnvData // have been processed by the Xserver since java will access that // window by a separate connection to the Xserver +#if !defined(QUARTZ) XSync( (Display*)pEnvData->pDisplay, False); +#endif try { //java < 1.5 jclass jcToolkit = pEnv->FindClass("java/awt/Toolkit"); testJavaException(pEnv);