Author: ianmacarthur
Date: 2012-05-17 15:47:27 -0700 (Thu, 17 May 2012)
New Revision: 9522
Log:
Minor fixes to get the new fltk3 symbol stuff to build on WinXX.
Clashes with wingdi over the use of the name Rectangle...
Modified:
branches/branch-3.0/src/fltk3/Symbol.cxx
Modified: branches/branch-3.0/src/fltk3/Symbol.cxx
===================================================================
--- branches/branch-3.0/src/fltk3/Symbol.cxx 2012-05-17 22:42:26 UTC (rev
9521)
+++ branches/branch-3.0/src/fltk3/Symbol.cxx 2012-05-17 22:47:27 UTC (rev
9522)
@@ -399,7 +399,7 @@
void (*drawit)(Color);
public:
SymbolSymbol(const char* name, void (*f)(Color)) : Symbol(name), drawit(f) {}
- void _draw(const Rectangle&) const;
+ void _draw(const fltk3::Rectangle&) const;
};
/* Adds a symbol to the system. Returns whether correct. */
@@ -409,7 +409,7 @@
return 1;
}
-void SymbolSymbol::_draw(const Rectangle& r) const
+void SymbolSymbol::_draw(const fltk3::Rectangle& r) const
{
const char* p = text();
if (*p == '#') p++; // ignore equalscale indicator from fltk1.1
_______________________________________________
fltk-commit mailing list
[email protected]
http://lists.easysw.com/mailman/listinfo/fltk-commit
