summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorIan MacArthur <imacarthur@gmail.com>2008-11-30 18:46:50 +0000
committerIan MacArthur <imacarthur@gmail.com>2008-11-30 18:46:50 +0000
commitcfc5853ae79b728a63b2a66aa7a8c566de6d0c38 (patch)
treefe8144cd012f1b6d14d949c346056a39ffd3d47a /src
parent17e38137d8dd26e09ef742503513ecd0b334e5fe (diff)
STR #2076 - fix typos in fl_font_x.cxx. Basically I am an idiot and had checked in the wrong version. Sorry.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@6533 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src')
-rw-r--r--src/fl_font_x.cxx8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/fl_font_x.cxx b/src/fl_font_x.cxx
index aeabe6765..4502d73c4 100644
--- a/src/fl_font_x.cxx
+++ b/src/fl_font_x.cxx
@@ -299,10 +299,10 @@ double fl_width(unsigned int c) {
void fl_text_extents(const char *c, int n, int &dx, int &dy, int &W, int &H) {
#warning fl_text_extents is only a test stub in Xlib build at present
- w = 0; h = 0;
- fl_measure(c, &w, &h, 0);
+ W = 0; H = 0;
+ fl_measure(c, W, H, 0);
dx = 0;
- dy = fl_descent() - h;
+ dy = fl_descent() - H;
} // fl_text_extents
@@ -315,7 +315,7 @@ void fl_draw(const char* c, int n, int x, int y) {
// XDrawString(fl_display, fl_window, fl_gc, x, y, c, n);
XUtf8DrawString(fl_display, fl_window, fl_xfont, fl_gc, x, y, c, n);
}
-
+
//void fl_draw(const char* str, int n, float x, float y) {
// fl_draw(str, n, (int)x, (int)y);
//}