Applied patch for non-Latin keyboards.

[wxWidgets.git] / src / mac / xpm / simx.h

diff --git a/src/mac/xpm/simx.h b/src/mac/xpm/simx.h
index a70ad187a6c9dd961067c3b4315f556cc9c2de7f..90324a50963788cb06df100a9adeb42bf8f3cb93 100644 (file)
--- a/src/mac/xpm/simx.h
+++ b/src/mac/xpm/simx.h
@@ -89,8 +89,12 @@ typedef struct {
     unsigned int depth;
 }      XImage;
 
     unsigned int depth;
 }      XImage;
 

-#elif macintosh
-
+#elif defined(macintosh) || defined(__APPLE__)
+#if defined(__APPLE__)
+#include <Carbon/Carbon.h>
+#elif !defined(__MWERKS__)
+#include <wx/wxprec.h>
+#endif

 /* define Mac types for X window types */
 
 typedef GDevice* Display;                      /* this should be similar */
 /* define Mac types for X window types */
 
 typedef GDevice* Display;                      /* this should be similar */


@@ -136,7 +140,7 @@ extern "C" {
     FUNC(XQueryColors, void, (Display *display, Colormap *colormap,
                              XColor *xcolors, int ncolors));
     FUNC(XFreeColors, int, (Display *d, Colormap cmap,
     FUNC(XQueryColors, void, (Display *display, Colormap *colormap,
                              XColor *xcolors, int ncolors));
     FUNC(XFreeColors, int, (Display *d, Colormap cmap,

-                           unsigned long pixels[],
+                           Pixel *pixels,

                            int npixels, unsigned long planes));
 /* XImage */
     FUNC(XCreateImage, XImage *, (Display *, Visual *, int depth, int format,
                            int npixels, unsigned long planes));
 /* XImage */
     FUNC(XCreateImage, XImage *, (Display *, Visual *, int depth, int format,


@@ -161,7 +165,7 @@ extern "C" {
 #ifndef Bool
 #ifdef FOR_MSW
 typedef BOOL Bool;             /* take MSW bool */
 #ifndef Bool
 #ifdef FOR_MSW
 typedef BOOL Bool;             /* take MSW bool */

-#elif macintosh
+#elif defined(macintosh) || defined(__APPLE__)

 typedef Boolean Bool;          /* take MSW bool */
 #endif
 #endif
 typedef Boolean Bool;          /* take MSW bool */
 #endif
 #endif