Index: unx/source/app/i18n_xkb.cxx
===================================================================
RCS file: /cvs/gsl/vcl/unx/source/app/i18n_xkb.cxx,v
retrieving revision 1.3
diff -u -r1.3 i18n_xkb.cxx
--- unx/source/app/i18n_xkb.cxx	15 Apr 2003 16:08:03 -0000	1.3
+++ unx/source/app/i18n_xkb.cxx	30 Jul 2003 18:59:14 -0000
@@ -62,7 +62,7 @@
 
 #include <stdio.h>
 
-#if defined(LINUX) || defined(FREEBSD) // should really check for xfree86 or for X11R6.1 and higher
+#if defined(LINUX) || defined(FREEBSD) || defined(MACOSX) // should really check for xfree86 or for X11R6.1 and higher
 #define __XKeyboardExtension__ 1
 #else
 #define __XKeyboardExtension__ 0
Index: unx/source/app/keysymnames.cxx
===================================================================
RCS file: /cvs/gsl/vcl/unx/source/app/keysymnames.cxx,v
retrieving revision 1.7
diff -u -r1.7 keysymnames.cxx
--- unx/source/app/keysymnames.cxx	15 Apr 2003 16:08:13 -0000	1.7
+++ unx/source/app/keysymnames.cxx	30 Jul 2003 18:59:14 -0000
@@ -608,7 +608,18 @@
 		{
 			XkbDescPtr pXkbDesc = NULL;
 			// try X keyboard extension
+		#ifdef MACOSX
+			// FIXME
+			// XDarwin doesn't yet have very good support for the Xkeyboard extension.
+			// When we call XkbGetKeyboard(), the XServer throws a message up in the
+			// console about xkbcomp and files for geometry include.  The side effect of
+			// this is _very_ noticable lag when drawing menus.  The file menu, for example,
+			// takes about 1s to come down on my G4/450 DP and you can see it draw.  Therefore
+			// we are disabling it for the moment until better XDarwin support exists.
+			if ( 0 )
+		#else
 			if( pXkbDesc = XkbGetKeyboard( GetDisplay(), XkbAllComponentsMask, XkbUseCoreKbd ) )
+		#endif
 			{
                 const char* pAtom = NULL;
                 if( pXkbDesc->names->groups[0] )
Index: unx/source/app/saldisp.cxx
===================================================================
RCS file: /cvs/gsl/vcl/unx/source/app/saldisp.cxx,v
retrieving revision 1.43.26.4
diff -u -r1.43.26.4 saldisp.cxx
--- unx/source/app/saldisp.cxx	30 Jul 2003 14:36:14 -0000	1.43.26.4
+++ unx/source/app/saldisp.cxx	30 Jul 2003 18:59:55 -0000
@@ -232,7 +232,7 @@
 
 #include <X11/Xatom.h>
 #ifndef SOLARIS
-#ifdef X86
+#if defined(X86) || defined(MACOSX)
 extern "C" {
 #include <X11/extensions/Xinerama.h>
 }
@@ -1190,7 +1190,7 @@
             sscanf( pProperties, "%li", &nProperties_ );
         else
         {
-#if defined DBG_UTIL || defined SUN || defined LINUX || defined FREEBSD || defined IRIX
+#if defined DBG_UTIL || defined SUN || defined LINUX || defined FREEBSD || defined IRIX || defined MACOSX
             nProperties_ |= PROPERTY_FEATURE_Maximize;
 #endif
             // Server Bugs & Properties
@@ -1219,7 +1219,7 @@
 #ifdef ARM32 // ??? Server! nicht Client ???
                 nProperties_ &= ~PROPERTY_SUPPORT_XSetClipMask;
 #endif
-#if defined LINUX || defined FREEBSD
+#if defined LINUX || defined FREEBSD || defined MACOSX
 				// otherwm and olwm are a kind of default, which are not detected
 				// carefully. if we are running linux (i.e. not netbsd) on an xfree 
 				// display, fvwm is most probable the wm to choose, confusing with mwm
@@ -3033,7 +3033,7 @@
 
 void SalDisplay::InitXinerama()
 {
-#ifdef SOLARIS
+#if defined( SOLARIS )
     // do this load on call for benefit of Solaris < 8
     rtl::OUString aLib( RTL_CONSTASCII_USTRINGPARAM( "libXext.so" ) );
     rtl::OUString aSymb1( RTL_CONSTASCII_USTRINGPARAM( "XineramaGetState" ) );
@@ -3071,7 +3071,7 @@
     }
     osl_unloadModule( hModule );
 #else
-#ifdef X86
+#if defined( X86 ) || defined( MACOSX )
     if( XineramaIsActive( pDisp_ ) )
     {
         int nFramebuffers = 1;
Index: util/makefile.mk
===================================================================
RCS file: /cvs/gsl/vcl/util/makefile.mk,v
retrieving revision 1.46.2.1
diff -u -r1.46.2.1 makefile.mk
--- util/makefile.mk	21 Jul 2003 14:48:45 -0000	1.46.2.1
+++ util/makefile.mk	30 Jul 2003 19:00:00 -0000
@@ -306,6 +306,10 @@
 .ENDIF          # "$(OS)"=="SOLARIS"
 .ENDIF          # "$(GUIBASE)"=="unx"
 
+.IF "$(OS)"=="MACOSX"
+SHL1STDLIBS += -lXinerama
+.ENDIF
+
 .IF "$(OS)"=="LINUX" || "$(OS)"=="SOLARIS" || "$(OS)"=="FREEBSD"
 SHL1STDLIBS += -laudio
 .IF "$(OS)"=="SOLARIS"