Menu
▾
▴
plplot-cvs
|
From: <ai...@us...> - 2008-10-10 20:27:50
|
Revision: 8875
http://plplot.svn.sourceforge.net/plplot/?rev=8875&view=rev
Author: airwin
Date: 2008-10-10 20:27:47 +0000 (Fri, 10 Oct 2008)
Log Message:
-----------
Drop PLDLLIMPEXP* macros from source code.
To make the pltk.h header accessible where the PLDLLIMPEXP_TCLTK macro is
used, #include pltkd.h which #includes pltk.h.
Modified Paths:
--------------
trunk/bindings/tk/tkMain.c
Modified: trunk/bindings/tk/tkMain.c
===================================================================
--- trunk/bindings/tk/tkMain.c 2008-10-10 20:20:19 UTC (rev 8874)
+++ trunk/bindings/tk/tkMain.c 2008-10-10 20:27:47 UTC (rev 8875)
@@ -62,7 +62,7 @@
*/
#include "plplotP.h"
-
+#include "pltkd.h"
#include <stdio.h>
#include <stdlib.h>
#include <tcl.h>
@@ -176,7 +176,7 @@
*----------------------------------------------------------------------
*/
-PLDLLIMPEXP int
+int
pltkMain(int argc, const char **argv, char *RcFileName,
int (*AppInit)(Tcl_Interp *interp))
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2009-04-30 09:08:08
|
Revision: 9866
http://plplot.svn.sourceforge.net/plplot/?rev=9866&view=rev
Author: andrewross
Date: 2009-04-30 09:08:06 +0000 (Thu, 30 Apr 2009)
Log Message:
-----------
Add call to XInitThreads before any Tk window functions are called. This solves the segmentation fault on exit for the tk examples.
Modified Paths:
--------------
trunk/bindings/tk/tkMain.c
Modified: trunk/bindings/tk/tkMain.c
===================================================================
--- trunk/bindings/tk/tkMain.c 2009-04-29 15:42:02 UTC (rev 9865)
+++ trunk/bindings/tk/tkMain.c 2009-04-30 09:08:06 UTC (rev 9866)
@@ -185,6 +185,10 @@
char buf[20];
int code;
+#ifdef HAVE_PTHREAD
+ XInitThreads();
+#endif
+
Tcl_FindExecutable(argv[0]);
interp = Tcl_CreateInterp();
#ifdef TCL_MEM_DEBUG
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ai...@us...> - 2013-10-26 21:18:58
|
Revision: 12637
http://sourceforge.net/p/plplot/code/12637
Author: airwin
Date: 2013-10-26 21:18:55 +0000 (Sat, 26 Oct 2013)
Log Message:
-----------
Fix build issue for Tcl/Tk 8.6 which no longer #defines
Tcl_Import_TCL_DECLARED. Instead, we now assume that all Tcl/Tk
versions we use declare Tcl_Import (true for at least Tcl/Tk 8.5.x and
probably for much earlier Tcl/Tk versions as well) so we no longer
declare Tcl_Import ourselves.
Modified Paths:
--------------
trunk/bindings/tk/tkMain.c
Modified: trunk/bindings/tk/tkMain.c
===================================================================
--- trunk/bindings/tk/tkMain.c 2013-10-26 20:47:49 UTC (rev 12636)
+++ trunk/bindings/tk/tkMain.c 2013-10-26 21:18:55 UTC (rev 12637)
@@ -85,7 +85,8 @@
// From tclIntDecls.h
-#ifndef Tcl_Import_TCL_DECLARED
+//#ifndef Tcl_Import_TCL_DECLARED
+#if 0
EXTERN int Tcl_Import _ANSI_ARGS_( ( Tcl_Interp * interp,
Tcl_Namespace * nsPtr, char * pattern,
int allowOverwrite ) );
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ai...@us...> - 2013-12-19 01:25:18
|
Revision: 12881
http://sourceforge.net/p/plplot/code/12881
Author: airwin
Date: 2013-12-19 01:25:14 +0000 (Thu, 19 Dec 2013)
Log Message:
-----------
Comment out debug print statements that somehow got into a recent
commit.
Modified Paths:
--------------
trunk/bindings/tk/tkMain.c
Modified: trunk/bindings/tk/tkMain.c
===================================================================
--- trunk/bindings/tk/tkMain.c 2013-12-19 00:46:00 UTC (rev 12880)
+++ trunk/bindings/tk/tkMain.c 2013-12-19 01:25:14 UTC (rev 12881)
@@ -204,7 +204,7 @@
//
// Parse command-line arguments.
//
- fprintf( stderr, "Before Tk_ParseArgv\n" );
+ //fprintf( stderr, "Before Tk_ParseArgv\n" );
if ( Tk_ParseArgv( interp, (Tk_Window) NULL, &argc, argv, argTable, 0 )
!= TCL_OK )
@@ -212,7 +212,7 @@
fprintf( stderr, "%s\n", Tcl_GetStringResult( interp ) );
exit( 1 );
}
- fprintf( stderr, "After Tk_ParseArgv\n" );
+ //fprintf( stderr, "After Tk_ParseArgv\n" );
if ( name == NULL )
{
if ( fileName != NULL )
@@ -315,7 +315,7 @@
// and "argv". Also set the "geometry" variable from the geometry
// specified on the command line.
//
- fprintf( stderr, "Before Tcl_Merge\n" );
+ //fprintf( stderr, "Before Tcl_Merge\n" );
args = Tcl_Merge( argc - 1, ( CONST char * CONST * )argv + 1 );
Tcl_SetVar( interp, "argv", args, TCL_GLOBAL_ONLY );
@@ -323,7 +323,7 @@
sprintf( buf, "%d", argc - 1 );
Tcl_SetVar( interp, "argc", buf, TCL_GLOBAL_ONLY );
- fprintf( stderr, "After Tcl_Merge\n" );
+ //fprintf( stderr, "After Tcl_Merge\n" );
if ( geometry != NULL )
{
Tcl_SetVar( interp, "geometry", geometry, TCL_GLOBAL_ONLY );
@@ -345,7 +345,7 @@
//
// Invoke application-specific initialization.
//
- fprintf( stderr, "Before AppInit\n" );
+ //fprintf( stderr, "Before AppInit\n" );
if ( ( *AppInit )( interp ) != TCL_OK )
{
@@ -369,7 +369,7 @@
//
// Process the startup script, if any.
//
- fprintf( stderr, "Before startup\n" );
+ //fprintf( stderr, "Before startup\n" );
if ( script != NULL )
{
@@ -384,7 +384,7 @@
//
// Invoke the script specified on the command line, if any.
//
- fprintf( stderr, "Before source\n" );
+ //fprintf( stderr, "Before source\n" );
if ( fileName != NULL )
{
@@ -448,7 +448,7 @@
// are no windows left, Tk_MainLoop returns and we exit.
//
- fprintf( stderr, "Before Tk_MainLoop\n" );
+ //fprintf( stderr, "Before Tk_MainLoop\n" );
Tk_MainLoop();
//
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ai...@us...> - 2010-11-11 18:07:56
|
Revision: 11326
http://plplot.svn.sourceforge.net/plplot/?rev=11326&view=rev
Author: airwin
Date: 2010-11-11 18:07:50 +0000 (Thu, 11 Nov 2010)
Log Message:
-----------
Fix clobbered commentary that has been in this file since its initial
commit back in 1994 (!). The revised form of the commentary has been
taken from a modern version of TkInit.c that was found with
google search for <tkmain.c "Commands will come from standard input">.
Modified Paths:
--------------
trunk/bindings/tk/tkMain.c
Modified: trunk/bindings/tk/tkMain.c
===================================================================
--- trunk/bindings/tk/tkMain.c 2010-11-11 17:41:21 UTC (rev 11325)
+++ trunk/bindings/tk/tkMain.c 2010-11-11 18:07:50 UTC (rev 11326)
@@ -378,10 +378,10 @@
{
//
// Commands will come from standard input, so set up an event
- // handler for standard input. If the input device is aEvaluate the
- // .rc file, if one has been specified, set up an event handler
- // for standard input, and print a prompt if the input
- // device is a terminal.
+ // handler for standard input. Evaluate the .rc file, if one
+ // has been specified, set up an event handler for standard
+ // input, and print a prompt if the input device is a
+ // terminal.
//
if ( RcFileName != NULL )
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <arj...@us...> - 2013-01-29 08:37:31
|
Revision: 12285
http://plplot.svn.sourceforge.net/plplot/?rev=12285&view=rev
Author: arjenmarkus
Date: 2013-01-29 08:37:25 +0000 (Tue, 29 Jan 2013)
Log Message:
-----------
Almost trivial change to get rid of the last direct use of interp->result.
Note: not tested because of lack of access to a Linux platform
Modified Paths:
--------------
trunk/bindings/tk/tkMain.c
Modified: trunk/bindings/tk/tkMain.c
===================================================================
--- trunk/bindings/tk/tkMain.c 2013-01-08 05:26:34 UTC (rev 12284)
+++ trunk/bindings/tk/tkMain.c 2013-01-29 08:37:25 UTC (rev 12285)
@@ -599,7 +599,7 @@
{
Tcl_AddErrorInfo( intp,
"\n (script that generates prompt)" );
- fprintf( stderr, "%s\n", intp->result );
+ fprintf( stderr, "%s\n", Tcl_GetStringResult(intp) );
goto defaultPrompt;
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
Thanks for helping keep SourceForge clean.
X