diff options
author | Andrew John Hughes <gnu_andrew@member.fsf.org> | 2006-11-29 22:43:35 +0000 |
---|---|---|
committer | Andrew John Hughes <gnu_andrew@member.fsf.org> | 2006-11-29 22:43:35 +0000 |
commit | 3be294e0e9f07e379e1499b9868db9855eb8726f (patch) | |
tree | a1f67d3f1469ecc142b11c30b1e3c2e1a624794d /native/jni/gtk-peer/gdkfont.h | |
parent | f40b961c6c82ebc9ae9863635e5fe19c0b07c116 (diff) | |
download | classpath-3be294e0e9f07e379e1499b9868db9855eb8726f.tar.gz |
2006-11-29 Andrew John Hughes <gnu_andrew@member.fsf.org>
* Merge of HEAD-->generics for 2006/11/12-2006/11/29.
Diffstat (limited to 'native/jni/gtk-peer/gdkfont.h')
-rw-r--r-- | native/jni/gtk-peer/gdkfont.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/native/jni/gtk-peer/gdkfont.h b/native/jni/gtk-peer/gdkfont.h index cf2333015..5545bccaa 100644 --- a/native/jni/gtk-peer/gdkfont.h +++ b/native/jni/gtk-peer/gdkfont.h @@ -92,7 +92,10 @@ extern struct state_table *cp_gtk_native_text_layout_state_table; #define FONT_METRICS_DESCENT 2 #define FONT_METRICS_MAX_DESCENT 3 #define FONT_METRICS_MAX_ADVANCE 4 -#define NUM_FONT_METRICS 5 +#define FONT_METRICS_HEIGHT 5 +#define FONT_METRICS_UNDERLINE_OFFSET 6 +#define FONT_METRICS_UNDERLINE_THICKNESS 7 +#define NUM_FONT_METRICS 8 #define TEXT_METRICS_X_BEARING 0 #define TEXT_METRICS_Y_BEARING 1 |