aboutsummaryrefslogtreecommitdiff
path: root/generic
diff options
context:
space:
mode:
Diffstat (limited to 'generic')
-rw-r--r--generic/MapInfo.c6
-rw-r--r--generic/Text.c8
2 files changed, 7 insertions, 7 deletions
diff --git a/generic/MapInfo.c b/generic/MapInfo.c
index 268bd8a..91fc0b7 100644
--- a/generic/MapInfo.c
+++ b/generic/MapInfo.c
@@ -1619,7 +1619,7 @@ ZnMapInfoObjCmd(ClientData client_data __unused,
int index, index2, result;
ZnMapInfoMaster *master;
Tcl_Obj *l;
-#ifdef PTK
+#ifdef PTK_800
static char *sub_cmd_strings[] =
#else
static CONST char *sub_cmd_strings[] =
@@ -1628,7 +1628,7 @@ ZnMapInfoObjCmd(ClientData client_data __unused,
"add", "count", "create", "delete", "duplicate",
"get", "remove", "replace", "scale", "translate", NULL
};
-#ifdef PTK
+#ifdef PTK_800
static char *e_type_strings[] =
#else
static CONST char *e_type_strings[] =
@@ -2098,7 +2098,7 @@ ZnVideomapObjCmd(ClientData client_data __unused,
int index;
int *id_array, id_num, i;
Tcl_Obj *l;
-#ifdef PTK
+#ifdef PTK_800
static char *sub_cmd_strings[] =
#else
static CONST char *sub_cmd_strings[] =
diff --git a/generic/Text.c b/generic/Text.c
index 5d82e69..b1725cc 100644
--- a/generic/Text.c
+++ b/generic/Text.c
@@ -1108,7 +1108,7 @@ Render(ZnItem item)
int underline_thickness, underline_pos=0, overstrike_pos=0;
int sel_first_line=-1, sel_last_line=-1, cursor_line=-1;
int sel_start_offset=0, sel_stop_offset=0, cursor_offset=0;
-#ifndef PTK
+#ifndef PTK_800
Tcl_Encoding enc;
#endif
@@ -1121,7 +1121,7 @@ Render(ZnItem item)
return;
}
}
-#ifndef PTK
+#ifndef PTK_800
enc = ZnTexFontEncoding(text->tfi);
#endif
@@ -1267,7 +1267,7 @@ Render(ZnItem item)
glEnable(GL_TEXTURE_2D);
}
-#ifndef PTK
+#ifndef PTK_800
/*
* Temporary ack to fix utf8 display.
* the malloc should be done once for
@@ -1559,7 +1559,7 @@ PointToChar(TextItem text,
n = Tk_MeasureChars(text->font, ti->start, (int) ti->num_bytes,
p.x + 2 - (int) ti->origin_x, TK_PARTIAL_OK,
&dummy);
-#ifdef PTK
+#ifdef PTK_800
byte_index = (ti->start + n - 1) - text->text;
#else
byte_index = Tcl_UtfPrev(ti->start + n, ti->start) - text->text;