diff options
author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2012-05-24 21:32:46 (GMT) |
---|---|---|
committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2012-05-24 21:32:46 (GMT) |
commit | 83b2a657b13a11a640d2713f031c63a514360f1d (patch) | |
tree | 646ef2213f4b8f36eb5ff5deb37ecefabeaa1a45 /win | |
parent | 31f8fd62815ade2416fca697fea79938ab61d230 (diff) | |
parent | 20ae5845bf5393c40ddd12145483e4c6af9ef77e (diff) | |
download | tk-83b2a657b13a11a640d2713f031c63a514360f1d.zip tk-83b2a657b13a11a640d2713f031c63a514360f1d.tar.gz tk-83b2a657b13a11a640d2713f031c63a514360f1d.tar.bz2 |
Change XSetCommand signature to match Xorg, needed for Cygwin
Diffstat (limited to 'win')
-rw-r--r-- | win/Makefile.in | 6 | ||||
-rw-r--r-- | win/stubs.c | 2 | ||||
-rw-r--r-- | win/tkWinWm.c | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/win/Makefile.in b/win/Makefile.in index 431b5cc..247e183 100644 --- a/win/Makefile.in +++ b/win/Makefile.in @@ -709,10 +709,10 @@ $(GENERIC_DIR)/tkStubInit.c: $(GENERIC_DIR)/tk.decls \ @echo "This warning can be safely ignored, do not report as a bug!" genstubs: - $(TCL_EXE) "$(TCL_TOOL_DIR)\genStubs.tcl" \ + $(TCL_EXE) "$(TCL_TOOL_DIR)/genStubs.tcl" \ "$(GENERIC_DIR_NATIVE)" \ - "$(GENERIC_DIR_NATIVE)\tk.decls" \ - "$(GENERIC_DIR_NATIVE)\tkInt.decls" + "$(GENERIC_DIR_NATIVE)/tk.decls" \ + "$(GENERIC_DIR_NATIVE)/tkInt.decls" $(TCL_EXE) "$(TTK_DIR)/ttkGenStubs.tcl" \ "$(TTK_DIR)" \ "$(TTK_DIR)/ttk.decls" diff --git a/win/stubs.c b/win/stubs.c index 7e26d4b..00030d1 100644 --- a/win/stubs.c +++ b/win/stubs.c @@ -252,7 +252,7 @@ void XSetCommand( Display *display, Window w, - const char **argv, + char **argv, int argc) { } diff --git a/win/tkWinWm.c b/win/tkWinWm.c index 1dd2bcd..45ccbe2 100644 --- a/win/tkWinWm.c +++ b/win/tkWinWm.c @@ -3503,7 +3503,7 @@ WmCommandCmd( wmPtr->cmdArgc = cmdArgc; wmPtr->cmdArgv = cmdArgv; if (!(wmPtr->flags & WM_NEVER_MAPPED)) { - XSetCommand(winPtr->display, winPtr->window, cmdArgv, cmdArgc); + XSetCommand(winPtr->display, winPtr->window, (char **) cmdArgv, cmdArgc); } return TCL_OK; } |