From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <insight-return-3980-listarch-insight=sources.redhat.com@sources.redhat.com>
Received: (qmail 11533 invoked by alias); 14 Jan 2003 01:26:41 -0000
Mailing-List: contact insight-help@sources.redhat.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:insight-subscribe@sources.redhat.com>
List-Archive: <http://sources.redhat.com/ml/insight/>
List-Post: <mailto:insight@sources.redhat.com>
List-Help: <mailto:insight-help@sources.redhat.com>, <http://sources.redhat.com/ml/#faqs>
Sender: insight-owner@sources.redhat.com
Received: (qmail 11525 invoked from network); 14 Jan 2003 01:26:40 -0000
Received: from unknown (HELO mta5.snfc21.pbi.net) (206.13.28.241)
  by 209.249.29.67 with SMTP; 14 Jan 2003 01:26:40 -0000
Received: from modrick ([66.120.11.181])
 by mta5.snfc21.pbi.net (iPlanet Messaging Server 5.1 HotFix 1.6 (built Oct 18
 2002)) with SMTP id <0H8O00K43JZELX@mta5.snfc21.pbi.net> for
 insight@sources.redhat.com; Mon, 13 Jan 2003 17:26:02 -0800 (PST)
Date: Tue, 14 Jan 2003 01:26:00 -0000
From: Mo DeJong <mdejong@uncounted.org>
Subject: Re: Patch: fix tk so that it compiles under mingw
In-reply-to: <Pine.LNX.4.44.0211221240430.1555-100000@valrhona.uglyboxes.com>
To: insight@sources.redhat.com
Message-id: <20030113172818.00e63e48.mdejong@uncounted.org>
MIME-version: 1.0
Content-type: text/plain; charset=US-ASCII
Content-transfer-encoding: 7bit
References: <20021110105124.13c0c1fd.mdejong@uncounted.org>
 <Pine.LNX.4.44.0211221240430.1555-100000@valrhona.uglyboxes.com>
X-SW-Source: 2003-q1/txt/msg00017.txt.bz2

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);