summaryrefslogtreecommitdiffstats
path: root/win
diff options
context:
space:
mode:
authorhobbs <hobbs>2000-04-19 23:12:55 (GMT)
committerhobbs <hobbs>2000-04-19 23:12:55 (GMT)
commit12b0f203a7f394fec3738c3e1b762a64031927f3 (patch)
tree48432f0b2c9c70cba5dcbddd5ab06c100214d1cd /win
parent442d04988d260a0d338a53d0a81b0f17e9a5c3e8 (diff)
downloadtk-12b0f203a7f394fec3738c3e1b762a64031927f3.zip
tk-12b0f203a7f394fec3738c3e1b762a64031927f3.tar.gz
tk-12b0f203a7f394fec3738c3e1b762a64031927f3.tar.bz2
* library/choosedir.tcl (::tk::dialog::file::chooseDir::Config):
* library/tkfbox.tcl (::tk::dialog::file::Config): removed the extraneous glob on -initialdir after file isdir already returned 1 and moved cd trick into this case as the else already uses [pwd]. [Bug: 5181] * win/winMain.c: moved extern call out of WinMain func
Diffstat (limited to 'win')
-rw-r--r--win/winMain.c46
1 files changed, 23 insertions, 23 deletions
diff --git a/win/winMain.c b/win/winMain.c
index d17c4ce..cf517b0 100644
--- a/win/winMain.c
+++ b/win/winMain.c
@@ -9,7 +9,7 @@
* 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.9 1999/12/02 02:05:46 redman Exp $
+ * RCS: @(#) $Id: winMain.c,v 1.10 2000/04/19 23:12:56 hobbs Exp $
*/
#include <tk.h>
@@ -45,6 +45,28 @@ extern int Tcltest_Init _ANSI_ARGS_((Tcl_Interp *interp));
static BOOL consoleRequired = TRUE;
+/*
+ * The following #if block allows you to change the AppInit
+ * function by using a #define of TCL_LOCAL_APPINIT instead
+ * of rewriting this entire file. The #if checks for that
+ * #define and uses Tcl_AppInit if it doesn't exist.
+ */
+
+#ifndef TK_LOCAL_APPINIT
+#define TK_LOCAL_APPINIT Tcl_AppInit
+#endif
+extern int TK_LOCAL_APPINIT _ANSI_ARGS_((Tcl_Interp *interp));
+
+/*
+ * The following #if block allows you to change how Tcl finds the startup
+ * script, prime the library or encoding paths, fiddle with the argv,
+ * etc., without needing to rewrite Tk_Main()
+ */
+
+#ifdef TK_LOCAL_MAIN_HOOK
+extern int TK_LOCAL_MAIN_HOOK _ANSI_ARGS_((int *argc, char ***argv));
+#endif
+
/*
*----------------------------------------------------------------------
@@ -74,28 +96,6 @@ WinMain(hInstance, hPrevInstance, lpszCmdLine, nCmdShow)
int argc;
char buffer[MAX_PATH+1];
char *p;
-
- /*
- * The following #if block allows you to change the AppInit
- * function by using a #define of TCL_LOCAL_APPINIT instead
- * of rewriting this entire file. The #if checks for that
- * #define and uses Tcl_AppInit if it doesn't exist.
- */
-
-#ifndef TK_LOCAL_APPINIT
-#define TK_LOCAL_APPINIT Tcl_AppInit
-#endif
- extern int TK_LOCAL_APPINIT _ANSI_ARGS_((Tcl_Interp *interp));
-
- /*
- * The following #if block allows you to change how Tcl finds the startup
- * script, prime the library or encoding paths, fiddle with the argv,
- * etc., without needing to rewrite Tk_Main()
- */
-
-#ifdef TK_LOCAL_MAIN_HOOK
- extern int TK_LOCAL_MAIN_HOOK _ANSI_ARGS_((int *argc, char ***argv));
-#endif
Tcl_SetPanicProc(WishPanic);