diff --git a/GNUmakefile b/GNUmakefile index a198b18..4d5839a 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -34,7 +34,7 @@ E_LIBS = $(LIBS) -lMw L_OBJS = src/core.o src/default.o src/draw.o src/lowlevel.o src/font.o src/boldfont.o src/error.o L_OBJS += src/external/ds.o src/external/image.o -L_OBJS += src/widget/window.o src/widget/button.o src/widget/frame.o src/widget/menu.o src/widget/submenu.o +L_OBJS += src/widget/window.o src/widget/button.o src/widget/frame.o src/widget/menu.o src/widget/submenu.o src/widget/image.o ifeq ($(TARGET),NetBSD) CFLAGS += -I/usr/X11R7/include -I/usr/pkg/include diff --git a/doc/index.html b/doc/index.html index e38b728..d280c5a 100644 --- a/doc/index.html +++ b/doc/index.html @@ -152,6 +152,12 @@
Mw/GDI.h
+
+ Mw/Image.h +
+
+ MwImageClass +
Mw/LowLevel.h
@@ -1345,6 +1351,20 @@
+

Mw/Image.h

+
+
+ Image widget. +
+
+
+
MWDECL MwClass MwImageClass;
+
+
+ Image widget class. +
+
+

Mw/LowLevel.h

diff --git a/examples/image.c b/examples/image.c index a658ed7..cf8ebb4 100644 --- a/examples/image.c +++ b/examples/image.c @@ -3,16 +3,16 @@ int main() { MwWidget window = MwVaCreateWidget(MwWindowClass, "window", NULL, 0, 0, 500, 500, - MwNtitle, "image button", + MwNtitle, "image image", NULL); - MwWidget button = MwCreateWidget(MwButtonClass, "button", window, 50, 50, 400, 400); + MwWidget image = MwCreateWidget(MwImageClass, "image", window, 50, 50, 400, 400); MwLLPixmap px = MwLoadImage(window, "examples/picture.png"); MwVaApply(window, MwNiconPixmap, px, NULL); - MwVaApply(button, + MwVaApply(image, MwNpixmap, px, NULL); diff --git a/include/Mw/Milsko.h b/include/Mw/Milsko.h index 1a4b529..08e174b 100644 --- a/include/Mw/Milsko.h +++ b/include/Mw/Milsko.h @@ -21,5 +21,6 @@ #include #include #include +#include #endif