Check-in [ec154d64d1]
Not logged in

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:another cleanup in vu widgets
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: ec154d64d173b89b75ba1f718ceb32bdf4da1f32
User & Date: chw 2016-11-19 19:11:22
Context
2016-11-21
13:34
repair tclx profile command for 8.6 check-in: c29648d90f user: chw tags: trunk
2016-11-19
19:11
another cleanup in vu widgets check-in: ec154d64d1 user: chw tags: trunk
16:49
two additions to TIP#302 sample implementation check-in: cd1e683bbd user: chw tags: trunk
Changes

Changes to jni/vu/configure.

8014
8015
8016
8017
8018
8019
8020





































8021
8022
8023
8024
8025
8026
8027
# files.
#
# TEA_ADD_* any platform specific compiler/build info here.
#--------------------------------------------------------------------

if test "${TEA_PLATFORM}" = "windows" ; then
    CLEANFILES="pkgIndex.tcl *.lib *.dll *.exp *.ilk *.pdb vc*.pch"






































    vars="gdi32.lib"
    for i in $vars; do
	if test "${TEA_PLATFORM}" = "windows" -a "$GCC" = "yes" ; then
	    # Convert foo.lib to -lfoo for GCC.  No-op if not *.lib
	    i=`echo "$i" | sed -e 's/^\([^-].*\)\.lib$/-l\1/i'`
	fi







>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>







8014
8015
8016
8017
8018
8019
8020
8021
8022
8023
8024
8025
8026
8027
8028
8029
8030
8031
8032
8033
8034
8035
8036
8037
8038
8039
8040
8041
8042
8043
8044
8045
8046
8047
8048
8049
8050
8051
8052
8053
8054
8055
8056
8057
8058
8059
8060
8061
8062
8063
8064
# files.
#
# TEA_ADD_* any platform specific compiler/build info here.
#--------------------------------------------------------------------

if test "${TEA_PLATFORM}" = "windows" ; then
    CLEANFILES="pkgIndex.tcl *.lib *.dll *.exp *.ilk *.pdb vc*.pch"

    vars="winUtil.c"
    for i in $vars; do
	case $i in
	    \$*)
		# allow $-var names
		PKG_SOURCES="$PKG_SOURCES $i"
		PKG_OBJECTS="$PKG_OBJECTS $i"
		;;
	    *)
		# check for existence - allows for generic/win/unix VPATH
		# To add more dirs here (like 'src'), you have to update VPATH
		# in Makefile.in as well
		if test ! -f "${srcdir}/$i" -a ! -f "${srcdir}/generic/$i" \
		    -a ! -f "${srcdir}/win/$i" -a ! -f "${srcdir}/unix/$i" \
		    -a ! -f "${srcdir}/macosx/$i" -a ! -f "${srcdir}/sdl/$i" \
		    ; then
		    { { $as_echo "$as_me:$LINENO: error: could not find source file '$i'" >&5
$as_echo "$as_me: error: could not find source file '$i'" >&2;}
   { (exit 1); exit 1; }; }
		fi
		PKG_SOURCES="$PKG_SOURCES $i"
		# this assumes it is in a VPATH dir
		i=`basename $i`
		# handle user calling this before or after TEA_SETUP_COMPILER
		if test x"${OBJEXT}" != x ; then
		    j="`echo $i | sed -e 's/\.[^.]*$//'`.${OBJEXT}"
		else
		    j="`echo $i | sed -e 's/\.[^.]*$//'`.\${OBJEXT}"
		fi
		PKG_OBJECTS="$PKG_OBJECTS $j"
		;;
	esac
    done




    vars="gdi32.lib"
    for i in $vars; do
	if test "${TEA_PLATFORM}" = "windows" -a "$GCC" = "yes" ; then
	    # Convert foo.lib to -lfoo for GCC.  No-op if not *.lib
	    i=`echo "$i" | sed -e 's/^\([^-].*\)\.lib$/-l\1/i'`
	fi

Changes to jni/vu/configure.in.

80
81
82
83
84
85
86

87
88
89
90
91
92
93
# files.
#
# TEA_ADD_* any platform specific compiler/build info here.
#--------------------------------------------------------------------

if test "${TEA_PLATFORM}" = "windows" ; then
    CLEANFILES="pkgIndex.tcl *.lib *.dll *.exp *.ilk *.pdb vc*.pch"

    TEA_ADD_LIBS([gdi32.lib])
else
    CLEANFILES="pkgIndex.tcl"
    TEA_ADD_LIBS([${MATH_LIBS}])
fi
AC_SUBST(CLEANFILES)








>







80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
# files.
#
# TEA_ADD_* any platform specific compiler/build info here.
#--------------------------------------------------------------------

if test "${TEA_PLATFORM}" = "windows" ; then
    CLEANFILES="pkgIndex.tcl *.lib *.dll *.exp *.ilk *.pdb vc*.pch"
    TEA_ADD_SOURCES([winUtil.c])
    TEA_ADD_LIBS([gdi32.lib])
else
    CLEANFILES="pkgIndex.tcl"
    TEA_ADD_LIBS([${MATH_LIBS}])
fi
AC_SUBST(CLEANFILES)

Changes to jni/vu/generic/tkCanvSticker.c.

35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50

#include "pkg.h"

#if (defined(__WIN32__) || defined(MAC_TCL) || defined(MAC_OSX_TK)) && !defined(XDrawPoint)
#define XDrawPoint(display, d, gc, x, y) XDrawLine(display, d, gc, x, y, x, y)
#endif

#if defined(PLATFORM_SDL) || TCL_MAJOR_VERSION > 8 || \
    (TCL_MAJOR_VERSION == 8 && TCL_MINOR_VERSION > 5)
#define HAVE_ANGLED_TEXT 1
#endif

#ifndef HAVE_ANGLED_TEXT

/*
 * The structure below is used for rotating text.







|
|







35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50

#include "pkg.h"

#if (defined(__WIN32__) || defined(MAC_TCL) || defined(MAC_OSX_TK)) && !defined(XDrawPoint)
#define XDrawPoint(display, d, gc, x, y) XDrawLine(display, d, gc, x, y, x, y)
#endif

#if defined(PLATFORM_SDL) || TK_MAJOR_VERSION > 8 || \
    (TK_MAJOR_VERSION == 8 && TK_MINOR_VERSION > 5)
#define HAVE_ANGLED_TEXT 1
#endif

#ifndef HAVE_ANGLED_TEXT

/*
 * The structure below is used for rotating text.

Changes to jni/vu/win/makefile.vc.

91
92
93
94
95
96
97

98
99
100
101
102
103
104

DLLOBJS = $(TMPDIR)\pkgInit.obj \
	  $(TMPDIR)\tkDial.obj \
	  $(TMPDIR)\tkPie.obj \
	  $(TMPDIR)\tkBargraph.obj \
	  $(TMPDIR)\tkSpinbox.obj \
	  $(TMPDIR)\tkPanedwindow.obj \

	  $(TMPDIR)\tkCanvUtil.obj \
	  $(TMPDIR)\tkCanvBarchart.obj \
	  $(TMPDIR)\tkCanvStripchart.obj \

#	  $(TMPDIR)\tkCombobox.obj

#







>







91
92
93
94
95
96
97
98
99
100
101
102
103
104
105

DLLOBJS = $(TMPDIR)\pkgInit.obj \
	  $(TMPDIR)\tkDial.obj \
	  $(TMPDIR)\tkPie.obj \
	  $(TMPDIR)\tkBargraph.obj \
	  $(TMPDIR)\tkSpinbox.obj \
	  $(TMPDIR)\tkPanedwindow.obj \
	  $(TMPDIR)\winUtil.obj \
	  $(TMPDIR)\tkCanvUtil.obj \
	  $(TMPDIR)\tkCanvBarchart.obj \
	  $(TMPDIR)\tkCanvStripchart.obj \

#	  $(TMPDIR)\tkCombobox.obj

#