From 0f07672083f7f9fc9185a3334cb4a99726ab44a3 Mon Sep 17 00:00:00 2001
From: vincentdarley <vincentdarley>
Date: Wed, 14 Aug 2002 15:31:21 +0000
Subject: compilation, link fixes

---
 ChangeLog         |  7 +++++++
 win/makefile.vc   |  4 ++--
 win/tkWinDialog.c | 17 ++++++++++++++++-
 win/tkWinTest.c   |  6 +++---
 4 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 0b46958..301ffb2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2002-08-14  Vince Darley  <vincentdarley@users.sourceforge.net>
+
+	* win/tkWinDialog.c:
+	* win/makefile.vc: broken compilation and link from changes
+	Hobbs-08-07 fixed.
+	* win/tkWinTest.c: CONST problem resolved.
+
 2002-08-13  Jeff Hobbs  <jeffh@ActiveState.com>
 
 	* library/button.tcl: change the bindings to use Priv($w,relief)
diff --git a/win/makefile.vc b/win/makefile.vc
index efa2b81..46f56ec 100644
--- a/win/makefile.vc
+++ b/win/makefile.vc
@@ -12,7 +12,7 @@
 # Copyright (c) 2001-2002 David Gravereaux.
 #
 #------------------------------------------------------------------------------
-# RCS: @(#) $Id: makefile.vc,v 1.62 2002/06/21 23:09:54 hobbs Exp $
+# RCS: @(#) $Id: makefile.vc,v 1.63 2002/08/14 15:31:21 vincentdarley Exp $
 #------------------------------------------------------------------------------
 
 !if "$(MSVCDIR)" == ""
@@ -467,7 +467,7 @@ conlflags = $(lflags) -subsystem:console
 guilflags = $(lflags) -subsystem:windows
 
 baselibs   = kernel32.lib advapi32.lib user32.lib
-guilibs	    = $(baselibs) gdi32.lib comdlg32.lib winspool.lib imm32.lib comctl32.lib
+guilibs	    = $(baselibs) shell32.lib gdi32.lib comdlg32.lib winspool.lib imm32.lib comctl32.lib
 
 
 #---------------------------------------------------------------------
diff --git a/win/tkWinDialog.c b/win/tkWinDialog.c
index 58fdfe0..eb3bd42 100644
--- a/win/tkWinDialog.c
+++ b/win/tkWinDialog.c
@@ -8,7 +8,7 @@
  * 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.28 2002/08/08 01:42:44 hobbs Exp $
+ * RCS: @(#) $Id: tkWinDialog.c,v 1.29 2002/08/14 15:31:21 vincentdarley Exp $
  *
  */
 
@@ -26,6 +26,21 @@
 #ifdef USE_NEW_CHOOSEDIR
 #include <shlobj.h>     /* includes SHBrowseForFolder */
 
+/* These needed for compilation with VC++ 5.2 */
+#ifndef BIF_EDITBOX
+#define BIF_EDITBOX 0x10
+#endif
+#ifndef BIF_VALIDATE
+#define BIF_VALIDATE 0x0020
+#endif
+#ifndef BFFM_VALIDATEFAILED
+#ifdef UNICODE
+#define BFFM_VALIDATEFAILED 4
+#else
+#define BFFM_VALIDATEFAILED 3
+#endif
+#endif 
+
 /*
  * The following structure is used by the new Tk_ChooseDirectoryObjCmd
  * to pass data between it and its callback. Unqiue to Winodws platform.
diff --git a/win/tkWinTest.c b/win/tkWinTest.c
index ce0259d..c02a036 100644
--- a/win/tkWinTest.c
+++ b/win/tkWinTest.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: tkWinTest.c,v 1.6 2002/02/08 02:57:11 dgp Exp $
+ * RCS: @(#) $Id: tkWinTest.c,v 1.7 2002/08/14 15:31:21 vincentdarley Exp $
  */
 
 #include "tkWinInt.h"
@@ -27,7 +27,7 @@ static int		TestclipboardObjCmd(ClientData clientData,
 			    Tcl_Interp *interp, int objc,
 			    Tcl_Obj *CONST objv[]);
 static int		TestwineventCmd(ClientData clientData, 
-			    Tcl_Interp *interp, int argc, char **argv);
+			    Tcl_Interp *interp, int argc, CONST char **argv);
 
 
 /*
@@ -228,7 +228,7 @@ TestwineventCmd(clientData, interp, argc, argv)
     ClientData clientData;		/* Main window for application. */
     Tcl_Interp *interp;			/* Current interpreter. */
     int argc;				/* Number of arguments. */
-    char **argv;			/* Argument strings. */
+    CONST char **argv;			/* Argument strings. */
 {
     HWND hwnd = 0;
     int id;
-- 
cgit v0.12