summaryrefslogtreecommitdiffstats
path: root/generic/tkStubInit.c
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2019-09-25 17:51:31 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2019-09-25 17:51:31 (GMT)
commit238a90e4af0d54a079f512e7162a8bdc60ebc5db (patch)
treecbe0f9f1b1175cec0464ffc14205c8d42bddb4ed /generic/tkStubInit.c
parentbaec2f6958d7f6e66f267e6c42e2fac04056ce30 (diff)
parent4f50f28c932648028f5e4056ea7fcd0fcf84b670 (diff)
downloadtk-238a90e4af0d54a079f512e7162a8bdc60ebc5db.zip
tk-238a90e4af0d54a079f512e7162a8bdc60ebc5db.tar.gz
tk-238a90e4af0d54a079f512e7162a8bdc60ebc5db.tar.bz2
Merge trunk
Diffstat (limited to 'generic/tkStubInit.c')
-rw-r--r--generic/tkStubInit.c19
1 files changed, 11 insertions, 8 deletions
diff --git a/generic/tkStubInit.c b/generic/tkStubInit.c
index 8646d44..30ba0de 100644
--- a/generic/tkStubInit.c
+++ b/generic/tkStubInit.c
@@ -212,6 +212,7 @@ void TkSubtractRegion (TkRegion a, TkRegion b, TkRegion c)
# define TkAlignImageData 0
# define TkGenerateActivateEvents 0
# define TkpGetMS 0
+# define TkpGetCapture 0
# define TkPointerDeadWindow 0
# define TkpSetCapture 0
# define TkpSetCursor 0
@@ -547,6 +548,8 @@ static const TkIntPlatStubs tkIntPlatStubs = {
TkWmCleanup, /* 43 */
TkSendCleanup, /* 44 */
TkpTestsendCmd, /* 45 */
+ 0, /* 46 */
+ TkpGetCapture, /* 47 */
#endif /* WIN */
#ifdef MAC_OSX_TK /* AQUA */
TkGenerateActivateEvents, /* 0 */
@@ -596,7 +599,7 @@ static const TkIntPlatStubs tkIntPlatStubs = {
TkMacOSXGetHostToplevel, /* 44 */
TkMacOSXPreprocessMenu, /* 45 */
TkpIsWindowFloating, /* 46 */
- TkMacOSXGetCapture, /* 47 */
+ TkpGetCapture, /* 47 */
0, /* 48 */
TkGetTransientMaster, /* 49 */
TkGenerateButtonEvent, /* 50 */
@@ -881,14 +884,14 @@ static const TkIntXlibStubs tkIntXlibStubs = {
0, /* 104 */
0, /* 105 */
0, /* 106 */
- 0, /* 107 */
- 0, /* 108 */
- 0, /* 109 */
- 0, /* 110 */
- 0, /* 111 */
- 0, /* 112 */
+ XFlush, /* 107 */
+ XGrabServer, /* 108 */
+ XUngrabServer, /* 109 */
+ XFree, /* 110 */
+ XNoOp, /* 111 */
+ XSynchronize, /* 112 */
0, /* 113 */
- 0, /* 114 */
+ XVisualIDFromVisual, /* 114 */
0, /* 115 */
0, /* 116 */
0, /* 117 */