From 2d9b29197a1dbb4d152e669eb2e51f156a2c29cd Mon Sep 17 00:00:00 2001 From: nijtmans Date: Fri, 10 Sep 2010 08:59:24 +0000 Subject: Make compilable with -DUNICODE, or mark files with a TODO which are not done yet. tkWinPort.h: mingw/cygwin fixes: should always be included here. --- ChangeLog | 17 +++++++++++++++++ win/tkWinClipboard.c | 8 +++++++- win/tkWinColor.c | 8 +++++++- win/tkWinCursor.c | 8 +++++++- win/tkWinDialog.c | 8 +++++++- win/tkWinEmbed.c | 4 ++-- win/tkWinFont.c | 8 +++++++- win/tkWinMenu.c | 8 +++++++- win/tkWinPixmap.c | 8 +++++++- win/tkWinPort.h | 14 ++++++-------- win/tkWinTest.c | 18 +++++++++++------- win/tkWinWm.c | 8 +++++++- win/tkWinX.c | 8 +++++++- win/winMain.c | 8 +++++++- 14 files changed, 106 insertions(+), 27 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0c6e127..fb47146 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,20 @@ +2010-09-10 Jan Nijtmans + + * win/tkWinEmbed.c: Make compilable with -DUNICODE + * win/tkWinClipboard.c: Mark those files as not compilable with + * win/tkWinColor.c: -DUNICODE, so add a TODO. + * win/tkWinCursor.c: + * win/tkWinDialog.c: + * win/tkWinFont.c: + * win/tkWinMenu.c: + * win/tkWinPixmap.c: + * win/tkWinTest.c: + * win/tkWinWm.c: + * win/tkWinX.c: + * win/winMain.c: + * win/tkWinPort.h: mingw/cygwin fixes: should always + be included here. + 2010-09-09 Jan Nijtmans * win/rules.vc: (sync with tcl version) diff --git a/win/tkWinClipboard.c b/win/tkWinClipboard.c index db8c011..d9b7af3 100644 --- a/win/tkWinClipboard.c +++ b/win/tkWinClipboard.c @@ -9,9 +9,15 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkWinClipboard.c,v 1.11 2009/08/02 21:40:17 nijtmans Exp $ + * RCS: @(#) $Id: tkWinClipboard.c,v 1.12 2010/09/10 08:59:25 nijtmans Exp $ */ +/* TODO: This file does not compile in UNICODE mode. + * See [Freq 2965056]: Windows build with -DUNICODE + */ +#undef UNICODE +#undef _UNICODE + #include "tkWinInt.h" #include "tkSelect.h" diff --git a/win/tkWinColor.c b/win/tkWinColor.c index f18538d..2e88013 100644 --- a/win/tkWinColor.c +++ b/win/tkWinColor.c @@ -9,9 +9,15 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkWinColor.c,v 1.15 2010/02/19 22:39:04 nijtmans Exp $ + * RCS: @(#) $Id: tkWinColor.c,v 1.16 2010/09/10 08:59:26 nijtmans Exp $ */ +/* TODO: This file does not compile in UNICODE mode. + * See [Freq 2965056]: Windows build with -DUNICODE + */ +#undef UNICODE +#undef _UNICODE + #include "tkWinInt.h" #include "tkColor.h" diff --git a/win/tkWinCursor.c b/win/tkWinCursor.c index a3d534e..a8df6a3 100644 --- a/win/tkWinCursor.c +++ b/win/tkWinCursor.c @@ -8,9 +8,15 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkWinCursor.c,v 1.18 2009/02/22 23:39:11 patthoyts Exp $ + * RCS: @(#) $Id: tkWinCursor.c,v 1.19 2010/09/10 08:59:25 nijtmans Exp $ */ +/* TODO: This file does not compile in UNICODE mode. + * See [Freq 2965056]: Windows build with -DUNICODE + */ +#undef UNICODE +#undef _UNICODE + #include "tkWinInt.h" /* diff --git a/win/tkWinDialog.c b/win/tkWinDialog.c index 592559d..97248bc 100644 --- a/win/tkWinDialog.c +++ b/win/tkWinDialog.c @@ -8,10 +8,16 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkWinDialog.c,v 1.75 2010/05/17 22:16:52 nijtmans Exp $ + * RCS: @(#) $Id: tkWinDialog.c,v 1.76 2010/09/10 08:59:26 nijtmans Exp $ * */ +/* TODO: This file does not compile in UNICODE mode. + * See [Freq 2965056]: Windows build with -DUNICODE + */ +#undef UNICODE +#undef _UNICODE + #define WINVER 0x0500 /* Requires Windows 2K definitions */ #define _WIN32_WINNT 0x0500 #include "tkWinInt.h" diff --git a/win/tkWinEmbed.c b/win/tkWinEmbed.c index 814a163..1156751 100644 --- a/win/tkWinEmbed.c +++ b/win/tkWinEmbed.c @@ -11,7 +11,7 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkWinEmbed.c,v 1.36 2010/01/13 23:08:11 nijtmans Exp $ + * RCS: @(#) $Id: tkWinEmbed.c,v 1.37 2010/09/10 08:59:25 nijtmans Exp $ */ #include "tkWinInt.h" @@ -300,7 +300,7 @@ TkpUseWindow( char msg[256]; sprintf(msg, "Unable to get information of window \"%.80s\". Attach to this\nwindow may have unpredictable results if it is not a valid container.\n\nPress Ok to proceed or Cancel to abort attaching.", string); - if (IDCANCEL == MessageBox(hwnd, msg, "Tk Warning", + if (IDCANCEL == MessageBoxA(hwnd, msg, "Tk Warning", MB_OKCANCEL | MB_ICONWARNING)) { Tcl_SetResult(interp, "Operation has been canceled", TCL_STATIC); return TCL_ERROR; diff --git a/win/tkWinFont.c b/win/tkWinFont.c index 1914a92..574e5e2 100644 --- a/win/tkWinFont.c +++ b/win/tkWinFont.c @@ -11,9 +11,15 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkWinFont.c,v 1.50 2010/04/29 15:28:04 nijtmans Exp $ + * RCS: @(#) $Id: tkWinFont.c,v 1.51 2010/09/10 08:59:26 nijtmans Exp $ */ +/* TODO: This file does not compile in UNICODE mode. + * See [Freq 2965056]: Windows build with -DUNICODE + */ +#undef UNICODE +#undef _UNICODE + #include "tkWinInt.h" #include "tkFont.h" diff --git a/win/tkWinMenu.c b/win/tkWinMenu.c index fe2024c..367d916 100644 --- a/win/tkWinMenu.c +++ b/win/tkWinMenu.c @@ -10,9 +10,15 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkWinMenu.c,v 1.73 2010/05/10 20:58:18 nijtmans Exp $ + * RCS: @(#) $Id: tkWinMenu.c,v 1.74 2010/09/10 08:59:25 nijtmans Exp $ */ +/* TODO: This file does not compile in UNICODE mode. + * See [Freq 2965056]: Windows build with -DUNICODE + */ +#undef UNICODE +#undef _UNICODE + #define WINVER 0x0500 /* Requires Windows 2K definitions */ #define _WIN32_WINNT 0x0500 #define OEMRESOURCE diff --git a/win/tkWinPixmap.c b/win/tkWinPixmap.c index 82bc7e9..a7f6723 100644 --- a/win/tkWinPixmap.c +++ b/win/tkWinPixmap.c @@ -9,9 +9,15 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkWinPixmap.c,v 1.10 2010/01/13 23:08:12 nijtmans Exp $ + * RCS: @(#) $Id: tkWinPixmap.c,v 1.11 2010/09/10 08:59:25 nijtmans Exp $ */ +/* TODO: This file does not compile in UNICODE mode. + * See [Freq 2965056]: Windows build with -DUNICODE + */ +#undef UNICODE +#undef _UNICODE + #include "tkWinInt.h" /* diff --git a/win/tkWinPort.h b/win/tkWinPort.h index 4146914..68dfe8b 100644 --- a/win/tkWinPort.h +++ b/win/tkWinPort.h @@ -10,7 +10,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkWinPort.h,v 1.16 2010/04/20 08:17:33 nijtmans Exp $ + * RCS: @(#) $Id: tkWinPort.h,v 1.17 2010/09/10 08:59:26 nijtmans Exp $ */ #ifndef _WINPORT @@ -54,13 +54,11 @@ /* * Pull in the typedef of TCHAR for windows. */ -#if !defined(_TCHAR_DEFINED) -# include -# ifndef _TCHAR_DEFINED - /* Borland seems to forget to set this. */ - typedef _TCHAR TCHAR; -# define _TCHAR_DEFINED -# endif +#include +#ifndef _TCHAR_DEFINED + /* Borland seems to forget to set this. */ + typedef _TCHAR TCHAR; +# define _TCHAR_DEFINED #endif #include diff --git a/win/tkWinTest.c b/win/tkWinTest.c index edd3338..e074283 100644 --- a/win/tkWinTest.c +++ b/win/tkWinTest.c @@ -11,15 +11,19 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkWinTest.c,v 1.32 2010/09/09 14:59:24 nijtmans Exp $ + * RCS: @(#) $Id: tkWinTest.c,v 1.33 2010/09/10 08:59:27 nijtmans Exp $ */ -#ifndef USE_TCL_STUBS -# define USE_TCL_STUBS -#endif -#ifndef USE_TK_STUBS -# define USE_TK_STUBS -#endif +/* TODO: This file does not compile in UNICODE mode. + * See [Freq 2965056]: Windows build with -DUNICODE + */ +#undef UNICODE +#undef _UNICODE + +#undef USE_TCL_STUBS +#define USE_TCL_STUBS +#undef USE_TK_STUBS +#define USE_TK_STUBS #include "tkWinInt.h" HWND tkWinCurrentDialog; diff --git a/win/tkWinWm.c b/win/tkWinWm.c index ce9b618..ad7f3ca 100644 --- a/win/tkWinWm.c +++ b/win/tkWinWm.c @@ -12,9 +12,15 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkWinWm.c,v 1.143 2010/04/29 15:28:04 nijtmans Exp $ + * RCS: @(#) $Id: tkWinWm.c,v 1.144 2010/09/10 08:59:25 nijtmans Exp $ */ +/* TODO: This file does not compile in UNICODE mode. + * See [Freq 2965056]: Windows build with -DUNICODE + */ +#undef UNICODE +#undef _UNICODE + #include "tkWinInt.h" #include diff --git a/win/tkWinX.c b/win/tkWinX.c index cc39b90..1de32fc 100644 --- a/win/tkWinX.c +++ b/win/tkWinX.c @@ -10,9 +10,15 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkWinX.c,v 1.66 2010/09/09 14:59:24 nijtmans Exp $ + * RCS: @(#) $Id: tkWinX.c,v 1.67 2010/09/10 08:59:26 nijtmans Exp $ */ +/* TODO: This file does not compile in UNICODE mode. + * See [Freq 2965056]: Windows build with -DUNICODE + */ +#undef UNICODE +#undef _UNICODE + /* * Make sure the SendInput API is available (NT SP 3): */ diff --git a/win/winMain.c b/win/winMain.c index b42e05e..ab7fdc5 100644 --- a/win/winMain.c +++ b/win/winMain.c @@ -9,9 +9,15 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: winMain.c,v 1.29 2010/01/22 14:17:53 nijtmans Exp $ + * RCS: @(#) $Id: winMain.c,v 1.30 2010/09/10 08:59:24 nijtmans Exp $ */ +/* TODO: This file does not compile in UNICODE mode. + * See [Freq 2965056]: Windows build with -DUNICODE + */ +#undef UNICODE +#undef _UNICODE + /* Make sure this file is never compiled with Stubs! */ #undef USE_TCL_STUBS #undef USE_TK_STUBS -- cgit v0.12