summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2015-07-15 13:27:58 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2015-07-15 13:27:58 (GMT)
commit4f75be674fee3a89f9c8d99df95c2a9b668b8937 (patch)
tree3bd3f0be5db6b9f0f5314f32ac3b435e7008ccd0
parentdef76faf990796ed8c158a61bd05d4b64ad17984 (diff)
downloadtk-4f75be674fee3a89f9c8d99df95c2a9b668b8937.zip
tk-4f75be674fee3a89f9c8d99df95c2a9b668b8937.tar.gz
tk-4f75be674fee3a89f9c8d99df95c2a9b668b8937.tar.bz2
Fix signature of TkMacOSXSetDrawingEnabled(), re-generate tkIntPlatDecls.h and tkStubInit.c
-rw-r--r--generic/tkInt.decls2
-rw-r--r--generic/tkIntPlatDecls.h7
-rw-r--r--generic/tkStubInit.c2
3 files changed, 7 insertions, 4 deletions
diff --git a/generic/tkInt.decls b/generic/tkInt.decls
index 7921852..f24d48c 100644
--- a/generic/tkInt.decls
+++ b/generic/tkInt.decls
@@ -957,7 +957,7 @@ declare 51 aqua {
void TkGenWMDestroyEvent(Tk_Window tkwin)
}
declare 52 aqua {
- TkMacOSXSetDrawingEnabled(TkWindow *winPtr, int flag);
+ void TkMacOSXSetDrawingEnabled(TkWindow *winPtr, int flag)
}
# removed duplicate from tkPlat table (tk.decls)
diff --git a/generic/tkIntPlatDecls.h b/generic/tkIntPlatDecls.h
index 7654b5d..86127fe 100644
--- a/generic/tkIntPlatDecls.h
+++ b/generic/tkIntPlatDecls.h
@@ -723,7 +723,7 @@ typedef struct TkIntPlatStubs {
Window (*tkGetTransientMaster) (TkWindow *winPtr); /* 49 */
int (*tkGenerateButtonEvent) (int x, int y, Window window, unsigned int state); /* 50 */
void (*tkGenWMDestroyEvent) (Tk_Window tkwin); /* 51 */
- VOID *reserved52;
+ void (*tkMacOSXSetDrawingEnabled) (TkWindow *winPtr, int flag); /* 52 */
unsigned long (*tkpGetMS) (void); /* 53 */
VOID * (*tkMacOSXDrawable) (Drawable drawable); /* 54 */
int (*tkpScanWindowId) (Tcl_Interp *interp, CONST char *string, Window *idPtr); /* 55 */
@@ -1129,7 +1129,10 @@ extern TkIntPlatStubs *tkIntPlatStubsPtr;
#define TkGenWMDestroyEvent \
(tkIntPlatStubsPtr->tkGenWMDestroyEvent) /* 51 */
#endif
-/* Slot 52 is reserved */
+#ifndef TkMacOSXSetDrawingEnabled
+#define TkMacOSXSetDrawingEnabled \
+ (tkIntPlatStubsPtr->tkMacOSXSetDrawingEnabled) /* 52 */
+#endif
#ifndef TkpGetMS
#define TkpGetMS \
(tkIntPlatStubsPtr->tkpGetMS) /* 53 */
diff --git a/generic/tkStubInit.c b/generic/tkStubInit.c
index 3ee54dd..90a124f 100644
--- a/generic/tkStubInit.c
+++ b/generic/tkStubInit.c
@@ -588,7 +588,7 @@ TkIntPlatStubs tkIntPlatStubs = {
TkGetTransientMaster, /* 49 */
TkGenerateButtonEvent, /* 50 */
TkGenWMDestroyEvent, /* 51 */
- NULL, /* 52 */
+ TkMacOSXSetDrawingEnabled, /* 52 */
TkpGetMS, /* 53 */
TkMacOSXDrawable, /* 54 */
TkpScanWindowId, /* 55 */