[Maxima-commits] CVS: maxima/interfaces/xmaxima Makefile.am,1.28,1.29 xmaxima-trailer.tcl,1.8,1.9

[Mike C. <mik...@us...>]

Update of /cvsroot/maxima/maxima/interfaces/xmaxima
In directory usw-pr-cvs1:/tmp/cvs-serv21331

Modified Files:
	Makefile.am xmaxima-trailer.tcl 
Log Message:
Break xmaxima.tcl up and introduce OO style

Index: Makefile.am
===================================================================
RCS file: /cvsroot/maxima/maxima/interfaces/xmaxima/Makefile.am,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- Makefile.am	17 Sep 2002 22:35:17 -0000	1.28
+++ Makefile.am	19 Sep 2002 16:13:47 -0000	1.29
@@ -14,6 +14,8 @@
 	Utils/FileDlg.tcl \
 	Utils/Messages.tcl \
 	Utils/Misc.tcl \
+	ObjTcl/Object.tcl \
+	ObjTcl/Feedback.tcl \
 	Tkmaxima/Constants.tcl \
 	Tkmaxima/Preamble.tcl \
 	Tkmaxima/Readdata.tcl \
@@ -42,6 +44,7 @@
 	Tkmaxima/EMaxima.tcl \
 	Tkmaxima/EHref.tcl \
 	Tkmaxima/Browser.tcl \
+	Tkmaxima/Bindings.tcl \
 	Tkmaxima/Wmenu.tcl \
 	Tkmaxima/Tryftp2.tcl \
 	Tkmaxima/Myhtml.tcl \
@@ -56,7 +59,9 @@
 	Tkmaxima/RunMaxima.tcl \
 	Tkmaxima/Menu.tcl \
 	Tkmaxima/Paths.tcl \
-	xmaxima.tcl 
+	Tkmaxima/Gui.tcl \
+	Tkmaxima/Tkmaxima.tcl 
+
 
 XMAXIMA_REAL_SOURCES = $(TKSOURCES) xmaxima-trailer.tcl
 XMAXIMASOURCES = $(TKSOURCES) autoconf-variables.tcl xmaxima-trailer.tcl

Index: xmaxima-trailer.tcl
===================================================================
RCS file: /cvsroot/maxima/maxima/interfaces/xmaxima/xmaxima-trailer.tcl,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- xmaxima-trailer.tcl	17 Sep 2002 22:35:17 -0000	1.8
+++ xmaxima-trailer.tcl	19 Sep 2002 16:13:48 -0000	1.9
@@ -4,24 +4,7 @@
 #
 # Attach this at the bottom of the xmaxima code to start up the interface.
 
-# setMaxDir must be called here as it is used by xmaxima-trailer.tcl
-setMaxDir
-
-global tcl_platform maxima_priv
-if {$tcl_platform(platform) == "windows" } {
-
-    set dir [file dir [info name]]
-    # These should be in the same directory as the xmaxima.exe
-    set maxima_priv(kill) [file join $dir winkill.exe]
-
-    set file [file join $dir tclwinkill.dll]
-    if {[file isfile $file]} {
-	catch {load  $file}
-    }
-    unset file
-} else {
-    # unix
-    set maxima_priv(kill) kill
-}
-
-doit .maxima
+MAXTkmaxima tkmaxima
+rename exit tkexit
+proc exit {{val "0"}} {tkmaxima exit "" $val}
+tkmaxima install