swarm-hackers
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[swarm-hackers] two patches for using BLT 3.0


From: Marcus G. Daniels
Subject: [swarm-hackers] two patches for using BLT 3.0
Date: Sun, 03 Aug 2008 19:16:28 -0600
User-agent: Thunderbird 2.0.0.14 (X11/20080501)

Hi,

Here's a patch to BLT 3.0 (blt.sf.net) and an associated one for Swarm. Part of the Swarm patch (the part that is attached) I haven't yet committed to CVS yet because it will need a autoconfig test and ifdef to adapt to the different logic for BLT initialization.

There are a couple reasons to consider using BLT 3.0, over the 2.4z version we've been using for years.

1) Tcl/Tk 8.5 as found in Fedora 9 now no longer works properly with BLT 2.4.
2) There has been substantial work on BLT to directly support MacOS X.

Marcus

? Makefile.in
? tk/Makefile.in
Index: TkExtra.m
===================================================================
RCS file: /sources/swarm/swarm/src/tkobjc/TkExtra.m,v
retrieving revision 1.37
diff -c -r1.37 TkExtra.m
*** TkExtra.m   6 Jun 2007 06:46:31 -0000       1.37
--- TkExtra.m   4 Aug 2008 01:10:15 -0000
***************
*** 29,35 ****
  
  @implementation TkExtra
  
! int Blt_Init(Tcl_Interp *);                     // wish this were declared..
  
  static void
  setBltLibrary (id interp, const char *path)
--- 29,36 ----
  
  @implementation TkExtra
  
! int Blt_core_Init(Tcl_Interp *);                        // wish this were 
declared..
! int Blt_x_Init(Tcl_Interp *);                   // wish this were declared..
  
  static void
  setBltLibrary (id interp, const char *path)
***************
*** 104,110 ****
  
    // now init extras widget sets.
  
!   if (Blt_Init (interp) != TCL_OK)
      {
        char *msg = Tcl_GetVar (interp, "errorInfo", TCL_GLOBAL_ONLY);
        
--- 105,112 ----
  
    // now init extras widget sets.
  
!   if (Blt_core_Init (interp) != TCL_OK
!       || Blt_x_Init (interp) != TCL_OK)
      {
        char *msg = Tcl_GetVar (interp, "errorInfo", TCL_GLOBAL_ONLY);
        
? Makefile
? config.log
? config.status
? demos/Makefile
? library/Makefile
? library/pkgIndex.tcl
? man/BLT.n
? man/Blt_Tree.3
? man/Blt_TreeCreate.3
? man/Blt_TreeCreateNode.3
? man/Blt_TreeDeleteNode.3
? man/Blt_TreeExists.3
? man/Blt_TreeGetNode.3
? man/Blt_TreeGetToken.3
? man/Blt_TreeName.3
? man/Blt_TreeNodeId.3
? man/Blt_TreeReleaseToken.3
? man/Makefile
? man/barchart.n
? man/beep.n
? man/bgexec.n
? man/bitmap.n
? man/bltdebug.n
? man/busy.n
? man/container.n
? man/cutbuffer.n
? man/dragdrop.n
? man/eps.n
? man/graph.n
? man/hierbox.n
? man/hiertable.n
? man/htext.n
? man/spline.n
? man/stripchart.n
? man/table.n
? man/tabset.n
? man/tile.n
? man/tree.n
? man/treeview.n
? man/vector.n
? man/watch.n
? man/winop.n
? src/Makefile
? src/bltHash.h
? src/bltsh30
? src/bltwish30
? src/config.h
? src/shared/Makefile
Index: src/bltCoreInit.c
===================================================================
RCS file: /cvsroot/blt/blt/src/bltCoreInit.c,v
retrieving revision 1.13
diff -c -r1.13 bltCoreInit.c
*** src/bltCoreInit.c   20 Jul 2008 04:59:27 -0000      1.13
--- src/bltCoreInit.c   4 Aug 2008 01:10:32 -0000
***************
*** 32,38 ****
  #include "bltArrayObj.h"
  #include "bltMath.h"
  
! #define EXACT 1
  
  #ifndef BLT_LIBRARY
  #  ifdef WIN32
--- 32,38 ----
  #include "bltArrayObj.h"
  #include "bltMath.h"
  
! #define EXACT 0
  
  #ifndef BLT_LIBRARY
  #  ifdef WIN32
Index: src/bltExtInit.c
===================================================================
RCS file: /cvsroot/blt/blt/src/bltExtInit.c,v
retrieving revision 1.13
diff -c -r1.13 bltExtInit.c
*** src/bltExtInit.c    21 Jul 2008 03:24:56 -0000      1.13
--- src/bltExtInit.c    4 Aug 2008 01:10:32 -0000
***************
*** 30,36 ****
  #include "bltInt.h"
  #include "bltNsUtil.h"
  
! #define EXACT 1
  
  BLT_EXTERN Tcl_AppInitProc Blt_x_Init;
  BLT_EXTERN Tcl_AppInitProc Blt_x_SafeInit;
--- 30,36 ----
  #include "bltInt.h"
  #include "bltNsUtil.h"
  
! #define EXACT 0
  
  BLT_EXTERN Tcl_AppInitProc Blt_x_Init;
  BLT_EXTERN Tcl_AppInitProc Blt_x_SafeInit;
Index: src/tkDisplay.h
===================================================================
RCS file: /cvsroot/blt/blt/src/tkDisplay.h,v
retrieving revision 1.7
diff -c -r1.7 tkDisplay.h
*** src/tkDisplay.h     7 Jul 2008 00:01:22 -0000       1.7
--- src/tkDisplay.h     4 Aug 2008 01:10:33 -0000
***************
*** 534,539 ****
--- 534,542 ----
  
  #ifdef TK_USE_INPUT_METHODS
      XIM inputMethod;          /* Input method for this display */
+ #if (_TK_VERSION >= _VERSION(8,5,0))
+     XIMStyle inputStyle;
+ #endif
  #if (_TK_VERSION >= _VERSION(8,4,0))
  #if TK_XIM_SPOT
      XFontSet inputXfs;                /* XFontSet cached for over-the-spot 
XIM. */

reply via email to

[Prev in Thread] Current Thread [Next in Thread]