diff --git a/BorMakefile b/BorMakefile index 084c9f7..8138859 100644 --- a/BorMakefile +++ b/BorMakefile @@ -28,6 +28,8 @@ clean: del /f /q src\icon\error.obj del /f /q src\icon\news.obj del /f /q src\icon\question.obj + del /f /q src\icon\directory.obj + del /f /q src\icon\file.obj del /f /q src\cursor\default.obj del /f /q src\cursor\cross.obj del /f /q src\cursor\text.obj @@ -64,8 +66,8 @@ clean: del /f /q src\Mw.dll del /f /q oosrc\MwOO.dll -src\Mw.dll: src\core.obj src\draw.obj src\default.obj src\lowlevel.obj src\error.obj src\unicode.obj src\font.obj src\color.obj src\directory.obj src\messagebox.obj src\boldfont.obj external\ds.obj external\image.obj src\icon\info.obj src\icon\note.obj src\icon\warning.obj src\icon\error.obj src\icon\news.obj src\icon\question.obj src\cursor\default.obj src\cursor\cross.obj src\cursor\text.obj src\widget\button.obj src\widget\frame.obj src\widget\opengl.obj src\widget\window.obj src\widget\menu.obj src\widget\entry.obj src\widget\submenu.obj src\widget\viewport.obj src\widget\image.obj src\widget\scrollbar.obj src\widget\checkbox.obj src\widget\label.obj src\widget\listbox.obj src\widget\numberentry.obj src\backend\gdi.obj - $(LD) $(LDFLAGS) -e$@ src\core.obj src\draw.obj src\default.obj src\lowlevel.obj src\error.obj src\unicode.obj src\font.obj src\color.obj src\directory.obj src\messagebox.obj src\boldfont.obj external\ds.obj external\image.obj src\icon\info.obj src\icon\note.obj src\icon\warning.obj src\icon\error.obj src\icon\news.obj src\icon\question.obj src\cursor\default.obj src\cursor\cross.obj src\cursor\text.obj src\widget\button.obj src\widget\frame.obj src\widget\opengl.obj src\widget\window.obj src\widget\menu.obj src\widget\entry.obj src\widget\submenu.obj src\widget\viewport.obj src\widget\image.obj src\widget\scrollbar.obj src\widget\checkbox.obj src\widget\label.obj src\widget\listbox.obj src\widget\numberentry.obj src\backend\gdi.obj -lopengl32.lib -lgdi32.lib -luser32.lib +src\Mw.dll: src\core.obj src\draw.obj src\default.obj src\lowlevel.obj src\error.obj src\unicode.obj src\font.obj src\color.obj src\directory.obj src\messagebox.obj src\boldfont.obj external\ds.obj external\image.obj src\icon\info.obj src\icon\note.obj src\icon\warning.obj src\icon\error.obj src\icon\news.obj src\icon\question.obj src\icon\directory.obj src\icon\file.obj src\cursor\default.obj src\cursor\cross.obj src\cursor\text.obj src\widget\button.obj src\widget\frame.obj src\widget\opengl.obj src\widget\window.obj src\widget\menu.obj src\widget\entry.obj src\widget\submenu.obj src\widget\viewport.obj src\widget\image.obj src\widget\scrollbar.obj src\widget\checkbox.obj src\widget\label.obj src\widget\listbox.obj src\widget\numberentry.obj src\backend\gdi.obj + $(LD) $(LDFLAGS) -e$@ src\core.obj src\draw.obj src\default.obj src\lowlevel.obj src\error.obj src\unicode.obj src\font.obj src\color.obj src\directory.obj src\messagebox.obj src\boldfont.obj external\ds.obj external\image.obj src\icon\info.obj src\icon\note.obj src\icon\warning.obj src\icon\error.obj src\icon\news.obj src\icon\question.obj src\icon\directory.obj src\icon\file.obj src\cursor\default.obj src\cursor\cross.obj src\cursor\text.obj src\widget\button.obj src\widget\frame.obj src\widget\opengl.obj src\widget\window.obj src\widget\menu.obj src\widget\entry.obj src\widget\submenu.obj src\widget\viewport.obj src\widget\image.obj src\widget\scrollbar.obj src\widget\checkbox.obj src\widget\label.obj src\widget\listbox.obj src\widget\numberentry.obj src\backend\gdi.obj -lopengl32.lib -lgdi32.lib -luser32.lib implib src\Mw.lib src\Mw.dll oosrc\MwOO.dll: oosrc\base.obj oosrc\widget\button.obj oosrc\widget\frame.obj oosrc\widget\image.obj oosrc\widget\menu.obj oosrc\widget\opengl.obj oosrc\widget\scrollbar.obj oosrc\widget\submenu.obj oosrc\widget\window.obj oosrc\widget\checkbox.obj oosrc\widget\viewport.obj oosrc\widget\listbox.obj oosrc\widget\label.obj oosrc\widget\entry.obj oosrc\widget\numberentry.obj diff --git a/NTMakefile b/NTMakefile index 28a84a4..d143e2d 100644 --- a/NTMakefile +++ b/NTMakefile @@ -28,6 +28,8 @@ clean: del /f /q src\icon\error.obj del /f /q src\icon\news.obj del /f /q src\icon\question.obj + del /f /q src\icon\directory.obj + del /f /q src\icon\file.obj del /f /q src\cursor\default.obj del /f /q src\cursor\cross.obj del /f /q src\cursor\text.obj @@ -64,8 +66,8 @@ clean: del /f /q src\Mw.dll del /f /q oosrc\MwOO.dll -src\Mw.dll: src\core.obj src\draw.obj src\default.obj src\lowlevel.obj src\error.obj src\unicode.obj src\font.obj src\color.obj src\directory.obj src\messagebox.obj src\boldfont.obj external\ds.obj external\image.obj src\icon\info.obj src\icon\note.obj src\icon\warning.obj src\icon\error.obj src\icon\news.obj src\icon\question.obj src\cursor\default.obj src\cursor\cross.obj src\cursor\text.obj src\widget\button.obj src\widget\frame.obj src\widget\opengl.obj src\widget\window.obj src\widget\menu.obj src\widget\entry.obj src\widget\submenu.obj src\widget\viewport.obj src\widget\image.obj src\widget\scrollbar.obj src\widget\checkbox.obj src\widget\label.obj src\widget\listbox.obj src\widget\numberentry.obj src\backend\gdi.obj - $(LD) $(LDFLAGS) /OUT:$@ src\core.obj src\draw.obj src\default.obj src\lowlevel.obj src\error.obj src\unicode.obj src\font.obj src\color.obj src\directory.obj src\messagebox.obj src\boldfont.obj external\ds.obj external\image.obj src\icon\info.obj src\icon\note.obj src\icon\warning.obj src\icon\error.obj src\icon\news.obj src\icon\question.obj src\cursor\default.obj src\cursor\cross.obj src\cursor\text.obj src\widget\button.obj src\widget\frame.obj src\widget\opengl.obj src\widget\window.obj src\widget\menu.obj src\widget\entry.obj src\widget\submenu.obj src\widget\viewport.obj src\widget\image.obj src\widget\scrollbar.obj src\widget\checkbox.obj src\widget\label.obj src\widget\listbox.obj src\widget\numberentry.obj src\backend\gdi.obj opengl32.lib gdi32.lib user32.lib +src\Mw.dll: src\core.obj src\draw.obj src\default.obj src\lowlevel.obj src\error.obj src\unicode.obj src\font.obj src\color.obj src\directory.obj src\messagebox.obj src\boldfont.obj external\ds.obj external\image.obj src\icon\info.obj src\icon\note.obj src\icon\warning.obj src\icon\error.obj src\icon\news.obj src\icon\question.obj src\icon\directory.obj src\icon\file.obj src\cursor\default.obj src\cursor\cross.obj src\cursor\text.obj src\widget\button.obj src\widget\frame.obj src\widget\opengl.obj src\widget\window.obj src\widget\menu.obj src\widget\entry.obj src\widget\submenu.obj src\widget\viewport.obj src\widget\image.obj src\widget\scrollbar.obj src\widget\checkbox.obj src\widget\label.obj src\widget\listbox.obj src\widget\numberentry.obj src\backend\gdi.obj + $(LD) $(LDFLAGS) /OUT:$@ src\core.obj src\draw.obj src\default.obj src\lowlevel.obj src\error.obj src\unicode.obj src\font.obj src\color.obj src\directory.obj src\messagebox.obj src\boldfont.obj external\ds.obj external\image.obj src\icon\info.obj src\icon\note.obj src\icon\warning.obj src\icon\error.obj src\icon\news.obj src\icon\question.obj src\icon\directory.obj src\icon\file.obj src\cursor\default.obj src\cursor\cross.obj src\cursor\text.obj src\widget\button.obj src\widget\frame.obj src\widget\opengl.obj src\widget\window.obj src\widget\menu.obj src\widget\entry.obj src\widget\submenu.obj src\widget\viewport.obj src\widget\image.obj src\widget\scrollbar.obj src\widget\checkbox.obj src\widget\label.obj src\widget\listbox.obj src\widget\numberentry.obj src\backend\gdi.obj opengl32.lib gdi32.lib user32.lib oosrc\MwOO.dll: oosrc\base.obj oosrc\widget\button.obj oosrc\widget\frame.obj oosrc\widget\image.obj oosrc\widget\menu.obj oosrc\widget\opengl.obj oosrc\widget\scrollbar.obj oosrc\widget\submenu.obj oosrc\widget\window.obj oosrc\widget\checkbox.obj oosrc\widget\viewport.obj oosrc\widget\listbox.obj oosrc\widget\label.obj oosrc\widget\entry.obj oosrc\widget\numberentry.obj diff --git a/WatMakefile b/WatMakefile index 11a4b8e..0d0c336 100644 --- a/WatMakefile +++ b/WatMakefile @@ -27,6 +27,8 @@ clean: .SYMBOLIC %erase src/icon/error.obj %erase src/icon/news.obj %erase src/icon/question.obj + %erase src/icon/directory.obj + %erase src/icon/file.obj %erase src/cursor/default.obj %erase src/cursor/cross.obj %erase src/cursor/text.obj @@ -63,8 +65,8 @@ clean: .SYMBOLIC %erase src/Mw.dll %erase oosrc/MwOO.dll -src/Mw.dll: src/core.obj src/draw.obj src/default.obj src/lowlevel.obj src/error.obj src/unicode.obj src/font.obj src/color.obj src/directory.obj src/messagebox.obj src/boldfont.obj external/ds.obj external/image.obj src/icon/info.obj src/icon/note.obj src/icon/warning.obj src/icon/error.obj src/icon/news.obj src/icon/question.obj src/cursor/default.obj src/cursor/cross.obj src/cursor/text.obj src/widget/button.obj src/widget/frame.obj src/widget/opengl.obj src/widget/window.obj src/widget/menu.obj src/widget/entry.obj src/widget/submenu.obj src/widget/viewport.obj src/widget/image.obj src/widget/scrollbar.obj src/widget/checkbox.obj src/widget/label.obj src/widget/listbox.obj src/widget/numberentry.obj src/backend/gdi.obj - $(LD) $(LDFLAGS) option implib=src/Mw.lib name $@ file src/core.obj file src/draw.obj file src/default.obj file src/lowlevel.obj file src/error.obj file src/unicode.obj file src/font.obj file src/color.obj file src/directory.obj file src/messagebox.obj file src/boldfont.obj file external/ds.obj file external/image.obj file src/icon/info.obj file src/icon/note.obj file src/icon/warning.obj file src/icon/error.obj file src/icon/news.obj file src/icon/question.obj file src/cursor/default.obj file src/cursor/cross.obj file src/cursor/text.obj file src/widget/button.obj file src/widget/frame.obj file src/widget/opengl.obj file src/widget/window.obj file src/widget/menu.obj file src/widget/entry.obj file src/widget/submenu.obj file src/widget/viewport.obj file src/widget/image.obj file src/widget/scrollbar.obj file src/widget/checkbox.obj file src/widget/label.obj file src/widget/listbox.obj file src/widget/numberentry.obj file src/backend/gdi.obj library clib3r.lib library opengl32.lib library gdi32.lib library user32.lib +src/Mw.dll: src/core.obj src/draw.obj src/default.obj src/lowlevel.obj src/error.obj src/unicode.obj src/font.obj src/color.obj src/directory.obj src/messagebox.obj src/boldfont.obj external/ds.obj external/image.obj src/icon/info.obj src/icon/note.obj src/icon/warning.obj src/icon/error.obj src/icon/news.obj src/icon/question.obj src/icon/directory.obj src/icon/file.obj src/cursor/default.obj src/cursor/cross.obj src/cursor/text.obj src/widget/button.obj src/widget/frame.obj src/widget/opengl.obj src/widget/window.obj src/widget/menu.obj src/widget/entry.obj src/widget/submenu.obj src/widget/viewport.obj src/widget/image.obj src/widget/scrollbar.obj src/widget/checkbox.obj src/widget/label.obj src/widget/listbox.obj src/widget/numberentry.obj src/backend/gdi.obj + $(LD) $(LDFLAGS) option implib=src/Mw.lib name $@ file src/core.obj file src/draw.obj file src/default.obj file src/lowlevel.obj file src/error.obj file src/unicode.obj file src/font.obj file src/color.obj file src/directory.obj file src/messagebox.obj file src/boldfont.obj file external/ds.obj file external/image.obj file src/icon/info.obj file src/icon/note.obj file src/icon/warning.obj file src/icon/error.obj file src/icon/news.obj file src/icon/question.obj file src/icon/directory.obj file src/icon/file.obj file src/cursor/default.obj file src/cursor/cross.obj file src/cursor/text.obj file src/widget/button.obj file src/widget/frame.obj file src/widget/opengl.obj file src/widget/window.obj file src/widget/menu.obj file src/widget/entry.obj file src/widget/submenu.obj file src/widget/viewport.obj file src/widget/image.obj file src/widget/scrollbar.obj file src/widget/checkbox.obj file src/widget/label.obj file src/widget/listbox.obj file src/widget/numberentry.obj file src/backend/gdi.obj library clib3r.lib library opengl32.lib library gdi32.lib library user32.lib oosrc/MwOO.dll: oosrc/base.obj oosrc/widget/button.obj oosrc/widget/frame.obj oosrc/widget/image.obj oosrc/widget/menu.obj oosrc/widget/opengl.obj oosrc/widget/scrollbar.obj oosrc/widget/submenu.obj oosrc/widget/window.obj oosrc/widget/checkbox.obj oosrc/widget/viewport.obj oosrc/widget/listbox.obj oosrc/widget/label.obj oosrc/widget/entry.obj oosrc/widget/numberentry.obj @@ -110,6 +112,10 @@ src/icon/news.obj: src/icon/news.c $(CC) $(CFLAGS) -fo=$@ $< src/icon/question.obj: src/icon/question.c $(CC) $(CFLAGS) -fo=$@ $< +src/icon/directory.obj: src/icon/directory.c + $(CC) $(CFLAGS) -fo=$@ $< +src/icon/file.obj: src/icon/file.c + $(CC) $(CFLAGS) -fo=$@ $< src/cursor/default.obj: src/cursor/default.c $(CC) $(CFLAGS) -fo=$@ $< src/cursor/cross.obj: src/cursor/cross.c diff --git a/doc/index.html b/doc/index.html index dc1ed40..5849daa 100644 --- a/doc/index.html +++ b/doc/index.html @@ -206,9 +206,6 @@
MwDrawText
-
- MwDrawTextEx -
MwLoadImage
@@ -257,9 +254,15 @@
Mw/Icon.h
+
+ MwIconDirectory[] +
MwIconError[]
+
+ MwIconFile[] +
MwIconInfo[]
@@ -290,6 +293,9 @@
MwMessageBoxGetChild
+
+ MwMessageBoxDestroy +
Mw/Milsko.h
@@ -1803,63 +1809,6 @@
-
MWDECL void MwDrawTextEx (
-	MwWidget handle,
-	MwPoint* point,
-	const char* text,
-	int bold,
-	int align,
-	MwLLColor color,
-	MwLLColor bgcolor
-);
-
-
- Draws a text. -
-
- Parameter handle -
-
- Widget. -
-
- Parameter point -
-
- Center point of the text. -
-
- Parameter text -
-
- Text. -
-
- Parameter bold -
-
- Bold. -
-
- Parameter align -
-
- Align. -
-
- Parameter color -
-
- Color. -
-
- Parameter bgcolor -
-
- Background color. -
-
-
MWDECL MwLLPixmap MwLoadImage (
 	MwWidget handle,
 	const char* path
@@ -2143,6 +2092,13 @@
 
 
 
+
MWDECL char* MwIconDirectory[];
+
+
+ Directory icon. +
+
+
MWDECL char* MwIconError[];
@@ -2150,6 +2106,13 @@

+
MWDECL char* MwIconFile[];
+
+
+ File icon. +
+
+
MWDECL char* MwIconInfo[];
@@ -2273,6 +2236,21 @@

+
MWDECL void MwMessageBoxDestroy (
+	MwWidget handle
+);
+
+
+ Destroys the message box. +
+
+ Parameter handle +
+
+ Widget. +
+
+

Mw/Milsko.h

@@ -2468,7 +2446,8 @@
MWDECL void MwListBoxInsert (
 	MwWidget handle,
 	int index,
-	const char* text
+	const char* text,
+	MwLLPixmap pixmap
 );
@@ -2492,12 +2471,19 @@
Text.
+
+ Parameter pixmap +
+
+ Pixmap. +

MWDECL void MwListBoxInsertMultiple (
 	MwWidget handle,
 	int index,
 	char** text,
+	MwLLPixmap* pixmap,
 	int count
 );
@@ -2522,6 +2508,12 @@
Text.
+
+ Parameter pixmap +
+
+ Pixmap. +
Parameter count
diff --git a/examples/basic/listbox.c b/examples/basic/listbox.c index 789f50a..aa21218 100644 --- a/examples/basic/listbox.c +++ b/examples/basic/listbox.c @@ -6,7 +6,7 @@ MwWidget wmain; void destroy(MwWidget handle, void* user, void* call) { - MwDestroyWidget(user); + MwMessageBoxDestroy(user); } void activate(MwWidget handle, void* user, void* call) { diff --git a/examples/basic/messagebox.c b/examples/basic/messagebox.c index a4e2b86..73c01dc 100644 --- a/examples/basic/messagebox.c +++ b/examples/basic/messagebox.c @@ -2,7 +2,7 @@ #include void ok(MwWidget handle, void* user, void* call) { - MwDestroyWidget(user); + MwMessageBoxDestroy(user); } void spawn(MwWidget handle, void* user, void* call) { diff --git a/include/Mw/MessageBox.h b/include/Mw/MessageBox.h index 7e2a543..55d2650 100644 --- a/include/Mw/MessageBox.h +++ b/include/Mw/MessageBox.h @@ -30,6 +30,12 @@ MWDECL MwWidget MwMessageBox(MwWidget handle, const char* text, const char* titl */ MWDECL MwWidget MwMessageBoxGetChild(MwWidget handle, int child); +/*! + * %brief Destroys the message box + * %param handle Widget + */ +MWDECL void MwMessageBoxDestroy(MwWidget handle); + #ifdef __cplusplus } #endif diff --git a/include/MwOO/Widget/ListBox.h b/include/MwOO/Widget/ListBox.h index 5a3b345..8c5eeac 100644 --- a/include/MwOO/Widget/ListBox.h +++ b/include/MwOO/Widget/ListBox.h @@ -8,8 +8,8 @@ namespace MwOO { class ListBox : public MwOO::Base { public: ListBox(const char* widget_name, MwOO::Base* parent, int x, int y, int w, int h); - void Insert(int index, const char* text); - void InsertMultiple(int index, char** text, int count); + void Insert(int index, const char* text, MwLLPixmap pixmap); + void InsertMultiple(int index, char** text, MwLLPixmap* pixmap, int count); void Delete(int index); const char* Get(int index); void SetLeftPadding(int value); diff --git a/oosrc/widget/listbox.cc b/oosrc/widget/listbox.cc index b4236d3..16ea75b 100644 --- a/oosrc/widget/listbox.cc +++ b/oosrc/widget/listbox.cc @@ -5,11 +5,11 @@ MwOO::ListBox::ListBox(const char* widget_name, MwOO::Base* parent, int x, int y, int w, int h) : MwOO::Base(MwListBoxClass, widget_name, parent, x, y, w, h){ } -void MwOO::ListBox::Insert(int index, const char* text){ - MwListBoxInsert(this->widget, index, text); +void MwOO::ListBox::Insert(int index, const char* text, MwLLPixmap pixmap){ + MwListBoxInsert(this->widget, index, text, pixmap); } -void MwOO::ListBox::InsertMultiple(int index, char** text, int count){ - MwListBoxInsertMultiple(this->widget, index, text, count); +void MwOO::ListBox::InsertMultiple(int index, char** text, MwLLPixmap* pixmap, int count){ + MwListBoxInsertMultiple(this->widget, index, text, pixmap, count); } void MwOO::ListBox::Delete(int index){ MwListBoxDelete(this->widget, index); diff --git a/src/messagebox.c b/src/messagebox.c index 5771bc3..c6e1691 100644 --- a/src/messagebox.c +++ b/src/messagebox.c @@ -103,3 +103,10 @@ MwWidget MwMessageBoxGetChild(MwWidget handle, int child) { return hmget(mb, child); } + +void MwMessageBoxDestroy(MwWidget handle) { + void* px; + + if((px = MwGetVoid(handle, MwNpixmap)) != NULL) MwLLDestroyPixmap(px); + MwDestroyWidget(handle); +}