diff options
author | culler <culler> | 2019-03-01 04:01:35 (GMT) |
---|---|---|
committer | culler <culler> | 2019-03-01 04:01:35 (GMT) |
commit | 9a7624a251fd36b48a24a2741790316f795aa89e (patch) | |
tree | 5adf7403872ba1b8c00bb5f12aabb5f952b0512d /generic | |
parent | cfb164ce628c937458881b4ebe5a81362a709086 (diff) | |
parent | 827393fdd0d40c400d800dbf3b042b48c8f3a692 (diff) | |
download | tk-9a7624a251fd36b48a24a2741790316f795aa89e.zip tk-9a7624a251fd36b48a24a2741790316f795aa89e.tar.gz tk-9a7624a251fd36b48a24a2741790316f795aa89e.tar.bz2 |
Fix bug 1951abf33d: Aqua sometimes segfaults when destroying a transient.
Diffstat (limited to 'generic')
-rw-r--r-- | generic/tkInt.decls | 2 | ||||
-rw-r--r-- | generic/tkIntPlatDecls.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/generic/tkInt.decls b/generic/tkInt.decls index d0b7678..a3e1f98 100644 --- a/generic/tkInt.decls +++ b/generic/tkInt.decls @@ -1009,7 +1009,7 @@ declare 47 aqua { Tk_Window TkMacOSXGetCapture(void) } declare 49 aqua { - Window TkGetTransientMaster(TkWindow *winPtr) + Tk_Window TkGetTransientMaster(TkWindow *winPtr) } declare 50 aqua { int TkGenerateButtonEvent(int x, int y, Window window, unsigned int state) diff --git a/generic/tkIntPlatDecls.h b/generic/tkIntPlatDecls.h index ded5ac5..26a5f46 100644 --- a/generic/tkIntPlatDecls.h +++ b/generic/tkIntPlatDecls.h @@ -243,7 +243,7 @@ EXTERN int TkpIsWindowFloating(void *window); EXTERN Tk_Window TkMacOSXGetCapture(void); /* Slot 48 is reserved */ /* 49 */ -EXTERN Window TkGetTransientMaster(TkWindow *winPtr); +EXTERN Tk_Window TkGetTransientMaster(TkWindow *winPtr); /* 50 */ EXTERN int TkGenerateButtonEvent(int x, int y, Window window, unsigned int state); @@ -392,7 +392,7 @@ typedef struct TkIntPlatStubs { int (*tkpIsWindowFloating) (void *window); /* 46 */ Tk_Window (*tkMacOSXGetCapture) (void); /* 47 */ void (*reserved48)(void); - Window (*tkGetTransientMaster) (TkWindow *winPtr); /* 49 */ + Tk_Window (*tkGetTransientMaster) (TkWindow *winPtr); /* 49 */ int (*tkGenerateButtonEvent) (int x, int y, Window window, unsigned int state); /* 50 */ void (*tkGenWMDestroyEvent) (Tk_Window tkwin); /* 51 */ void (*tkMacOSXSetDrawingEnabled) (TkWindow *winPtr, int flag); /* 52 */ |