Author: manolo
Date: 2012-05-03 04:53:16 -0700 (Thu, 03 May 2012)
New Revision: 9442
Log:
Fixed WIN32 compilation error of src/fltk3/vertex.cxx
Modified:
branches/branch-3.0/include/FL/Fl_Device.H
branches/branch-3.0/include/fltk3/Device.h
Modified: branches/branch-3.0/include/FL/Fl_Device.H
===================================================================
--- branches/branch-3.0/include/FL/Fl_Device.H 2012-05-03 10:56:30 UTC (rev
9441)
+++ branches/branch-3.0/include/FL/Fl_Device.H 2012-05-03 11:53:16 UTC (rev
9442)
@@ -79,7 +79,9 @@
}
FLTK3_DRIVER_WRAPPER(font(Fl_Font f, Fl_Fontsize s), font(_1to3_font(f),
_1to3_fontsize(s)))
FLTK3_DRIVER_WRAPPER(draw(const char* str, int l, int x, int y), draw(str, l,
x, y))
+#ifdef __APPLE__
FLTK3_DRIVER_WRAPPER(draw(const char* str, int l, float fx, float fy),
draw(str, l, fx, fy))
+#endif
FLTK3_DRIVER_WRAPPER(draw(int angle, const char* str, int l, int x, int y),
draw(angle, str, l, x, y))
FLTK3_DRIVER_WRAPPER(line(int x, int y, int x1, int y1), line(x, y, x1, y1))
FLTK3_DRIVER_WRAPPER(rect(int x, int y, int w, int h), rect(x, y, w, h))
@@ -244,7 +246,9 @@
else GraphicsDriver::call; \
}
FLTK3_DRIVER_VF(draw(const char* str, int l, int x, int y), draw(str, l, x,
y))
+#ifdef __APPLE__
FLTK3_DRIVER_VF(draw(const char* str, int l, float fx, float fy), draw(str,
l, fx, fy))
+#endif
FLTK3_DRIVER_VF(draw(int angle, const char* str, int l, int x, int y),
draw(angle, str, l, x, y))
FLTK3_DRIVER_VF(line(int x, int y, int x1, int y1), line(x, y, x1, y1))
FLTK3_DRIVER_VF(rect(int x, int y, int w, int h), rect(x, y, w, h))
Modified: branches/branch-3.0/include/fltk3/Device.h
===================================================================
--- branches/branch-3.0/include/fltk3/Device.h 2012-05-03 10:56:30 UTC (rev
9441)
+++ branches/branch-3.0/include/fltk3/Device.h 2012-05-03 11:53:16 UTC (rev
9442)
@@ -93,6 +93,7 @@
class FLTK3_EXPORT GraphicsDriver : public Object {
friend void ::gl_start();
friend class ::Fl_Graphics_Driver;
+ friend class GDIGraphicsDriver;
public:
/** A 2D coordinate transformation matrix
*/
_______________________________________________
fltk-commit mailing list
[email protected]
http://lists.easysw.com/mailman/listinfo/fltk-commit
