rpms/wxGTK/FC-5 wxGTK-2.6.3.2-cvs.patch,NONE,1.1

Fri Apr 14 14:08:19 UTC 2006

Author: mattdm

Update of /cvs/extras/rpms/wxGTK/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28271

Added Files:
	wxGTK-2.6.3.2-cvs.patch 
Log Message:
checking in patch -- forgot to a second ago.


wxGTK-2.6.3.2-cvs.patch:

--- NEW FILE wxGTK-2.6.3.2-cvs.patch ---
diff -ur wxGTK-2.6.3/configure wxGTK-2.6.3.2/configure
--- wxGTK-2.6.3/configure	2006-03-21 18:42:05.000000000 -0500
+++ wxGTK-2.6.3.2/configure	2006-03-30 12:05:51.000000000 -0500
@@ -1669,7 +1669,7 @@
 wx_major_version_number=2
 wx_minor_version_number=6
 wx_release_number=3
-wx_subrelease_number=1
+wx_subrelease_number=2
 
 WX_RELEASE=$wx_major_version_number.$wx_minor_version_number
 WX_VERSION=$WX_RELEASE.$wx_release_number
diff -ur wxGTK-2.6.3/configure.in wxGTK-2.6.3.2/configure.in
--- wxGTK-2.6.3/configure.in	2006-03-21 18:42:05.000000000 -0500
+++ wxGTK-2.6.3.2/configure.in	2006-03-30 12:05:49.000000000 -0500
@@ -1,5 +1,5 @@
 dnl Process this file with autoconf to produce a configure script.
-AC_REVISION($Id: configure.in,v 1.1063.2.15 2006/03/21 19:33:57 KO Exp $)dnl
+AC_REVISION($Id: configure.in,v 1.1063.2.16 2006/03/30 17:05:49 RD Exp $)dnl
 
 dnl ---------------------------------------------------------------------------
 dnl
@@ -8,7 +8,7 @@
 dnl
 dnl This script is under the wxWidgets licence.
 dnl
-dnl Version: $Id: configure.in,v 1.1063.2.15 2006/03/21 19:33:57 KO Exp $
+dnl Version: $Id: configure.in,v 1.1063.2.16 2006/03/30 17:05:49 RD Exp $
 dnl ---------------------------------------------------------------------------
 
 dnl ---------------------------------------------------------------------------
@@ -33,7 +33,7 @@
 wx_major_version_number=2
 wx_minor_version_number=6
 wx_release_number=3
-wx_subrelease_number=1
+wx_subrelease_number=2
 
 WX_RELEASE=$wx_major_version_number.$wx_minor_version_number
 WX_VERSION=$WX_RELEASE.$wx_release_number
diff -ur wxGTK-2.6.3/contrib/src/deprecated/cwlex_yy.c wxGTK-2.6.3.2/contrib/src/deprecated/cwlex_yy.c
--- wxGTK-2.6.3/contrib/src/deprecated/cwlex_yy.c	2006-03-21 18:42:22.000000000 -0500
+++ wxGTK-2.6.3.2/contrib/src/deprecated/cwlex_yy.c	2005-05-04 14:57:49.000000000 -0400
@@ -3,7 +3,7 @@
 /* Licence:   wxWindows Licence */
 
 /* scanner skeleton version:
- * $Header: /pack/cvsroots/wxwindows/wxWindows/contrib/src/deprecated/cwlex_yy.c,v 1.2 2005/05/04 18:57:49 JS Exp $
+ * $Header: /pack/cvsroots/wxwidgets/wxWidgets/contrib/src/deprecated/cwlex_yy.c,v 1.2 2005/05/04 18:57:49 JS Exp $
 	Last change:  JS   13 Jul 97    6:17 pm
  */
 
diff -ur wxGTK-2.6.3/contrib/src/deprecated/doslex.c wxGTK-2.6.3.2/contrib/src/deprecated/doslex.c
--- wxGTK-2.6.3/contrib/src/deprecated/doslex.c	2006-03-21 18:42:22.000000000 -0500
+++ wxGTK-2.6.3.2/contrib/src/deprecated/doslex.c	2005-06-09 14:37:44.000000000 -0400
@@ -1,7 +1,7 @@
 /* A lexical scanner generated by flex */
 
 /* scanner skeleton version:
- * $Header: /pack/cvsroots/wxwindows/wxWindows/contrib/src/deprecated/doslex.c,v 1.6 2005/06/09 18:37:44 ABX Exp $
+ * $Header: /pack/cvsroots/wxwidgets/wxWidgets/contrib/src/deprecated/doslex.c,v 1.6 2005/06/09 18:37:44 ABX Exp $
   Last change:  JS   13 Jul 97    6:17 pm
  */
 /* Copyright: (c) Julian Smart */
diff -ur wxGTK-2.6.3/include/wx/version.h wxGTK-2.6.3.2/include/wx/version.h
--- wxGTK-2.6.3/include/wx/version.h	2006-03-21 18:42:08.000000000 -0500
+++ wxGTK-2.6.3.2/include/wx/version.h	2006-03-30 12:05:48.000000000 -0500
@@ -4,7 +4,7 @@
 *  Author:      Julian Smart
 *  Modified by: Ryan Norton (Converted to C)
 *  Created:     29/01/98
-*  RCS-ID:      $Id: version.h,v 1.69.2.2 2006/01/18 10:25:00 JS Exp $
+*  RCS-ID:      $Id: version.h,v 1.69.2.3 2006/03/30 17:05:48 RD Exp $
 *  Copyright:   (c) 1998 Julian Smart
 *  Licence:     wxWindows licence
 */
@@ -22,7 +22,7 @@
 #define wxMAJOR_VERSION      2
 #define wxMINOR_VERSION      6
 #define wxRELEASE_NUMBER     3
-#define wxSUBRELEASE_NUMBER  0
+#define wxSUBRELEASE_NUMBER  2
 #define wxVERSION_STRING   _T("wxWidgets 2.6.3")
 
 /*  nothing to update below this line when updating the version */
diff -ur wxGTK-2.6.3/locale/fr.po wxGTK-2.6.3.2/locale/fr.po
--- wxGTK-2.6.3/locale/fr.po	2006-03-21 18:42:51.000000000 -0500
+++ wxGTK-2.6.3.2/locale/fr.po	2005-09-20 11:18:55.000000000 -0400
@@ -4,7 +4,7 @@
 msgstr ""
 "Project-Id-Version: wxWidgets-2.6.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-08-21 17:37+0200\n"
+"POT-Creation-Date: 2005-04-11 22:24+0200\n"
 "PO-Revision-Date: 2005-09-07 09:34+0200\n"
 "Last-Translator: Thomas Huriaux <thomas.huriaux at gmail.com>\n"
 "Language-Team: French <debian-l10n-french at lists.debian.org>\n"
@@ -13,12 +13,12 @@
 "Content-Transfer-Encoding: 8bit\n"
 "plural-forms: nplurals=2; plural=n > 1\n"
 
-#: ../src/common/debugrpt.cpp:569
+#: ../src/common/debugrpt.cpp:547
 #, c-format
 msgid "\t%s: %s\n"
 msgstr "\t%s : %s\n"
 
-#: ../src/common/debugrpt.cpp:572
+#: ../src/common/debugrpt.cpp:550
 msgid ""
 "\n"
 "Please send this report to the program maintainer, thank you!\n"
@@ -26,20 +26,20 @@
 "\n"
 "Veuillez envoyer ce rapport au responsable du programme.\n"
 
-#: ../src/palmos/utils.cpp:206
+#: ../src/palmos/utils.cpp:210
 msgid " "
 msgstr " "
 
-#: ../src/generic/dbgrptg.cpp:312
+#: ../src/generic/dbgrptg.cpp:293
 msgid "              Thank you and we're sorry for the inconvenience!\n"
 msgstr "              Merci et désolé pour le dérangement.\n"
 
-#: ../src/common/log.cpp:321
+#: ../src/common/log.cpp:322
 #, c-format
 msgid " (error %ld: %s)"
 msgstr " (erreur %ld : %s)"
 
-#: ../src/common/docview.cpp:1419
+#: ../src/common/docview.cpp:1380
 msgid " - "
 msgstr " - "
 
@@ -47,23 +47,23 @@
 msgid " Preview"
 msgstr " Aperçu"
 
-#: ../src/common/paper.cpp:124
+#: ../src/common/paper.cpp:134
 msgid "#10 Envelope, 4 1/8 x 9 1/2 in"
 msgstr "Enveloppe n° 10 (4,125 x 9,5 pouces)"
 
-#: ../src/common/paper.cpp:125
+#: ../src/common/paper.cpp:135
 msgid "#11 Envelope, 4 1/2 x 10 3/8 in"
 msgstr "Enveloppe n° 11 (4,5 x 10,375 pouces)"
 
-#: ../src/common/paper.cpp:126
+#: ../src/common/paper.cpp:136
 msgid "#12 Envelope, 4 3/4 x 11 in"
 msgstr "Enveloppe n° 12 (4,75 x 11 pouces)"
 
-#: ../src/common/paper.cpp:127
+#: ../src/common/paper.cpp:137
 msgid "#14 Envelope, 5 x 11 1/2 in"
 msgstr "Enveloppe n° 14 (5 x 11,5 pouces)"
 
-#: ../src/common/paper.cpp:123
+#: ../src/common/paper.cpp:133
 msgid "#9 Envelope, 3 7/8 x 8 7/8 in"
 msgstr "Enveloppe n° 9 (3,875 x 8,875 pouces)"
 
@@ -74,13 +74,13 @@
 msgid "#define %s must be an integer."
 msgstr "#define %s doit être un entier."
 
-#: ../src/html/helpfrm.cpp:1042 ../src/html/helpfrm.cpp:1044
-#: ../src/html/helpfrm.cpp:1703 ../src/html/helpfrm.cpp:1736
+#: ../src/html/helpfrm.cpp:1019 ../src/html/helpfrm.cpp:1021
+#: ../src/html/helpfrm.cpp:1689 ../src/html/helpfrm.cpp:1722
 #, c-format
 msgid "%i of %i"
 msgstr "%i de %i"
 
-#: ../src/generic/filedlgg.cpp:288
+#: ../src/generic/filedlgg.cpp:287
 #, c-format
 msgid "%ld bytes"
 msgstr "%ld octets"
@@ -90,27 +90,27 @@
 msgid "%s (or %s)"
 msgstr "%s (ou %s)"
 
-#: ../src/generic/logg.cpp:261
+#: ../src/generic/logg.cpp:262
 #, c-format
 msgid "%s Error"
 msgstr "%s Erreur"
 
-#: ../src/generic/logg.cpp:269
+#: ../src/generic/logg.cpp:270
 #, c-format
 msgid "%s Information"
 msgstr "%s Information"
 
[...16204 lines suppressed...]
--- wxGTK-2.6.3/src/tiff/tif_next.c	2006-03-21 18:42:16.000000000 -0500
+++ wxGTK-2.6.3.2/src/tiff/tif_next.c	2004-11-19 17:29:45.000000000 -0500
@@ -1,4 +1,4 @@
-/* $Header: /pack/cvsroots/wxwindows/wxWindows/src/tiff/tif_next.c,v 1.4 2004/11/19 22:29:45 VZ Exp $ */
+/* $Header: /pack/cvsroots/wxwidgets/wxWidgets/src/tiff/tif_next.c,v 1.4 2004/11/19 22:29:45 VZ Exp $ */
 
 /*
  * Copyright (c) 1988-1997 Sam Leffler
diff -ur wxGTK-2.6.3/src/tiff/tif_open.c wxGTK-2.6.3.2/src/tiff/tif_open.c
--- wxGTK-2.6.3/src/tiff/tif_open.c	2006-03-21 18:42:16.000000000 -0500
+++ wxGTK-2.6.3.2/src/tiff/tif_open.c	2005-05-31 05:28:43.000000000 -0400
@@ -1,4 +1,4 @@
-/* $Header: /pack/cvsroots/wxwindows/wxWindows/src/tiff/tif_open.c,v 1.5 2005/05/31 09:28:43 JS Exp $ */
+/* $Header: /pack/cvsroots/wxwidgets/wxWidgets/src/tiff/tif_open.c,v 1.5 2005/05/31 09:28:43 JS Exp $ */
 
 /*
  * Copyright (c) 1988-1997 Sam Leffler
diff -ur wxGTK-2.6.3/src/tiff/tif_os2.c wxGTK-2.6.3.2/src/tiff/tif_os2.c
--- wxGTK-2.6.3/src/tiff/tif_os2.c	2006-03-21 18:42:16.000000000 -0500
+++ wxGTK-2.6.3.2/src/tiff/tif_os2.c	2002-12-04 09:10:19.000000000 -0500
@@ -1,4 +1,4 @@
-/* $Header: /pack/cvsroots/wxwindows/wxWindows/src/tiff/tif_os2.c,v 1.2 2002/12/04 14:10:19 VZ Exp $ */
+/* $Header: /pack/cvsroots/wxwidgets/wxWidgets/src/tiff/tif_os2.c,v 1.2 2002/12/04 14:10:19 VZ Exp $ */
 
 /*
  * Copyright (c) 1988-1997 Sam Leffler
diff -ur wxGTK-2.6.3/src/tiff/tif_packbits.c wxGTK-2.6.3.2/src/tiff/tif_packbits.c
--- wxGTK-2.6.3/src/tiff/tif_packbits.c	2006-03-21 18:42:16.000000000 -0500
+++ wxGTK-2.6.3.2/src/tiff/tif_packbits.c	2004-11-19 17:29:45.000000000 -0500
@@ -1,4 +1,4 @@
-/* $Header: /pack/cvsroots/wxwindows/wxWindows/src/tiff/tif_packbits.c,v 1.4 2004/11/19 22:29:45 VZ Exp $ */
+/* $Header: /pack/cvsroots/wxwidgets/wxWidgets/src/tiff/tif_packbits.c,v 1.4 2004/11/19 22:29:45 VZ Exp $ */
 
 /*
  * Copyright (c) 1988-1997 Sam Leffler
diff -ur wxGTK-2.6.3/src/tiff/tif_predict.c wxGTK-2.6.3.2/src/tiff/tif_predict.c
--- wxGTK-2.6.3/src/tiff/tif_predict.c	2006-03-21 18:42:16.000000000 -0500
+++ wxGTK-2.6.3.2/src/tiff/tif_predict.c	2004-11-19 17:29:45.000000000 -0500
@@ -1,4 +1,4 @@
-/* $Header: /pack/cvsroots/wxwindows/wxWindows/src/tiff/tif_predict.c,v 1.6 2004/11/19 22:29:45 VZ Exp $ */
+/* $Header: /pack/cvsroots/wxwidgets/wxWidgets/src/tiff/tif_predict.c,v 1.6 2004/11/19 22:29:45 VZ Exp $ */
 
 /*
  * Copyright (c) 1988-1997 Sam Leffler
diff -ur wxGTK-2.6.3/src/tiff/tif_predict.h wxGTK-2.6.3.2/src/tiff/tif_predict.h
--- wxGTK-2.6.3/src/tiff/tif_predict.h	2006-03-21 18:42:16.000000000 -0500
+++ wxGTK-2.6.3.2/src/tiff/tif_predict.h	2004-11-19 17:29:45.000000000 -0500
@@ -1,4 +1,4 @@
-/* $Header: /pack/cvsroots/wxwindows/wxWindows/src/tiff/tif_predict.h,v 1.3 2004/11/19 22:29:45 VZ Exp $ */
+/* $Header: /pack/cvsroots/wxwidgets/wxWidgets/src/tiff/tif_predict.h,v 1.3 2004/11/19 22:29:45 VZ Exp $ */
 
 /*
  * Copyright (c) 1995-1997 Sam Leffler
diff -ur wxGTK-2.6.3/src/tiff/tif_print.c wxGTK-2.6.3.2/src/tiff/tif_print.c
--- wxGTK-2.6.3/src/tiff/tif_print.c	2006-03-21 18:42:16.000000000 -0500
+++ wxGTK-2.6.3.2/src/tiff/tif_print.c	2004-11-19 17:29:45.000000000 -0500
@@ -1,4 +1,4 @@
-/* $Header: /pack/cvsroots/wxwindows/wxWindows/src/tiff/tif_print.c,v 1.4 2004/11/19 22:29:45 VZ Exp $ */
+/* $Header: /pack/cvsroots/wxwidgets/wxWidgets/src/tiff/tif_print.c,v 1.4 2004/11/19 22:29:45 VZ Exp $ */
 
 /*
  * Copyright (c) 1988-1997 Sam Leffler
diff -ur wxGTK-2.6.3/src/tiff/tif_read.c wxGTK-2.6.3.2/src/tiff/tif_read.c
--- wxGTK-2.6.3/src/tiff/tif_read.c	2006-03-21 18:42:16.000000000 -0500
+++ wxGTK-2.6.3.2/src/tiff/tif_read.c	2004-11-19 17:29:45.000000000 -0500
@@ -1,4 +1,4 @@
-/* $Header: /pack/cvsroots/wxwindows/wxWindows/src/tiff/tif_read.c,v 1.3 2004/11/19 22:29:45 VZ Exp $ */
+/* $Header: /pack/cvsroots/wxwidgets/wxWidgets/src/tiff/tif_read.c,v 1.3 2004/11/19 22:29:45 VZ Exp $ */
 
 /*
  * Copyright (c) 1988-1997 Sam Leffler
diff -ur wxGTK-2.6.3/src/tiff/tif_strip.c wxGTK-2.6.3.2/src/tiff/tif_strip.c
--- wxGTK-2.6.3/src/tiff/tif_strip.c	2006-03-21 18:42:16.000000000 -0500
+++ wxGTK-2.6.3.2/src/tiff/tif_strip.c	2004-11-19 17:29:45.000000000 -0500
@@ -1,4 +1,4 @@
-/* $Header: /pack/cvsroots/wxwindows/wxWindows/src/tiff/tif_strip.c,v 1.3 2004/11/19 22:29:45 VZ Exp $ */
+/* $Header: /pack/cvsroots/wxwidgets/wxWidgets/src/tiff/tif_strip.c,v 1.3 2004/11/19 22:29:45 VZ Exp $ */
 
 /*
  * Copyright (c) 1991-1997 Sam Leffler
diff -ur wxGTK-2.6.3/src/tiff/tif_swab.c wxGTK-2.6.3.2/src/tiff/tif_swab.c
--- wxGTK-2.6.3/src/tiff/tif_swab.c	2006-03-21 18:42:16.000000000 -0500
+++ wxGTK-2.6.3.2/src/tiff/tif_swab.c	2004-11-19 17:29:46.000000000 -0500
@@ -1,4 +1,4 @@
-/* $Header: /pack/cvsroots/wxwindows/wxWindows/src/tiff/tif_swab.c,v 1.3 2004/11/19 22:29:46 VZ Exp $ */
+/* $Header: /pack/cvsroots/wxwidgets/wxWidgets/src/tiff/tif_swab.c,v 1.3 2004/11/19 22:29:46 VZ Exp $ */
 
 /*
  * Copyright (c) 1988-1997 Sam Leffler
diff -ur wxGTK-2.6.3/src/tiff/tif_thunder.c wxGTK-2.6.3.2/src/tiff/tif_thunder.c
--- wxGTK-2.6.3/src/tiff/tif_thunder.c	2006-03-21 18:42:16.000000000 -0500
+++ wxGTK-2.6.3.2/src/tiff/tif_thunder.c	2004-11-19 17:29:46.000000000 -0500
@@ -1,4 +1,4 @@
-/* $Header: /pack/cvsroots/wxwindows/wxWindows/src/tiff/tif_thunder.c,v 1.4 2004/11/19 22:29:46 VZ Exp $ */
+/* $Header: /pack/cvsroots/wxwidgets/wxWidgets/src/tiff/tif_thunder.c,v 1.4 2004/11/19 22:29:46 VZ Exp $ */
 
 /*
  * Copyright (c) 1988-1997 Sam Leffler
diff -ur wxGTK-2.6.3/src/tiff/tif_tile.c wxGTK-2.6.3.2/src/tiff/tif_tile.c
--- wxGTK-2.6.3/src/tiff/tif_tile.c	2006-03-21 18:42:16.000000000 -0500
+++ wxGTK-2.6.3.2/src/tiff/tif_tile.c	2004-11-19 17:29:46.000000000 -0500
@@ -1,4 +1,4 @@
-/* $Header: /pack/cvsroots/wxwindows/wxWindows/src/tiff/tif_tile.c,v 1.3 2004/11/19 22:29:46 VZ Exp $ */
+/* $Header: /pack/cvsroots/wxwidgets/wxWidgets/src/tiff/tif_tile.c,v 1.3 2004/11/19 22:29:46 VZ Exp $ */
 
 /*
  * Copyright (c) 1991-1997 Sam Leffler
diff -ur wxGTK-2.6.3/src/tiff/tif_unix.c wxGTK-2.6.3.2/src/tiff/tif_unix.c
--- wxGTK-2.6.3/src/tiff/tif_unix.c	2006-03-21 18:42:16.000000000 -0500
+++ wxGTK-2.6.3.2/src/tiff/tif_unix.c	2004-11-19 17:29:46.000000000 -0500
@@ -1,4 +1,4 @@
-/* $Header: /pack/cvsroots/wxwindows/wxWindows/src/tiff/tif_unix.c,v 1.3 2004/11/19 22:29:46 VZ Exp $ */
+/* $Header: /pack/cvsroots/wxwidgets/wxWidgets/src/tiff/tif_unix.c,v 1.3 2004/11/19 22:29:46 VZ Exp $ */
 
 /*
  * Copyright (c) 1988-1997 Sam Leffler
diff -ur wxGTK-2.6.3/src/tiff/tif_version.c wxGTK-2.6.3.2/src/tiff/tif_version.c
--- wxGTK-2.6.3/src/tiff/tif_version.c	2006-03-21 18:42:16.000000000 -0500
+++ wxGTK-2.6.3.2/src/tiff/tif_version.c	2004-11-19 17:29:46.000000000 -0500
@@ -1,4 +1,4 @@
-/* $Header: /pack/cvsroots/wxwindows/wxWindows/src/tiff/tif_version.c,v 1.3 2004/11/19 22:29:46 VZ Exp $ */
+/* $Header: /pack/cvsroots/wxwidgets/wxWidgets/src/tiff/tif_version.c,v 1.3 2004/11/19 22:29:46 VZ Exp $ */
 /*
  * Copyright (c) 1992-1997 Sam Leffler
  * Copyright (c) 1992-1997 Silicon Graphics, Inc.
diff -ur wxGTK-2.6.3/src/tiff/tif_vms.c wxGTK-2.6.3.2/src/tiff/tif_vms.c
--- wxGTK-2.6.3/src/tiff/tif_vms.c	2006-03-21 18:42:16.000000000 -0500
+++ wxGTK-2.6.3.2/src/tiff/tif_vms.c	2004-11-19 17:29:46.000000000 -0500
@@ -1,4 +1,4 @@
-/* $Header: /pack/cvsroots/wxwindows/wxWindows/src/tiff/tif_vms.c,v 1.3 2004/11/19 22:29:46 VZ Exp $ */
+/* $Header: /pack/cvsroots/wxwidgets/wxWidgets/src/tiff/tif_vms.c,v 1.3 2004/11/19 22:29:46 VZ Exp $ */
 
 /*
  * Copyright (c) 1988-1997 Sam Leffler
diff -ur wxGTK-2.6.3/src/tiff/tif_warning.c wxGTK-2.6.3.2/src/tiff/tif_warning.c
--- wxGTK-2.6.3/src/tiff/tif_warning.c	2006-03-21 18:42:16.000000000 -0500
+++ wxGTK-2.6.3.2/src/tiff/tif_warning.c	2004-11-19 17:29:46.000000000 -0500
@@ -1,4 +1,4 @@
-/* $Header: /pack/cvsroots/wxwindows/wxWindows/src/tiff/tif_warning.c,v 1.3 2004/11/19 22:29:46 VZ Exp $ */
+/* $Header: /pack/cvsroots/wxwidgets/wxWidgets/src/tiff/tif_warning.c,v 1.3 2004/11/19 22:29:46 VZ Exp $ */
 
 /*
  * Copyright (c) 1988-1997 Sam Leffler
diff -ur wxGTK-2.6.3/src/tiff/tif_win32.c wxGTK-2.6.3.2/src/tiff/tif_win32.c
--- wxGTK-2.6.3/src/tiff/tif_win32.c	2006-03-21 18:42:16.000000000 -0500
+++ wxGTK-2.6.3.2/src/tiff/tif_win32.c	2004-11-19 17:29:46.000000000 -0500
@@ -1,4 +1,4 @@
-/* $Header: /pack/cvsroots/wxwindows/wxWindows/src/tiff/tif_win32.c,v 1.3 2004/11/19 22:29:46 VZ Exp $ */
+/* $Header: /pack/cvsroots/wxwidgets/wxWidgets/src/tiff/tif_win32.c,v 1.3 2004/11/19 22:29:46 VZ Exp $ */
 
 /*
  * Copyright (c) 1988-1997 Sam Leffler
diff -ur wxGTK-2.6.3/src/tiff/tif_win3.c wxGTK-2.6.3.2/src/tiff/tif_win3.c
--- wxGTK-2.6.3/src/tiff/tif_win3.c	2006-03-21 18:42:16.000000000 -0500
+++ wxGTK-2.6.3.2/src/tiff/tif_win3.c	2004-11-19 17:29:46.000000000 -0500
@@ -1,4 +1,4 @@
-/* $Header: /pack/cvsroots/wxwindows/wxWindows/src/tiff/tif_win3.c,v 1.3 2004/11/19 22:29:46 VZ Exp $ */
+/* $Header: /pack/cvsroots/wxwidgets/wxWidgets/src/tiff/tif_win3.c,v 1.3 2004/11/19 22:29:46 VZ Exp $ */
 
 /*
  * Copyright (c) 1988-1997 Sam Leffler
diff -ur wxGTK-2.6.3/src/tiff/tif_write.c wxGTK-2.6.3.2/src/tiff/tif_write.c
--- wxGTK-2.6.3/src/tiff/tif_write.c	2006-03-21 18:42:16.000000000 -0500
+++ wxGTK-2.6.3.2/src/tiff/tif_write.c	2004-11-19 17:29:46.000000000 -0500
@@ -1,4 +1,4 @@
-/* $Header: /pack/cvsroots/wxwindows/wxWindows/src/tiff/tif_write.c,v 1.3 2004/11/19 22:29:46 VZ Exp $ */
+/* $Header: /pack/cvsroots/wxwidgets/wxWidgets/src/tiff/tif_write.c,v 1.3 2004/11/19 22:29:46 VZ Exp $ */
 
 /*
  * Copyright (c) 1988-1997 Sam Leffler
diff -ur wxGTK-2.6.3/src/tiff/tif_zip.c wxGTK-2.6.3.2/src/tiff/tif_zip.c
--- wxGTK-2.6.3/src/tiff/tif_zip.c	2006-03-21 18:42:16.000000000 -0500
+++ wxGTK-2.6.3.2/src/tiff/tif_zip.c	2004-11-19 17:29:47.000000000 -0500
@@ -1,4 +1,4 @@
-/* $Header: /pack/cvsroots/wxwindows/wxWindows/src/tiff/tif_zip.c,v 1.4 2004/11/19 22:29:47 VZ Exp $ */
+/* $Header: /pack/cvsroots/wxwidgets/wxWidgets/src/tiff/tif_zip.c,v 1.4 2004/11/19 22:29:47 VZ Exp $ */
 
 /*
  * Copyright (c) 1995-1997 Sam Leffler
diff -ur wxGTK-2.6.3/utils/helpview/src/helpview.cpp wxGTK-2.6.3.2/utils/helpview/src/helpview.cpp
--- wxGTK-2.6.3/utils/helpview/src/helpview.cpp	2006-03-21 18:42:49.000000000 -0500
+++ wxGTK-2.6.3.2/utils/helpview/src/helpview.cpp	2006-03-30 06:35:12.000000000 -0500
@@ -5,7 +5,7 @@
 // Author:      Vaclav Slavik, Julian Smart
 // Modified by:
 // Created:     2002-07-09
-// RCS-ID:      $Id: helpview.cpp,v 1.14 2005/05/30 09:24:08 ABX Exp $
+// RCS-ID:      $Id: helpview.cpp,v 1.14.2.1 2006/03/30 11:35:12 JS Exp $
 // Copyright:   (c) 2002 Vaclav Slavik, Julian Smart and others
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -63,7 +63,7 @@
 
 #ifdef __WXMAC__
     wxApp::s_macAboutMenuItemId = wxID_ABOUT;
-    wxFileName::MacRegisterDefaultTypeAndCreator( "htb" , 'HTBD' , 'HTBA' ) ;
+    wxFileName::MacRegisterDefaultTypeAndCreator( wxT("htb") , 'HTBD' , 'HTBA' ) ;
 #endif
 
     int istyle = wxHF_DEFAULT_STYLE;


