Revision: 42390
http://brlcad.svn.sourceforge.net/brlcad/?rev=42390&view=rev
Author: starseeker
Date: 2011-01-17 14:26:55 +0000 (Mon, 17 Jan 2011)
Log Message:
-----------
Tweaks
Modified Paths:
--------------
brlcad/branches/cmake/src/bwish/main.c
Modified: brlcad/branches/cmake/src/bwish/main.c
===================================================================
--- brlcad/branches/cmake/src/bwish/main.c 2011-01-17 14:14:44 UTC (rev
42389)
+++ brlcad/branches/cmake/src/bwish/main.c 2011-01-17 14:26:55 UTC (rev
42390)
@@ -49,8 +49,8 @@
*/
#define IMPORT_ITCL 1
#ifdef BWISH
-# define IMPORT_ITK 1
-# define IMPORT_IWIDGETS 1
+# define IMPORT_ITK 1
+# define IMPORT_IWIDGETS 1
#endif
extern int cmdInit(Tcl_Interp *interp);
@@ -99,6 +99,11 @@
}
init_tcl=0;
+ /* warn if tcl_library isn't set by now */
+ if (try_auto_path) {
+ tclcad_tcl_library(interp);
+ }
+
#ifdef BWISH
/* Initialize Tk */
Tcl_ResetResult(interp);
@@ -116,7 +121,7 @@
/* Initialize [incr Tcl] */
Tcl_ResetResult(interp);
- if (init_itcl && Tcl_Eval(interp, "package require Itcl") == TCL_ERROR)
{
+ if (init_itcl && Tcl_Eval(interp, "package require Itcl") != TCL_OK) {
if (!try_auto_path) {
try_auto_path=1;
/* Itcl_Init() leaves initialization in a bad state
@@ -134,7 +139,7 @@
#ifdef BWISH
/* Initialize [incr Tk] */
Tcl_ResetResult(interp);
- if (init_itk && Tcl_Eval(interp, "package require Itk") == TCL_ERROR) {
+ if (init_itk && Tcl_Eval(interp, "package require Itk") != TCL_OK) {
if (!try_auto_path) {
try_auto_path=1;
continue;
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Protect Your Site and Customers from Malware Attacks
Learn about various malware tactics and how to avoid them. Understand
malware threats, the impact they can have on your business, and how you
can protect your company and customers by using code signing.
http://p.sf.net/sfu/oracle-sfdevnl
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
