From 7c1acea352995895a3152bfa54230a3b6e3091f6 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Mon, 8 Apr 2019 21:20:37 +0000
Subject: Put new fields always at the end of struct TkWindow, so existing
 fields keep the same offset in the struct: We don't want to recompile Tk
 extensions using tkInt.h directly ....

---
 generic/tk.h    | 16 ++++++++--------
 generic/tkInt.h | 10 +++++-----
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/generic/tk.h b/generic/tk.h
index ba099ca..9312235 100644
--- a/generic/tk.h
+++ b/generic/tk.h
@@ -676,7 +676,7 @@ typedef struct {
 				 * request. */
     Display *display;		/* Display the event was read from. */
     Window event;		/* Window on which event was requested. */
-    Window root;		/* Root window that the event occured on. */
+    Window root;		/* Root window that the event occurred on. */
     Window subwindow;		/* Child window. */
     Time time;			/* Milliseconds. */
     int x, y;			/* Pointer x, y coordinates in event
@@ -802,22 +802,22 @@ typedef struct Tk_FakeWin {
     char *dummy13;		/* selHandlerList */
     char *dummy14;		/* geomMgrPtr */
     ClientData dummy15;		/* geomData */
-    char *dummy16;		/* geomMgrName */
-    Tk_Window dummy17;		/* maintainerPtr */
     int reqWidth, reqHeight;
     int internalBorderLeft;
-    char *dummy18;		/* wmInfoPtr */
-    char *dummy19;		/* classProcPtr */
-    ClientData dummy20;		/* instanceData */
-    char *dummy21;		/* privatePtr */
+    char *dummy16;		/* wmInfoPtr */
+    char *dummy17;		/* classProcPtr */
+    ClientData dummy18;		/* instanceData */
+    char *dummy19;		/* privatePtr */
     int internalBorderRight;
     int internalBorderTop;
     int internalBorderBottom;
     int minReqWidth;
     int minReqHeight;
 #ifdef TK_USE_INPUT_METHODS
-    int dummy22;
+    int dummy20;
 #endif /* TK_USE_INPUT_METHODS */
+    char *dummy21;		/* geomMgrName */
+    Tk_Window dummy22;		/* maintainerPtr */
 } Tk_FakeWin;
 
 /*
diff --git a/generic/tkInt.h b/generic/tkInt.h
index df0f645..a80d209 100644
--- a/generic/tkInt.h
+++ b/generic/tkInt.h
@@ -772,11 +772,6 @@ typedef struct TkWindow {
 				/* Information about geometry manager for this
 				 * window. */
     ClientData geomData;	/* Argument for geometry manager functions. */
-    char *geomMgrName;          /* Records the name of the geometry manager. */
-    struct TkWindow *maintainerPtr;
-                                /* The geometry master for this window. The
-				 * value is NULL if the window has no master or
-				 * if its master is its parent. */
     int reqWidth, reqHeight;	/* Arguments from last call to
 				 * Tk_GeometryRequest, or 0's if
 				 * Tk_GeometryRequest hasn't been called. */
@@ -823,6 +818,11 @@ typedef struct TkWindow {
 #ifdef TK_USE_INPUT_METHODS
     int ximGeneration;          /* Used to invalidate XIC */
 #endif /* TK_USE_INPUT_METHODS */
+    char *geomMgrName;          /* Records the name of the geometry manager. */
+    struct TkWindow *maintainerPtr;
+				/* The geometry master for this window. The
+				 * value is NULL if the window has no master or
+				 * if its master is its parent. */
 } TkWindow;
 
 /*
-- 
cgit v0.12