From: <ai...@us...> - 2013-11-12 23:55:08
|
Revision: 12686 http://sourceforge.net/p/plplot/code/12686 Author: airwin Date: 2013-11-12 23:55:03 +0000 (Tue, 12 Nov 2013) Log Message: ----------- Style previous commit. Modified Paths: -------------- trunk/bindings/tcl/tclAPI.c Modified: trunk/bindings/tcl/tclAPI.c =================================================================== --- trunk/bindings/tcl/tclAPI.c 2013-11-12 22:26:49 UTC (rev 12685) +++ trunk/bindings/tcl/tclAPI.c 2013-11-12 23:55:03 UTC (rev 12686) @@ -444,36 +444,36 @@ Tcl_SetVar( interp, "plversion", PLPLOT_VERSION, TCL_GLOBAL_ONLY ); if ( strcmp( PLPLOT_ITCL_VERSION, "4.0.0" ) >= 0 ) - Tcl_SetVar( interp, "pl_itcl_package_name", "Itcl 4", TCL_GLOBAL_ONLY ); + Tcl_SetVar( interp, "pl_itcl_package_name", "Itcl 4", TCL_GLOBAL_ONLY ); else if ( strcmp( PLPLOT_ITCL_VERSION, "3.0.0" ) >= 0 ) - Tcl_SetVar( interp, "pl_itcl_package_name", "Itcl 3", TCL_GLOBAL_ONLY ); + Tcl_SetVar( interp, "pl_itcl_package_name", "Itcl 3", TCL_GLOBAL_ONLY ); else - // Mark invalid package name in such a way as to cause an error - // when, for example, itcl has been disabled by PLplot, yet one - // of the PLplot Tcl scripts attempts to load Itcl. - Tcl_SetVar( interp, "pl_itcl_package_name", "Itcl(because_not_found_by_PLplot)", TCL_GLOBAL_ONLY ); - + // Mark invalid package name in such a way as to cause an error + // when, for example, itcl has been disabled by PLplot, yet one + // of the PLplot Tcl scripts attempts to load Itcl. + Tcl_SetVar( interp, "pl_itcl_package_name", "Itcl(because_not_found_by_PLplot)", TCL_GLOBAL_ONLY ); + if ( strcmp( PLPLOT_ITK_VERSION, "4.0.0" ) >= 0 ) - Tcl_SetVar( interp, "pl_itk_package_name", "Itk 4", TCL_GLOBAL_ONLY ); + Tcl_SetVar( interp, "pl_itk_package_name", "Itk 4", TCL_GLOBAL_ONLY ); else if ( strcmp( PLPLOT_ITK_VERSION, "3.0.0" ) >= 0 ) - Tcl_SetVar( interp, "pl_itk_package_name", "Itk 3", TCL_GLOBAL_ONLY ); + Tcl_SetVar( interp, "pl_itk_package_name", "Itk 3", TCL_GLOBAL_ONLY ); else - // Mark invalid package name in such a way as to cause an error - // when, for example, itk has been disabled by PLplot, yet one - // of the PLplot Tcl scripts attempts to load Itk. - Tcl_SetVar( interp, "pl_itk_package_name", "Itk(because_not_found_by_PLplot)", TCL_GLOBAL_ONLY ); - + // Mark invalid package name in such a way as to cause an error + // when, for example, itk has been disabled by PLplot, yet one + // of the PLplot Tcl scripts attempts to load Itk. + Tcl_SetVar( interp, "pl_itk_package_name", "Itk(because_not_found_by_PLplot)", TCL_GLOBAL_ONLY ); + if ( strcmp( PLPLOT_IWIDGETS_VERSION, "4.1.0" ) >= 0 ) - Tcl_SetVar( interp, "pl_iwidgets_package_name", "Iwidgets 4", TCL_GLOBAL_ONLY ); + Tcl_SetVar( interp, "pl_iwidgets_package_name", "Iwidgets 4", TCL_GLOBAL_ONLY ); else if ( strcmp( PLPLOT_IWIDGETS_VERSION, "4.0.0" ) >= 0 ) - Tcl_SetVar( interp, "pl_iwidgets_package_name", "-exact Iwidgets " PLPLOT_IWIDGETS_VERSION, TCL_GLOBAL_ONLY ); + Tcl_SetVar( interp, "pl_iwidgets_package_name", "-exact Iwidgets " PLPLOT_IWIDGETS_VERSION, TCL_GLOBAL_ONLY ); else - // Mark invalid package name in such a way as to cause an error - // when, for example, itk has been disabled by PLplot, yet one - // of the PLplot Tcl scripts attempts to load Iwidgets. - Tcl_SetVar( interp, "pl_iwidgets_package_name", "Iwidgets(because_not_found_by_PLplot)", TCL_GLOBAL_ONLY ); - - + // Mark invalid package name in such a way as to cause an error + // when, for example, itk has been disabled by PLplot, yet one + // of the PLplot Tcl scripts attempts to load Iwidgets. + Tcl_SetVar( interp, "pl_iwidgets_package_name", "Iwidgets(because_not_found_by_PLplot)", TCL_GLOBAL_ONLY ); + + // Begin search for init script // Each search begins with a test of libDir, so rearrangement is easy. // If search is successful, both libDir (C) and pllibrary (tcl) are set This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |