aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlecoanet2000-08-31 12:27:26 +0000
committerlecoanet2000-08-31 12:27:26 +0000
commit924cadea687573d762c539ec9437d5b3c90539b6 (patch)
tree249af1c67f12b4ce238c8df8287a126a39054e43
parent9141c3ba053248de171e964ba8abcee2105dca9c (diff)
downloadtkzinc-924cadea687573d762c539ec9437d5b3c90539b6.zip
tkzinc-924cadea687573d762c539ec9437d5b3c90539b6.tar.gz
tkzinc-924cadea687573d762c539ec9437d5b3c90539b6.tar.bz2
tkzinc-924cadea687573d762c539ec9437d5b3c90539b6.tar.xz
*** empty log message ***
-rw-r--r--Bezier.c1
-rw-r--r--generic/Text.c7
-rw-r--r--patchlvl.h4
3 files changed, 7 insertions, 5 deletions
diff --git a/Bezier.c b/Bezier.c
index 7bba1d5..adfa243 100644
--- a/Bezier.c
+++ b/Bezier.c
@@ -47,7 +47,6 @@ static const char compile_id[]="$Compile: " __FILE__ " " __DATE__ " " __TIME__ "
* Bit offset of flags.
*/
#define FILLED_BIT 1<<0 /* If the item is filled with color/pattern */
-#define CLOSED_BIT 1<<1 /* If the item should be closed */
#define CCW 1<<2 /* Tell if the controls are described in
* clockwise or ccw order. */
#define FIRST_END_OK 1<<3
diff --git a/generic/Text.c b/generic/Text.c
index ec93cbd..3bb3a02 100644
--- a/generic/Text.c
+++ b/generic/Text.c
@@ -775,7 +775,7 @@ Pick(Item item,
int *part)
{
TextItem text = (TextItem) item;
- double dist, new_dist;
+ double dist = 1.0e40, new_dist;
int num_lines, i;
TextLineInfo lines, lines_ptr;
Tk_FontMetrics fm;
@@ -783,9 +783,12 @@ Pick(Item item,
ZnBBox line_bbox;
ZnPoint o;
+ if (!text->text_info) {
+ return dist;
+ }
+
lines = (TextLineInfo) ZnListArray(text->text_info);
num_lines = ZnListSize(text->text_info);
- dist = 1.0e40;
Tk_GetFontMetrics(text->font, &fm);
font_height = fm.descent + fm.ascent;
if (text->spacing > 0) {
diff --git a/patchlvl.h b/patchlvl.h
index f8c6fa1..10f273b 100644
--- a/patchlvl.h
+++ b/patchlvl.h
@@ -11,6 +11,6 @@
#ifndef ZINCVERSION
#define ZINCVER 3
#define ZINCREV 1
-#define ZINCPLVL 17
-#define ZINCVERSION "zinc-version-3117"
+#define ZINCPLVL 18
+#define ZINCVERSION "zinc-version-3118"
#endif