Patch: fix tk so that it compiles under mingw

Patch: fix tk so that it compiles under mingw

[Mo DeJong]

Here is a minor patch that allows Tk to be compiled under mingw.

cheers
Mo

2002-11-09  Mo DeJong  <mdejong@uncounted.org>

	* win/tkWinDialog.c (ChooseDirectoryHookProc):
	Use the _T macro instead of __TEXT since it
	works with VC++ and mingw. Newer releases of
	Tk make use of _T.

Index: win/tkWinDialog.c
===================================================================
RCS file: /cvs/src/src/tk/win/tkWinDialog.c,v
retrieving revision 1.4
diff -u -r1.4 tkWinDialog.c
--- win/tkWinDialog.c	24 Sep 2002 18:39:30 -0000	1.4
+++ win/tkWinDialog.c	10 Nov 2002 01:41:34 -0000
@@ -1523,7 +1523,7 @@
 		     * Directory must exist.  Complain, then rehighlight text.
 		     */
 
-		    wsprintf(tmp, __TEXT("Cannot change directory to \"%.200s\"."), 
+		    wsprintf(tmp, _T("Cannot change directory to \"%.200s\"."), 
 			    cdPtr->path);
 		    MessageBox(hwnd, tmp, NULL, MB_OK);
 		    SendDlgItemMessage(hwnd, edt10, EM_SETSEL, 0, -1);

Re: Patch: fix tk so that it compiles under mingw

[Keith Seitz]

On Sun, 10 Nov 2002, Mo DeJong wrote:

> Index: win/tkWinDialog.c
> ===================================================================
> RCS file: /cvs/src/src/tk/win/tkWinDialog.c,v
> retrieving revision 1.4
> diff -u -r1.4 tkWinDialog.c
> --- win/tkWinDialog.c	24 Sep 2002 18:39:30 -0000	1.4
> +++ win/tkWinDialog.c	10 Nov 2002 01:41:34 -0000
> @@ -1523,7 +1523,7 @@
>  		     * Directory must exist.  Complain, then rehighlight text.
>  		     */
>  
> -		    wsprintf(tmp, __TEXT("Cannot change directory to \"%.200s\"."), 
> +		    wsprintf(tmp, _T("Cannot change directory to \"%.200s\"."), 
>  			    cdPtr->path);
>  		    MessageBox(hwnd, tmp, NULL, MB_OK);
>  		    SendDlgItemMessage(hwnd, edt10, EM_SETSEL, 0, -1);

This patch does not build:

Creating library file: libcygtk83.a
tkWinDIalog.o(.text+0x25a9): In function `ChooseDirectoryHookProc':
/home/keiths/ref/cygwin/tk/win/../../../src/tk/win/tkWinDialog.c:1526: 
undefined reference to `__T'
collect2: ld returned 1 exit status

This is with gcc 3.2 20020927 (latest from setup).

Keith

Re: Patch: fix tk so that it compiles under mingw

[Mo DeJong]

On Fri, 22 Nov 2002 12:43:11 -0800 (PST)
Keith Seitz <keiths@redhat.com> wrote:

> This patch does not build:
> 
> Creating library file: libcygtk83.a
> tkWinDIalog.o(.text+0x25a9): In function `ChooseDirectoryHookProc':
> /home/keiths/ref/cygwin/tk/win/../../../src/tk/win/tkWinDialog.c:1526: 
> undefined reference to `__T'
> collect2: ld returned 1 exit status

I just tried this myself and it looks like _T is defined in the tchar.h file for
Mingw. Since this is not used in Cygwin, it seems like to right thing to
do is use the TEXT() macro instead. The headers state that __TEXT should
not be used, so this seems better.

2003-01-13  Mo DeJong  <mdejong@uncounted.org>

	* win/tkWinDialog.c (ChooseDirectoryHookProc):
	Use TEXT macro instead of __TEXT, this should
	work with VC++, Mingw, and Cygwin.

Index: win/tkWinDialog.c
===================================================================
RCS file: /cvs/src/src/tk/win/tkWinDialog.c,v
retrieving revision 1.4
diff -u -r1.4 tkWinDialog.c
--- win/tkWinDialog.c	24 Sep 2002 18:39:30 -0000	1.4
+++ win/tkWinDialog.c	14 Jan 2003 01:10:19 -0000
@@ -1523,7 +1523,7 @@
 		     * Directory must exist.  Complain, then rehighlight text.
 		     */
 
-		    wsprintf(tmp, __TEXT("Cannot change directory to \"%.200s\"."), 
+		    wsprintf(tmp, TEXT("Cannot change directory to \"%.200s\"."), 
 			    cdPtr->path);
 		    MessageBox(hwnd, tmp, NULL, MB_OK);
 		    SendDlgItemMessage(hwnd, edt10, EM_SETSEL, 0, -1);