Author: manolo
Date: 2012-04-20 03:49:36 -0700 (Fri, 20 Apr 2012)
New Revision: 9360
Log:
Added FLTK1 compatibility of fl_measure_pixmap()
Modified:
branches/branch-3.0/include/FL/fl_draw.H
Modified: branches/branch-3.0/include/FL/fl_draw.H
===================================================================
--- branches/branch-3.0/include/FL/fl_draw.H 2012-04-19 08:58:22 UTC (rev
9359)
+++ branches/branch-3.0/include/FL/fl_draw.H 2012-04-20 10:49:36 UTC (rev
9360)
@@ -444,13 +444,16 @@
return fltk3::draw_pixmap(data, x, y, bg);
}
-#if 0
+inline int fl_measure_pixmap(/*const*/ char* const* data, int &w, int &h) {
+ return fltk3::measure_pixmap(data, w, h);
+}
-FL_EXPORT int fl_measure_pixmap(/*const*/ char* const* data, int &w, int &h);
+inline int fl_measure_pixmap(const char* const* data, int &w, int &h) {
+ return fltk3::measure_pixmap(data, w, h);
+}
-FL_EXPORT int fl_measure_pixmap(const char* const* cdata, int &w, int &h);
+#if 0
-
FL_EXPORT void fl_scroll(int X, int Y, int W, int H, int dx, int dy,
void (*draw_area)(void*, int,int,int,int), void*
data);
#endif
_______________________________________________
fltk-commit mailing list
[email protected]
http://lists.easysw.com/mailman/listinfo/fltk-commit
