diff --git a/rainbow/Framebuffer/Framebuffer.upp b/rainbow/Framebuffer/Framebuffer.upp index 5db282218..6338bf1a2 100644 --- a/rainbow/Framebuffer/Framebuffer.upp +++ b/rainbow/Framebuffer/Framebuffer.upp @@ -9,6 +9,7 @@ file Draw.cpp, Image.cpp, Util.cpp, + FB.iml, Ctrl.h, Ctrl.cpp, Wnd.cpp, diff --git a/rainbow/Framebuffer/Image.cpp b/rainbow/Framebuffer/Image.cpp index 3ad6ae7a3..bfdd31bef 100644 --- a/rainbow/Framebuffer/Image.cpp +++ b/rainbow/Framebuffer/Image.cpp @@ -97,21 +97,28 @@ ImageDraw::ImageDraw(int cx, int cy) has_alpha = false; } -Image Image::Arrow() { return CtrlImg::arrow(); } -Image Image::Wait() { return CtrlImg::arrow(); } -Image Image::IBeam() { return CtrlImg::arrow(); } -Image Image::No() { return CtrlImg::arrow(); } -Image Image::SizeAll() { return CtrlImg::arrow(); } -Image Image::SizeHorz() { return CtrlImg::arrow(); } -Image Image::SizeVert() { return CtrlImg::arrow(); } -Image Image::SizeTopLeft() { return CtrlImg::arrow(); } -Image Image::SizeTop() { return CtrlImg::arrow(); } -Image Image::SizeTopRight() { return CtrlImg::arrow(); } -Image Image::SizeLeft() { return CtrlImg::arrow(); } -Image Image::SizeRight() { return CtrlImg::arrow(); } -Image Image::SizeBottomLeft() { return CtrlImg::arrow(); } -Image Image::SizeBottom() { return CtrlImg::arrow(); } -Image Image::SizeBottomRight() { return CtrlImg::arrow(); } +#define IMAGECLASS FBImg +#define IMAGEFILE +#include +#define IMAGECLASS FBImg +#define IMAGEFILE +#include + +Image Image::Arrow() { return FBImg::arrow(); } +Image Image::Wait() { return FBImg::wait(); } +Image Image::IBeam() { return FBImg::ibeam(); } +Image Image::No() { return FBImg::no(); } +Image Image::SizeAll() { return FBImg::sizeall(); } +Image Image::SizeHorz() { return FBImg::sizehorz(); } +Image Image::SizeVert() { return FBImg::sizevert(); } +Image Image::SizeTopLeft() { return FBImg::sizetopleft(); } +Image Image::SizeTop() { return FBImg::sizetop(); } +Image Image::SizeTopRight() { return FBImg::sizetopright(); } +Image Image::SizeLeft() { return FBImg::sizeleft(); } +Image Image::SizeRight() { return FBImg::sizeright(); } +Image Image::SizeBottomLeft() { return FBImg::sizebottomleft(); } +Image Image::SizeBottom() { return FBImg::sizebottom(); } +Image Image::SizeBottomRight() { return FBImg::sizebottomright(); } END_UPP_NAMESPACE