Author: manolo
Date: 2012-04-01 15:08:16 -0700 (Sun, 01 Apr 2012)
New Revision: 9315
Log:
FLTK1 compatibility: Fl_Tiled_Image
Modified:
branches/branch-3.0/include/FL/Fl_Tiled_Image.H
branches/branch-3.0/include/fltk3/Wrapper.h
Modified: branches/branch-3.0/include/FL/Fl_Tiled_Image.H
===================================================================
--- branches/branch-3.0/include/FL/Fl_Tiled_Image.H 2012-04-01 17:47:15 UTC
(rev 9314)
+++ branches/branch-3.0/include/FL/Fl_Tiled_Image.H 2012-04-01 22:08:16 UTC
(rev 9315)
@@ -33,15 +33,15 @@
#include <fltk3/TiledImage.h>
#include "Fl_Image.H"
-FLTK3_WRAPPER_INTERFACE_BEGIN(Fl_Image, Image)
-FLTK3_WRAPPER_INTERFACE_IMAGE(Fl_Image, Image)
+FLTK3_WRAPPER_INTERFACE_BEGIN(Fl_Tiled_Image, TiledImage)
+FLTK3_WRAPPER_INTERFACE_TILED(Fl_Tiled_Image, TiledImage)
FLTK3_WRAPPER_INTERFACE_END()
-FLTK3_IMAGE_VCALLS(Fl_Image, Image)
class FL_EXPORT Fl_Tiled_Image : public Fl_Image {
public:
+ FLTK3_IMAGE_VCALLS(Fl_Tiled_Image, TiledImage)
Fl_Tiled_Image(Fl_Image *i, int W = 0, int H = 0) {
_p = new fltk3::TiledImage(fltk3::_1to3_image(i), W, H);
Modified: branches/branch-3.0/include/fltk3/Wrapper.h
===================================================================
--- branches/branch-3.0/include/fltk3/Wrapper.h 2012-04-01 17:47:15 UTC (rev
9314)
+++ branches/branch-3.0/include/fltk3/Wrapper.h 2012-04-01 22:08:16 UTC (rev
9315)
@@ -259,6 +259,9 @@
#define FLTK3_WRAPPER_INTERFACE_IMAGE_CTOR_3ARGS(type3) \
type3##_I(const uchar *bits, int W, int H) : type3(bits, W, H) { }
+#define FLTK3_WRAPPER_INTERFACE_IMAGE_CTOR_TILED(type3) \
+ type3##_I(fltk3::Image* bits, int W, int H) : type3(bits, W, H) { }
+
#define FLTK3_WRAPPER_INTERFACE_IMAGE_BODY(type3) \
Image *copy(int W, int H) { \
FLTK3_IMAGE_VCALLS_WRAPPER_RET(Image *, copy(W, H), CopyWH) \
@@ -297,6 +300,10 @@
FLTK3_WRAPPER_INTERFACE_IMAGE_CTOR_3ARGS(type3) \
FLTK3_WRAPPER_INTERFACE_IMAGE_BODY(type3)
+#define FLTK3_WRAPPER_INTERFACE_TILED(type1, type3) \
+ FLTK3_WRAPPER_INTERFACE_IMAGE_CTOR_TILED(type3) \
+ FLTK3_WRAPPER_INTERFACE_IMAGE_BODY(type3)
+
#define FLTK3_WRAPPER_INTERFACE_END() \
}; \
}
_______________________________________________
fltk-commit mailing list
[email protected]
http://lists.easysw.com/mailman/listinfo/fltk-commit
