[Plplot-cvs] SF.net SVN: plplot:[12695] trunk/bindings

[<ai...@us...>]

Revision: 12695
          http://sourceforge.net/p/plplot/code/12695
Author:   airwin
Date:     2013-11-13 23:53:45 +0000 (Wed, 13 Nov 2013)
Log Message:
-----------
Make Tcl constants in the PLPLOT namespace properly accessible
from all environments including tclsh and wish.

Modified Paths:
--------------
    trunk/bindings/tcl/tclAPI.c
    trunk/bindings/tk/plserver.c

Modified: trunk/bindings/tcl/tclAPI.c
===================================================================
--- trunk/bindings/tcl/tclAPI.c	2013-11-13 22:53:37 UTC (rev 12694)
+++ trunk/bindings/tcl/tclAPI.c	2013-11-13 23:53:45 UTC (rev 12695)
@@ -386,7 +386,7 @@
 //--------------------------------------------------------------------------
 // PlbasicInit
 //
-// Used by both Pltcl and Pltk.  Ensures we have been correctly loaded
+// Used by Pltcl_Init, Pltk_Init(.c), and Plplotter_Init(.c).  Ensures we have been correctly loaded
 // into a Tcl/Tk interpreter, that the plplot.tcl startup file can be
 // found and sourced, and that the Matrix library can be found and used,
 // and that it correctly exports a stub table.
@@ -593,6 +593,9 @@
     Tcl_CreateCommand( interp, "wait_until", (Tcl_CmdProc *) plWait_Until,
         (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL );
 
+// Define the flags as variables in the PLPLOT namespace
+    set_plplot_parameters( interp );
+
     return TCL_OK;
 }
 
@@ -630,10 +633,6 @@
             (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL );
     }
 
-// Define the flags as variables in the PLPLOT namespace
-
-    set_plplot_parameters( interp );
-
 // We really need this so the TEA based 'make install' can
 // properly determine the package we have installed
 

Modified: trunk/bindings/tk/plserver.c
===================================================================
--- trunk/bindings/tk/plserver.c	2013-11-13 22:53:37 UTC (rev 12694)
+++ trunk/bindings/tk/plserver.c	2013-11-13 23:53:45 UTC (rev 12695)
@@ -38,7 +38,6 @@
 
 #define NEED_PLDEBUG
 #include "plserver.h"
-#include "plplot_parameters.h"
 
 // Application-specific command-line options
 // Variable declarations
@@ -235,10 +234,6 @@
     Tcl_CreateCommand( interp, "exit", (Tcl_CmdProc *) plExitCmd,
         (ClientData) mainWindow, (Tcl_CmdDeleteProc *) NULL );
 
-// Define the flags as variables in the PLPLOT namespace
-
-    set_plplot_parameters( interp );
-
     return TCL_OK;
 }
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.