summaryrefslogtreecommitdiff
path: root/src/fl_draw.cxx
diff options
context:
space:
mode:
authorMichael R Sweet <michael.r.sweet@gmail.com>1998-10-19 21:00:26 +0000
committerMichael R Sweet <michael.r.sweet@gmail.com>1998-10-19 21:00:26 +0000
commit90e8eb7a4501562728d016eddc31225e7a4bd7fc (patch)
treec63dc0778f8c6385cf230aa66978a116426e0d9d /src/fl_draw.cxx
parent1a86a0ede02de76c617165fb3555c192f0b74347 (diff)
More changes from Bill Spitzak.
git-svn-id: file:///fltk/svn/fltk/trunk@20 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src/fl_draw.cxx')
-rw-r--r--src/fl_draw.cxx11
1 files changed, 4 insertions, 7 deletions
diff --git a/src/fl_draw.cxx b/src/fl_draw.cxx
index 5215b5f17..1693adc79 100644
--- a/src/fl_draw.cxx
+++ b/src/fl_draw.cxx
@@ -117,12 +117,6 @@ void fl_draw(
Fl_Align align,
void (*callthis)(const char*,int,int,int)
) {
- if (!str || !*str) return;
-
- // clip:
- if (w && h && !fl_not_clipped(x, y, w, h)) return;
- if (align & FL_ALIGN_CLIP) fl_clip(x, y, w, h);
-
const char* p;
const char* e;
char buf[MAXBUF];
@@ -171,6 +165,9 @@ void fl_draw(
const char* str, // the (multi-line) string
int x, int y, int w, int h, // bounding box
Fl_Align align) {
+ if (!str || !*str) return;
+ if (w && h && !fl_not_clipped(x, y, w, h)) return;
+ if (align & FL_ALIGN_CLIP) fl_clip(x, y, w, h);
fl_draw(str, x, y, w, h, align, fl_draw);
}
@@ -196,5 +193,5 @@ void fl_measure(const char* str, int& w, int& h) {
}
//
-// End of "$Id: fl_draw.cxx,v 1.2 1998/10/19 20:46:33 mike Exp $".
+// End of "$Id: fl_draw.cxx,v 1.3 1998/10/19 21:00:23 mike Exp $".
//