Revision: 76879
http://sourceforge.net/p/brlcad/code/76879
Author: starseeker
Date: 2020-08-21 22:35:50 +0000 (Fri, 21 Aug 2020)
Log Message:
-----------
tclcad_init is the call to use. Also not directly initing Itcl from rtwizard.
Modified Paths:
--------------
brlcad/trunk/src/libtclcad/tclcad_init.c
brlcad/trunk/src/rtwizard/main.c
Modified: brlcad/trunk/src/libtclcad/tclcad_init.c
===================================================================
--- brlcad/trunk/src/libtclcad/tclcad_init.c 2020-08-21 22:33:42 UTC (rev
76878)
+++ brlcad/trunk/src/libtclcad/tclcad_init.c 2020-08-21 22:35:50 UTC (rev
76879)
@@ -74,86 +74,6 @@
}
-int
-Tclcad_Init(Tcl_Interp *interp)
-{
- if (library_initialized(0))
- return TCL_OK;
-
- if (Tcl_Init(interp) == TCL_ERROR) {
- return TCL_ERROR;
- }
-
-#ifdef HAVE_TK
- if (Tk_Init(interp) == TCL_ERROR) {
- return TCL_ERROR;
- }
-#endif
-
- /* Locate the BRL-CAD-specific Tcl scripts, set the auto_path */
- tclcad_auto_path(interp);
-
- /* Initialize [incr Tcl] */
- if (Tcl_Eval(interp, "package require Itcl") != TCL_OK) {
- bu_log("Tcl_Eval ERROR:\n%s\n", Tcl_GetStringResult(interp));
- return TCL_ERROR;
- }
-
-#ifdef HAVE_TK
- /* Initialize [incr Tk] */
- if (Tcl_Eval(interp, "package require Itk") != TCL_OK) {
- bu_log("Tcl_Eval ERROR:\n%s\n", Tcl_GetStringResult(interp));
- return TCL_ERROR;
- }
-#endif
-
- /* Initialize the Iwidgets package */
- if (Tcl_Eval(interp, "package require Iwidgets") != TCL_OK) {
- bu_log("Tcl_Eval ERROR:\n%s\n", Tcl_GetStringResult(interp));
- return TCL_ERROR;
- }
-
- /* Initialize libstruct dm */
- if (Dm_Init(interp) == TCL_ERROR) {
- bu_log("Dm_Init ERROR:\n%s\n", Tcl_GetStringResult(interp));
- return TCL_ERROR;
- }
-
- /* Initialize libbu */
- if (Bu_Init(interp) == TCL_ERROR) {
- bu_log("Bu_Init ERROR:\n%s\n", Tcl_GetStringResult(interp));
- return TCL_ERROR;
- }
-
- /* Initialize libbn */
- if (Bn_Init(interp) == TCL_ERROR) {
- bu_log("Bn_Init ERROR:\n%s\n", Tcl_GetStringResult(interp));
- return TCL_ERROR;
- }
-
- /* Initialize librt */
- if (Rt_Init(interp) == TCL_ERROR) {
- bu_log("Rt_Init ERROR:\n%s\n", Tcl_GetStringResult(interp));
- return TCL_ERROR;
- }
-
- /* Initialize the GED object */
- if (Ged_Init(interp) == TCL_ERROR) {
- bu_log("Ged_Init ERROR:\n%s\n", Tcl_GetStringResult(interp));
- return TCL_ERROR;
- }
-
- /* initialize command history objects */
- Cho_Init(interp);
-
- Tcl_PkgProvide(interp, "Tclcad", brlcad_version());
-
- (void)library_initialized(1);
-
- return TCL_OK;
-}
-
-
/* avoid including itcl.h/itk.h due to their usage of internal headers */
extern int Itcl_Init(Tcl_Interp *);
#ifdef HAVE_TK
Modified: brlcad/trunk/src/rtwizard/main.c
===================================================================
--- brlcad/trunk/src/rtwizard/main.c 2020-08-21 22:33:42 UTC (rev 76878)
+++ brlcad/trunk/src/rtwizard/main.c 2020-08-21 22:35:50 UTC (rev 76879)
@@ -39,9 +39,6 @@
#include "bu/str.h"
#include "tclcad.h"
-/* avoid including itcl.h due to their usage of internal headers */
-extern int Itcl_Init(Tcl_Interp *);
-
#define RTWIZARD_HAVE_GUI 0
#define RTWIZARD_SIZE_DEFAULT 512
@@ -48,7 +45,6 @@
#define RTWIZARD_MAGIC 0x72747769 /**< rtwi */
-
struct rtwizard_settings {
uint32_t magic;
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
BRL-CAD Source Commits mailing list
brlcad-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
