Merge 8.6

4 files changed, 23 insertions, 14 deletions

diff --git a/generic/tkInt.decls b/generic/tkInt.decls
index 14ab250..c39cd16 100644
--- a/generic/tkInt.decls
+++ b/generic/tkInt.decls
@@ -1844,6 +1844,9 @@ declare 112 aqua {
 declare 114 aqua {
     VisualID XVisualIDFromVisual(Visual *visual)
 }
+declare 120 macosx {
+    int XOffsetRegion(void *rgn, int dx, int dy)
+}
 declare 129 aqua {
     int XLowerWindow(Display *d, Window w)
 }
@@ -1864,6 +1867,9 @@ declare 146 aqua {
 	    unsigned int ui1, unsigned int ui2, XColor _Xconst *x1,
 	    XColor _Xconst *x2)
 }
+declare 157 macosx {
+    KeySym XkbKeycodeToKeysym(Display *d, unsigned int k, int g, int i)
+}
 declare 158 aqua {
     void TkUnusedStubEntry(void)
 }
diff --git a/generic/tkIntXlibDecls.h b/generic/tkIntXlibDecls.h
index 7c5d815..5d8f00e 100644
--- a/generic/tkIntXlibDecls.h
+++ b/generic/tkIntXlibDecls.h
@@ -734,7 +734,8 @@ EXTERN VisualID		XVisualIDFromVisual(Visual *visual);
 /* Slot 117 is reserved */
 /* Slot 118 is reserved */
 /* Slot 119 is reserved */
-/* Slot 120 is reserved */
+/* 120 */
+EXTERN int		XOffsetRegion(void *rgn, int dx, int dy);
 /* Slot 121 is reserved */
 /* Slot 122 is reserved */
 /* Slot 123 is reserved */
@@ -782,7 +783,9 @@ EXTERN Cursor		XCreateGlyphCursor(Display *d, Font f1, Font f2,
 /* Slot 154 is reserved */
 /* Slot 155 is reserved */
 /* Slot 156 is reserved */
-/* Slot 157 is reserved */
+/* 157 */
+EXTERN KeySym		XkbKeycodeToKeysym(Display *d, unsigned int k, int g,
+				int i);
 /* 158 */
 EXTERN void		TkUnusedStubEntry(void);
 #endif /* AQUA */
@@ -1073,7 +1076,7 @@ typedef struct TkIntXlibStubs {
     void (*reserved117)(void);
     void (*reserved118)(void);
     void (*reserved119)(void);
-    void (*reserved120)(void);
+    int (*xOffsetRegion) (void *rgn, int dx, int dy); /* 120 */
     void (*reserved121)(void);
     void (*reserved122)(void);
     void (*reserved123)(void);
@@ -1110,7 +1113,7 @@ typedef struct TkIntXlibStubs {
     void (*reserved154)(void);
     void (*reserved155)(void);
     void (*reserved156)(void);
-    void (*reserved157)(void);
+    KeySym (*xkbKeycodeToKeysym) (Display *d, unsigned int k, int g, int i); /* 157 */
     void (*tkUnusedStubEntry) (void); /* 158 */
 #endif /* AQUA */
 } TkIntXlibStubs;
@@ -1635,7 +1638,8 @@ extern const TkIntXlibStubs *tkIntXlibStubsPtr;
 /* Slot 117 is reserved */
 /* Slot 118 is reserved */
 /* Slot 119 is reserved */
-/* Slot 120 is reserved */
+#define XOffsetRegion \
+	(tkIntXlibStubsPtr->xOffsetRegion) /* 120 */
 /* Slot 121 is reserved */
 /* Slot 122 is reserved */
 /* Slot 123 is reserved */
@@ -1677,7 +1681,8 @@ extern const TkIntXlibStubs *tkIntXlibStubsPtr;
 /* Slot 154 is reserved */
 /* Slot 155 is reserved */
 /* Slot 156 is reserved */
-/* Slot 157 is reserved */
+#define XkbKeycodeToKeysym \
+	(tkIntXlibStubsPtr->xkbKeycodeToKeysym) /* 157 */
 #define TkUnusedStubEntry \
 	(tkIntXlibStubsPtr->tkUnusedStubEntry) /* 158 */
 #endif /* AQUA */
diff --git a/generic/tkScale.c b/generic/tkScale.c
index 5957b00..825f661 100644
--- a/generic/tkScale.c
+++ b/generic/tkScale.c
@@ -658,13 +658,11 @@ ConfigureScale(
 	    }
 	}
 
-	/*
-	 * Several options need special processing, such as parsing the
-	 * orientation and creating GCs.
-	 */
+        /*
+         * The fromValue shall not be rounded to the resolution, but the
+         * toValue and tickInterval do.
+         */
 
-	scalePtr->fromValue = TkRoundValueToResolution(scalePtr,
-		scalePtr->fromValue);
 	scalePtr->toValue = TkRoundValueToResolution(scalePtr, scalePtr->toValue);
 	scalePtr->tickInterval = TkRoundIntervalToResolution(scalePtr,
 		scalePtr->tickInterval);
diff --git a/generic/tkStubInit.c b/generic/tkStubInit.c
index ab8b675..9a6a0e8 100644
--- a/generic/tkStubInit.c
+++ b/generic/tkStubInit.c
@@ -953,7 +953,7 @@ static const TkIntXlibStubs tkIntXlibStubs = {
     0, /* 117 */
     0, /* 118 */
     0, /* 119 */
-    0, /* 120 */
+    XOffsetRegion, /* 120 */
     0, /* 121 */
     0, /* 122 */
     0, /* 123 */
@@ -990,7 +990,7 @@ static const TkIntXlibStubs tkIntXlibStubs = {
     0, /* 154 */
     0, /* 155 */
     0, /* 156 */
-    0, /* 157 */
+    XkbKeycodeToKeysym, /* 157 */
     TkUnusedStubEntry, /* 158 */
 #endif /* AQUA */
 };