Change XChangeWindowAttributes signature and many others to match Xorg, needed for Cygwin

1 files changed, 21 insertions, 11 deletions

diff --git a/win/tkWinWindow.c b/win/tkWinWindow.c
index 43ff0aa..3dfc078 100644
--- a/win/tkWinWindow.c
+++ b/win/tkWinWindow.c
@@ -297,7 +297,7 @@ TkpMakeWindow(
  *----------------------------------------------------------------------
  */
 
-void
+int
 XDestroyWindow(
     Display *display,
     Window w)
@@ -333,6 +333,7 @@ XDestroyWindow(
     if (hwnd != NULL && !(winPtr->flags & TK_DONT_DESTROY_WINDOW)) {
 	DestroyWindow(hwnd);
     }
+    return Success;
 }
 
 /*
@@ -351,7 +352,7 @@ XDestroyWindow(
  *----------------------------------------------------------------------
  */
 
-void
+int
 XMapWindow(
     Display *display,
     Window w)
@@ -375,7 +376,7 @@ XMapWindow(
 	for (parentPtr = winPtr->parentPtr; ;
 		parentPtr = parentPtr->parentPtr) {
 	    if ((parentPtr == NULL) || !(parentPtr->flags & TK_MAPPED)) {
-		return;
+		return Success;
 	    }
 	    if (parentPtr->flags & TK_TOP_HIERARCHY) {
 		break;
@@ -404,6 +405,7 @@ XMapWindow(
     event.xvisibility.window = winPtr->window;
     event.xvisibility.state = VisibilityUnobscured;
     NotifyVisibility(&event, winPtr);
+    return Success;
 }
 
 /*
@@ -459,7 +461,7 @@ NotifyVisibility(
  *----------------------------------------------------------------------
  */
 
-void
+int
 XUnmapWindow(
     Display *display,
     Window w)
@@ -487,6 +489,7 @@ XUnmapWindow(
 	event.xunmap.from_configure = False;
 	Tk_HandleEvent(&event);
     }
+    return Success;
 }
 
 /*
@@ -505,7 +508,7 @@ XUnmapWindow(
  *----------------------------------------------------------------------
  */
 
-void
+int
 XMoveResizeWindow(
     Display *display,
     Window w,
@@ -514,6 +517,7 @@ XMoveResizeWindow(
 {
     display->request++;
     MoveWindow(Tk_GetHWND(w), x, y, (int) width, (int) height, TRUE);
+    return Success;
 }
 
 /*
@@ -532,7 +536,7 @@ XMoveResizeWindow(
  *----------------------------------------------------------------------
  */
 
-void
+int
 XMoveWindow(
     Display *display,
     Window w,
@@ -544,6 +548,7 @@ XMoveWindow(
 
     MoveWindow(Tk_GetHWND(w), x, y, winPtr->changes.width,
 	    winPtr->changes.height, TRUE);
+    return Success;
 }
 
 /*
@@ -562,7 +567,7 @@ XMoveWindow(
  *----------------------------------------------------------------------
  */
 
-void
+int
 XResizeWindow(
     Display *display,
     Window w,
@@ -574,6 +579,7 @@ XResizeWindow(
 
     MoveWindow(Tk_GetHWND(w), winPtr->changes.x, winPtr->changes.y, (int)width,
 	    (int)height, TRUE);
+    return Success;
 }
 
 /*
@@ -592,7 +598,7 @@ XResizeWindow(
  *----------------------------------------------------------------------
  */
 
-void
+int
 XRaiseWindow(
     Display *display,
     Window w)
@@ -601,6 +607,7 @@ XRaiseWindow(
 
     display->request++;
     SetWindowPos(window, HWND_TOPMOST, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE);
+    return Success;
 }
 
 /*
@@ -622,7 +629,7 @@ XRaiseWindow(
  *----------------------------------------------------------------------
  */
 
-void
+int
 XConfigureWindow(
     Display *display,
     Window w,
@@ -657,6 +664,7 @@ XConfigureWindow(
 	}
 	TkWinSetWindowPos(hwnd, sibling, values->stack_mode);
     }
+    return Success;
 }
 
 /*
@@ -675,7 +683,7 @@ XConfigureWindow(
  *----------------------------------------------------------------------
  */
 
-void
+int
 XClearWindow(
     Display *display,
     Window w)
@@ -703,6 +711,7 @@ XClearWindow(
     DeleteObject(brush);
     SelectPalette(dc, oldPalette, TRUE);
     ReleaseDC(hwnd, dc);
+    return Success;
 }
 
 /*
@@ -723,7 +732,7 @@ XClearWindow(
  *----------------------------------------------------------------------
  */
 
-void
+int
 XChangeWindowAttributes(
     Display *display,
     Window w,
@@ -733,6 +742,7 @@ XChangeWindowAttributes(
     if (valueMask & CWCursor) {
 	XDefineCursor(display, w, attributes->cursor);
     }
+    return Success;
 }
 
 /*