summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Melcher <fltk@matthiasm.com>2009-09-27 11:09:03 +0000
committerMatthias Melcher <fltk@matthiasm.com>2009-09-27 11:09:03 +0000
commitbc063e345f3d1f872dc2290433362752db88fa17 (patch)
tree4899fe92be8d6631664f526dfcbbb254ad5946f6
parentc8adc2fdded2081cb8dd8ba4b72b2703fc74889b (diff)
Typo
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@6903 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
-rw-r--r--FL/Fl.H2
-rw-r--r--src/glut_font.cxx3
2 files changed, 3 insertions, 2 deletions
diff --git a/FL/Fl.H b/FL/Fl.H
index efeaf8595..363a9ede5 100644
--- a/FL/Fl.H
+++ b/FL/Fl.H
@@ -680,7 +680,7 @@ public:
8-bit RGB color. The color is not allocated until fl_color(i) is used.
*/
static void set_color(Fl_Color, unsigned); // platform dependent
- static unsigned get_color(Fl_Color);
+ static Fl_Color get_color(Fl_Color);
static void get_color(Fl_Color, uchar&, uchar&, uchar&);
/**
Frees the specified color from the colormap, if applicable.
diff --git a/src/glut_font.cxx b/src/glut_font.cxx
index ce25d06b3..474689f33 100644
--- a/src/glut_font.cxx
+++ b/src/glut_font.cxx
@@ -115,7 +115,8 @@ void glutStrokeString(void* fontID, const unsigned char *string) {
* point back to the start of the line and down one line.
*/
-#if defined(__GNUC__)#warning FIXME This needs to be UTF aware now
+#if defined(__GNUC__)
+#warning FIXME This needs to be UTF aware now
#endif /*__GNUC__*/
while ((c = *string++) != 0) {