Merge 8.6

1 files changed, 28 insertions, 13 deletions

diff --git a/macosx/tkMacOSXXStubs.c b/macosx/tkMacOSXXStubs.c
index b8e67a4..016b334 100644
--- a/macosx/tkMacOSXXStubs.c
+++ b/macosx/tkMacOSXXStubs.c
@@ -450,13 +450,14 @@ XChangeProperty(
     return Success;
 }
 
-void
+int
 XSelectInput(
     Display* display,
     Window w,
     long event_mask)
 {
     Debugger();
+    return Success;
 }
 
 int
@@ -515,11 +516,12 @@ XSendEvent(
     return 0;
 }
 
-void
+int
 XClearWindow(
     Display* display,
     Window w)
 {
+    return Success;
 }
 
 /*
@@ -531,6 +533,7 @@ XDrawPoint(
     int x,
     int y)
 {
+    return Success;
 }
 
 int
@@ -542,6 +545,7 @@ XDrawPoints(
     int npoints,
     int mode)
 {
+    return Success;
 }
 */
 
@@ -560,7 +564,7 @@ XWarpPointer(
     return Success;
 }
 
-void
+int
 XQueryColor(
     Display* display,
     Colormap colormap,
@@ -579,9 +583,10 @@ XQueryColor(
     d->blue	= (b << 8) | b;
     d->flags	= DoRed|DoGreen|DoBlue;
     d->pad	= 0;
+    return Success;
 }
 
-void
+int
 XQueryColors(
     Display* display,
     Colormap colormap,
@@ -604,6 +609,7 @@ XQueryColors(
 	d->flags	= DoRed|DoGreen|DoBlue;
 	d->pad		= 0;
     }
+    return Success;
 }
 
 int
@@ -642,15 +648,16 @@ XGetWindowProperty(
     return 0;
 }
 
-void
+int
 XRefreshKeyboardMapping(
     XMappingEvent *x)
 {
     /* used by tkXEvent.c */
     Debugger();
+    return Success;
 }
 
-void
+int
 XSetIconName(
     Display* display,
     Window w,
@@ -660,9 +667,10 @@ XSetIconName(
      * This is a no-op, no icon name for Macs.
      */
     display->request++;
+    return Success;
 }
 
-void
+int
 XForceScreenSaver(
     Display* display,
     int mode)
@@ -674,6 +682,7 @@ XForceScreenSaver(
      */
 
     display->request++;
+    return Success;
 }
 
 int
@@ -779,53 +788,59 @@ XChangeWindowAttributes(
     return Success;
 }
 
-void
+int
 XSetWindowBackground(
     Display *display,
     Window window,
     unsigned long value)
 {
+    return Success;
 }
 
-void
+int
 XSetWindowBackgroundPixmap(
     Display *display,
     Window w,
     Pixmap background_pixmap)
 {
+    return Success;
 }
 
-void
+int
 XSetWindowBorder(
     Display *display,
     Window w,
     unsigned long border_pixel)
 {
+    return Success;
 }
 
-void
+int
 XSetWindowBorderPixmap(
     Display *display,
     Window w,
     Pixmap border_pixmap)
 {
+    return Success;
 }
 
-void
+int
 XSetWindowBorderWidth(
     Display *display,
     Window w,
     unsigned int width)
 {
+    return Success;
 }
 
-void
+int
 XSetWindowColormap(
     Display *display,
     Window w,
     Colormap colormap)
 {
     Debugger();
+    return Success;
 }
 
 Status