diff --git a/BorMakefile b/BorMakefile
index 862099508..7cc05591a 100644
--- a/BorMakefile
+++ b/BorMakefile
@@ -11,6 +11,7 @@ clean:
del /f /q src\string.obj
del /f /q src\draw.obj
del /f /q src\default.obj
+ del /f /q src\filechooser.obj
del /f /q src\lowlevel.obj
del /f /q src\error.obj
del /f /q src\unicode.obj
@@ -19,7 +20,6 @@ clean:
del /f /q src\directory.obj
del /f /q src\messagebox.obj
del /f /q src\boldfont.obj
- del /f /q src\filechooser.obj
del /f /q external\ds.obj
del /f /q external\image.obj
del /f /q src\icon\info.obj
@@ -56,8 +56,8 @@ clean:
del /f /q src\backend\gdi.obj
del /f /q src\Mw.dll
-src\Mw.dll: src\core.obj src\string.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 src\filechooser.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\icon\back.obj src\icon\forward.obj src\icon\up.obj src\icon\computer.obj src\icon\search.obj src\cursor\default.obj src\cursor\cross.obj src\cursor\text.obj src\cursor\hidden.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\string.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 src\filechooser.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\icon\back.obj src\icon\forward.obj src\icon\up.obj src\icon\computer.obj src\icon\search.obj src\cursor\default.obj src\cursor\cross.obj src\cursor\text.obj src\cursor\hidden.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\string.obj src\draw.obj src\default.obj src\filechooser.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\icon\back.obj src\icon\forward.obj src\icon\up.obj src\icon\computer.obj src\icon\search.obj src\cursor\default.obj src\cursor\cross.obj src\cursor\text.obj src\cursor\hidden.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\string.obj src\draw.obj src\default.obj src\filechooser.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\icon\back.obj src\icon\forward.obj src\icon\up.obj src\icon\computer.obj src\icon\search.obj src\cursor\default.obj src\cursor\cross.obj src\cursor\text.obj src\cursor\hidden.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
.c.obj:
diff --git a/NTMakefile b/NTMakefile
index be876758b..c328ced0f 100644
--- a/NTMakefile
+++ b/NTMakefile
@@ -11,6 +11,7 @@ clean:
del /f /q src\string.obj
del /f /q src\draw.obj
del /f /q src\default.obj
+ del /f /q src\filechooser.obj
del /f /q src\lowlevel.obj
del /f /q src\error.obj
del /f /q src\unicode.obj
@@ -19,7 +20,6 @@ clean:
del /f /q src\directory.obj
del /f /q src\messagebox.obj
del /f /q src\boldfont.obj
- del /f /q src\filechooser.obj
del /f /q external\ds.obj
del /f /q external\image.obj
del /f /q src\icon\info.obj
@@ -56,8 +56,8 @@ clean:
del /f /q src\backend\gdi.obj
del /f /q src\Mw.dll
-src\Mw.dll: src\core.obj src\string.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 src\filechooser.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\icon\back.obj src\icon\forward.obj src\icon\up.obj src\icon\computer.obj src\icon\search.obj src\cursor\default.obj src\cursor\cross.obj src\cursor\text.obj src\cursor\hidden.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\string.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 src\filechooser.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\icon\back.obj src\icon\forward.obj src\icon\up.obj src\icon\computer.obj src\icon\search.obj src\cursor\default.obj src\cursor\cross.obj src\cursor\text.obj src\cursor\hidden.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\string.obj src\draw.obj src\default.obj src\filechooser.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\icon\back.obj src\icon\forward.obj src\icon\up.obj src\icon\computer.obj src\icon\search.obj src\cursor\default.obj src\cursor\cross.obj src\cursor\text.obj src\cursor\hidden.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\string.obj src\draw.obj src\default.obj src\filechooser.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\icon\back.obj src\icon\forward.obj src\icon\up.obj src\icon\computer.obj src\icon\search.obj src\cursor\default.obj src\cursor\cross.obj src\cursor\text.obj src\cursor\hidden.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
.c.obj:
diff --git a/WatMakefile b/WatMakefile
index 49b33aad4..87467f135 100644
--- a/WatMakefile
+++ b/WatMakefile
@@ -10,6 +10,7 @@ clean: .SYMBOLIC
%erase src/string.obj
%erase src/draw.obj
%erase src/default.obj
+ %erase src/filechooser.obj
%erase src/lowlevel.obj
%erase src/error.obj
%erase src/unicode.obj
@@ -18,7 +19,6 @@ clean: .SYMBOLIC
%erase src/directory.obj
%erase src/messagebox.obj
%erase src/boldfont.obj
- %erase src/filechooser.obj
%erase external/ds.obj
%erase external/image.obj
%erase src/icon/info.obj
@@ -55,8 +55,8 @@ clean: .SYMBOLIC
%erase src/backend/gdi.obj
%erase src/Mw.dll
-src/Mw.dll: src/core.obj src/string.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 src/filechooser.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/icon/back.obj src/icon/forward.obj src/icon/up.obj src/icon/computer.obj src/icon/search.obj src/cursor/default.obj src/cursor/cross.obj src/cursor/text.obj src/cursor/hidden.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/string.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 src/filechooser.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/icon/back.obj file src/icon/forward.obj file src/icon/up.obj file src/icon/computer.obj file src/icon/search.obj file src/cursor/default.obj file src/cursor/cross.obj file src/cursor/text.obj file src/cursor/hidden.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/string.obj src/draw.obj src/default.obj src/filechooser.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/icon/back.obj src/icon/forward.obj src/icon/up.obj src/icon/computer.obj src/icon/search.obj src/cursor/default.obj src/cursor/cross.obj src/cursor/text.obj src/cursor/hidden.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/string.obj file src/draw.obj file src/default.obj file src/filechooser.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/icon/back.obj file src/icon/forward.obj file src/icon/up.obj file src/icon/computer.obj file src/icon/search.obj file src/cursor/default.obj file src/cursor/cross.obj file src/cursor/text.obj file src/cursor/hidden.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
@@ -68,6 +68,8 @@ src/draw.obj: src/draw.c
$(CC) $(CFLAGS) -fo=$@ $<
src/default.obj: src/default.c
$(CC) $(CFLAGS) -fo=$@ $<
+src/filechooser.obj: src/filechooser.c
+ $(CC) $(CFLAGS) -fo=$@ $<
src/lowlevel.obj: src/lowlevel.c
$(CC) $(CFLAGS) -fo=$@ $<
src/error.obj: src/error.c
@@ -84,8 +86,6 @@ src/messagebox.obj: src/messagebox.c
$(CC) $(CFLAGS) -fo=$@ $<
src/boldfont.obj: src/boldfont.c
$(CC) $(CFLAGS) -fo=$@ $<
-src/filechooser.obj: src/filechooser.c
- $(CC) $(CFLAGS) -fo=$@ $<
external/ds.obj: external/ds.c
$(CC) $(CFLAGS) -fo=$@ $<
external/image.obj: external/image.c
diff --git a/doc/index.html b/doc/index.html
index 1dd94a501..5965d1e9d 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -438,10 +438,22 @@
MwListBoxClass
- MwListBoxInsert
+ MwListBoxCreatePacket
- MwListBoxInsertMultiple
+ MwListBoxDestroyPacket
+
+
+ MwListBoxPacketInsert
+
+
+ MwListBoxPacketSet
+
+
+ MwListBoxPacketSetIcon
+
+
+ MwListBoxInsert
MwListBoxDelete
@@ -2872,11 +2884,133 @@
+MWDECL MwListBoxPacket* MwListBoxCreatePacket (
+ void
+);
+
+-
+ Creates a listbox packet.
+
+-
+ Returns
+
+-
+ Packet.
+
+
+
+MWDECL void MwListBoxDestroyPacket (
+ MwListBoxPacket* packet
+);
+
+-
+ Destroys a listbox packet.
+
+-
+ Parameter
packet
+
+-
+ Packet.
+
+
+
+MWDECL int MwListBoxPacketInsert (
+ MwListBoxPacket* packet,
+ int index
+);
+
+-
+ Inserts a new item to a packet.
+
+-
+ Parameter
packet
+
+-
+ Packet.
+
+-
+ Parameter
index
+
+-
+ Index.
+
+-
+ Returns
+
+-
+ Index.
+
+
+
+MWDECL void MwListBoxPacketSet (
+ MwListBoxPacket* packet,
+ int index,
+ int col,
+ const char* text
+);
+
+-
+ Sets a column of item in a packet.
+
+-
+ Parameter
packet
+
+-
+ Packet.
+
+-
+ Parameter
index
+
+-
+ Index.
+
+-
+ Parameter
col
+
+-
+ Column.
+
+-
+ Parameter
text
+
+-
+ Text.
+
+
+
+MWDECL void MwListBoxPacketSetIcon (
+ MwListBoxPacket* packet,
+ int index,
+ MwLLPixmap icon
+);
+
+-
+ Sets an icon of item in a packet.
+
+-
+ Parameter
packet
+
+-
+ Packet.
+
+-
+ Parameter
index
+
+-
+ Index.
+
+-
+ Parameter
icon
+
+-
+ Icon.
+
+
+
MwInline void MwListBoxInsert (
MwWidget handle,
int index,
- MwLLPixmap pixmap,
- ...
+ void* packet
);
-
@@ -2895,59 +3029,10 @@
Index.
-
- Parameter
pixmap
+ Parameter packet
-
- Pixmap.
-
--
- Parameter
...
-
--
- Text.
-
-
-
-MwInline void MwListBoxInsertMultiple (
- MwWidget handle,
- int index,
- int count,
- MwLLPixmap* pixmap,
- ...
-);
-
--
- Inserts multiple items on the listbox.
-
--
- Parameter
handle
-
--
- Widget.
-
--
- Parameter
index
-
--
- Index.
-
--
- Parameter
count
-
--
- Count.
-
--
- Parameter
pixmap
-
--
- Pixmap.
-
--
- Parameter
...
-
--
- Text.
+ Packet.
diff --git a/src/widget/listbox.c b/src/widget/listbox.c
index 26f168899..58650591c 100644
--- a/src/widget/listbox.c
+++ b/src/widget/listbox.c
@@ -15,7 +15,7 @@ void MwListBoxDestroyPacket(MwListBoxPacket* packet) {
int j;
for(i = 0; i < arrlen(packet->names); i++) {
- for(j = 0; j < arrlen(packet->names[i]); j++){
+ for(j = 0; j < arrlen(packet->names[i]); j++) {
if(packet->names[i][j] != NULL) free(packet->names[i][j]);
}
arrfree(packet->names[i]);