diff --git a/BorMakefile b/BorMakefile index 9e8af9fa5..e6e4e3a0a 100644 --- a/BorMakefile +++ b/BorMakefile @@ -21,6 +21,7 @@ clean: del /f /q src\messagebox.obj del /f /q src\string.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 @@ -31,9 +32,15 @@ clean: 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\icon\back.obj + del /f /q src\icon\forward.obj + del /f /q src\icon\up.obj + del /f /q src\icon\computer.obj + del /f /q src\icon\search.obj del /f /q src\cursor\default.obj del /f /q src\cursor\cross.obj del /f /q src\cursor\text.obj + del /f /q src\cursor\hidden.obj del /f /q src\widget\button.obj del /f /q src\widget\frame.obj del /f /q src\widget\opengl.obj @@ -67,8 +74,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\string.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\string.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 +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\string.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\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\string.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 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 a6b9830db..0e119bb90 100644 --- a/NTMakefile +++ b/NTMakefile @@ -21,6 +21,7 @@ clean: del /f /q src\messagebox.obj del /f /q src\string.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 @@ -31,9 +32,15 @@ clean: 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\icon\back.obj + del /f /q src\icon\forward.obj + del /f /q src\icon\up.obj + del /f /q src\icon\computer.obj + del /f /q src\icon\search.obj del /f /q src\cursor\default.obj del /f /q src\cursor\cross.obj del /f /q src\cursor\text.obj + del /f /q src\cursor\hidden.obj del /f /q src\widget\button.obj del /f /q src\widget\frame.obj del /f /q src\widget\opengl.obj @@ -67,8 +74,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\string.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\string.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 +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\string.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\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\string.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 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 a3aab5ea5..a5e8f3237 100644 --- a/WatMakefile +++ b/WatMakefile @@ -20,6 +20,7 @@ clean: .SYMBOLIC %erase src/messagebox.obj %erase src/string.obj %erase src/boldfont.obj + %erase src/filechooser.obj %erase external/ds.obj %erase external/image.obj %erase src/icon/info.obj @@ -30,9 +31,15 @@ clean: .SYMBOLIC %erase src/icon/question.obj %erase src/icon/directory.obj %erase src/icon/file.obj + %erase src/icon/back.obj + %erase src/icon/forward.obj + %erase src/icon/up.obj + %erase src/icon/computer.obj + %erase src/icon/search.obj %erase src/cursor/default.obj %erase src/cursor/cross.obj %erase src/cursor/text.obj + %erase src/cursor/hidden.obj %erase src/widget/button.obj %erase src/widget/frame.obj %erase src/widget/opengl.obj @@ -66,8 +73,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/string.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/string.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 +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/string.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/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/string.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 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 @@ -99,6 +106,8 @@ src/string.obj: src/string.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 @@ -119,12 +128,24 @@ src/icon/directory.obj: src/icon/directory.c $(CC) $(CFLAGS) -fo=$@ $< src/icon/file.obj: src/icon/file.c $(CC) $(CFLAGS) -fo=$@ $< +src/icon/back.obj: src/icon/back.c + $(CC) $(CFLAGS) -fo=$@ $< +src/icon/forward.obj: src/icon/forward.c + $(CC) $(CFLAGS) -fo=$@ $< +src/icon/up.obj: src/icon/up.c + $(CC) $(CFLAGS) -fo=$@ $< +src/icon/computer.obj: src/icon/computer.c + $(CC) $(CFLAGS) -fo=$@ $< +src/icon/search.obj: src/icon/search.c + $(CC) $(CFLAGS) -fo=$@ $< src/cursor/default.obj: src/cursor/default.c $(CC) $(CFLAGS) -fo=$@ $< src/cursor/cross.obj: src/cursor/cross.c $(CC) $(CFLAGS) -fo=$@ $< src/cursor/text.obj: src/cursor/text.c $(CC) $(CFLAGS) -fo=$@ $< +src/cursor/hidden.obj: src/cursor/hidden.c + $(CC) $(CFLAGS) -fo=$@ $< src/widget/button.obj: src/widget/button.c $(CC) $(CFLAGS) -fo=$@ $< src/widget/frame.obj: src/widget/frame.c diff --git a/doc/index.html b/doc/index.html index d44d9d2b4..824e8de51 100644 --- a/doc/index.html +++ b/doc/index.html @@ -134,6 +134,18 @@
MwForceRender2
+
+ MwAddTickList +
+
+ MwFocus +
+
+ MwGrabPointer +
+
+ MwHideCursor +
Mw/Cursor.h
@@ -155,6 +167,12 @@
MwCursorTextMask
+
+ MwCursorHidden +
+
+ MwCursorHiddenMask +
Mw/Default.h
@@ -182,6 +200,12 @@
MwDirectoryFreeEntry
+
+ MwDirectoryCurrent +
+
+ MwDirectoryJoin +
Mw/Draw.h
@@ -242,6 +266,9 @@
MwGetLastError
+
+ Mw/FileChoose.h +
Mw/Font.h
@@ -254,6 +281,12 @@
Mw/Icon.h
+
+ MwIconBack[] +
+
+ MwIconComputer[] +
MwIconDirectory[]
@@ -263,6 +296,9 @@
MwIconFile[]
+
+ MwIconForward[] +
MwIconInfo[]
@@ -275,6 +311,12 @@
MwIconQuestion[]
+
+ MwIconSearch[] +
+
+ MwIconUp[] +
MwIconWarning[]
@@ -308,6 +350,12 @@
MwStringConcat
+
+ MwStringSize +
+
+ MwStringTime +
Mw/StringDefs.h
@@ -392,6 +440,9 @@
MwListBoxSetWidth
+
+ MwListBoxReset +
Mw/Widget/Menu.h
@@ -1386,6 +1437,73 @@
+
MWDECL void MwAddTickList (
+	MwWidget handle
+);
+
+
+ Adds an widget to tick handler list. +
+
+ Parameter handle +
+
+ Widget. +
+
+
+
MWDECL void MwFocus (
+	MwWidget handle
+);
+
+
+ Focus the widget. +
+
+ Parameter handle +
+
+ Widget. +
+
+
+
MWDECL void MwGrabPointer (
+	MwWidget handle,
+	int toggle
+);
+
+
+ Grabs the pointer. +
+
+ Parameter handle +
+
+ Widget. +
+
+ Parameter toggle +
+
+ Toggle. +
+
+
+
MWDECL void MwHideCursor (
+	MwWidget handle
+);
+
+
+ Hides the cursor. +
+
+ Parameter handle +
+
+ Widget. +
+
+

Mw/Cursor.h

@@ -1435,6 +1553,20 @@
+
MWDECL MwCursor MwCursorHidden;
+
+
+ Hidden cursor. +
+
+
+
MWDECL MwCursor MwCursorHiddenMask;
+
+
+ Hidden cursor mask. +
+
+

Mw/Default.h

@@ -1542,6 +1674,49 @@
+
MWDECL char* MwDirectoryCurrent (
+	void
+);
+
+
+ Gets a current directory. +
+
+ Parameter Directory +
+
+ +
+
+
+
MWDECL char* MwDirectoryJoin (
+	char* a,
+	char* b
+);
+
+
+ Joins 2 paths. +
+
+ Parameter a +
+
+ Path. +
+
+ Parameter b +
+
+ Path. +
+
+ Returns +
+
+ Path. +
+
+

Mw/Draw.h

@@ -2082,6 +2257,13 @@
+

Mw/FileChoose.h

+
+
+ File chooser. +
+
+

Mw/Font.h

@@ -2110,6 +2292,20 @@
+
MWDECL char* MwIconBack[];
+
+
+ Back icon. +
+
+
+
MWDECL char* MwIconComputer[];
+
+
+ Computer icon. +
+
+
MWDECL char* MwIconDirectory[];
@@ -2131,6 +2327,13 @@
+
MWDECL char* MwIconForward[];
+
+
+ Forward icon. +
+
+
MWDECL char* MwIconInfo[];
@@ -2159,6 +2362,20 @@
+
MWDECL char* MwIconSearch[];
+
+
+ Search icon. +
+
+
+
MWDECL char* MwIconUp[];
+
+
+ Up icon. +
+
+
MWDECL char* MwIconWarning[];
@@ -2332,6 +2549,50 @@
+
MWDECL void MwStringSize (
+	char* out,
+	MwOffset size
+);
+
+
+ Converts size to string. +
+
+ Parameter out +
+
+ Output. +
+
+ Parameter size +
+
+ Size. +
+
+
+
MWDECL void MwStringTime (
+	char* out,
+	time_t t
+);
+
+
+ Converts time to string. +
+
+ Parameter out +
+
+ Output. +
+
+ Parameter t +
+
+ Time. +
+
+

Mw/StringDefs.h

@@ -2754,6 +3015,21 @@
+
MWDECL void MwListBoxReset (
+	MwWidget handle
+);
+
+
+ Resets the listbox. +
+
+ Parameter handle +
+
+ Widget. +
+
+

Mw/Widget/Menu.h

diff --git a/include/MwOO/Widget/ListBox.h b/include/MwOO/Widget/ListBox.h index 4867b231a..36d03ca81 100644 --- a/include/MwOO/Widget/ListBox.h +++ b/include/MwOO/Widget/ListBox.h @@ -15,6 +15,7 @@ class ListBox : public MwOO::Base { void Delete(int index); const char* Get(int index); void SetWidth(int index, int width); + void Reset(void); void SetLeftPadding(int value); int GetLeftPadding(void); void SetBackground(const char* value); diff --git a/oosrc/widget/listbox.cc b/oosrc/widget/listbox.cc index e659fdc04..f024b212b 100644 --- a/oosrc/widget/listbox.cc +++ b/oosrc/widget/listbox.cc @@ -41,6 +41,10 @@ void MwOO::ListBox::SetWidth(int index, int width){ MwListBoxSetWidth(this->widget, index, width); } +void MwOO::ListBox::Reset(void){ + MwListBoxReset(this->widget); +} + void MwOO::ListBox::SetLeftPadding(int value){ MwSetInteger(this->widget, MwNleftPadding, value); } diff --git a/src/icon/back.c b/src/icon/back.c index 915cfcc88..a4286cea1 100644 --- a/src/icon/back.c +++ b/src/icon/back.c @@ -4,32 +4,33 @@ /* XPM */ char* MwIconBack[] = { /* columns rows colors chars-per-pixel */ - "20 22 5 1 ", - " c black", - ". c gray20", - "X c gray40", - "o c gray60", - "O c None", + "20 22 6 1 ", + " c white", + ". c None", + "X c gray60", + "o c gray40", + "O c gray20", + "+ c black", /* pixels */ - "OOOOOOOOOOOOOOOOOOOO", - "OOOOOOOOXO..OOOOOOOO", - "OOOOOOOOo......OOOOO", - "OOOOOOOOXO.......OOO", - "OOOOOOOOo.........OO", - "OOOOOOOOXO.........O", - "OOOOOOOOo...........", - "OOOOOOOOXO........O ", - "OOOOOOOOOO......OO ", - "OOOOOOOOOOOO.OOo. ", - "OOOOO OOOOOOo. ", - "OOOO OOOo. ", - "OOO ", - "OO .", - "O o", - " XO", - "O .oOO", - "OO .oOOOOO", - "OOO .oOOOOOOOOO", - "OOOO OOOOOOOOOOOOOO", - "OOOOO OOOOOOOOOOOOOO", - "OOOOOOOOOOOOOOOOOOOO"}; + "....................", + "........o.OO........", + "........XOOOOOO.....", + "........o.OOOOOOO...", + "........XOOOOOOOOO..", + "........o.OOOOOOOOO.", + "........XOOOOOOOOOOO", + "........o.OOOOOOOO.+", + "..........OOOOOO..++", + "............O..XO+++", + ".....+......XO++++++", + "....++...XO+++++++++", + "...+++++++++++++++++", + "..+++++++++++++++++O", + ".++++++++++++++++++X", + "++++++++++++++++++o.", + ".+++++++++++++++OX..", + "..+++++++++++OX.....", + "...++++++OX.........", + "....++..............", + ".....+..............", + "...................."}; diff --git a/src/icon/computer.c b/src/icon/computer.c index b7f87058c..7b0b34491 100644 --- a/src/icon/computer.c +++ b/src/icon/computer.c @@ -4,29 +4,30 @@ /* XPM */ char* MwIconComputer[] = { /* columns rows colors chars-per-pixel */ - "16 16 8 1 ", - " c black", - ". c #292118", - "X c #5A6363", - "o c #39A5CE", - "O c #73BDDE", - "+ c gray58", - "@ c white", - "# c None", + "16 16 9 1 ", + " c None", + ". c white", + "X c gray58", + "o c #C0C0C0", + "O c #292118", + "+ c #5A6363", + "@ c #39A5CE", + "# c #73BDDE", + "$ c black", /* pixels */ - "################", - "################", - "################", - "##+XXXXXXX######", - "##X+++++++.#####", - "##XX++XXX+ +####", - "##XX+OOOo+ +####", - "##XXoOOO++ +####", - "##X++++++@ +####", - "#oXXXXXXXXXo####", - "OoOoooooooOoX###", - "OOooooooooooX###", - "#o+++XXXXXXX+###", - "+X+++++++++.X###", - " +XXXXXXXXX+ +##", - "X ......... X###"}; + " ", + " ", + " ", + " X+++++++ ", + " +XXXXXXXO ", + " ++XX+++X$X ", + " ++X###@X$X ", + " ++@###XX$X ", + " +XXXXXX.$X ", + " @+++++++++@ ", + "#@#@@@@@@@#@+ ", + "##@@@@@@@@@@+ ", + " @XXX+++++++X ", + "X+XXXXXXXXXO+ ", + "$X+++++++++X$X ", + "+$OOOOOOOOO$+ "}; diff --git a/src/icon/directory.c b/src/icon/directory.c index 7f08f6759..51d0fe172 100644 --- a/src/icon/directory.c +++ b/src/icon/directory.c @@ -5,27 +5,27 @@ char* MwIconDirectory[] = { /* columns rows colors chars-per-pixel */ "16 16 7 1 ", - " c black", - ". c #2B251D", - "X c #574B3B", + " c NavajoWhite", + ". c #FFDCAE", + "X c None", "o c #B8A07D", - "O c NavajoWhite", - "+ c #FFDCAE", - "@ c None", + "O c #574B3B", + "+ c #2B251D", + "@ c black", /* pixels */ - "@@ @@@@@@@@@@@@", - " .oo @@ @@@@@@", - " O..oo oO @@@@", - " OOO..ooooOo @@@", - " OOOOO..oooo @@@", - " OOOOOOO..oo @@@", - " OOOOOOOOO o @@@", - " OOOOOOOOo X @@@", - " OOOOOOOOo X @@@", - " OOOOOOOOo X @@@", - " XoOOOOOOo X @@@", - "@ XoOOOOo X @@@", - "@@@ XoOOo X .@@", - "@@@@@ Xoo X ..@", - "@@@@@@@ X X ..@", - "@@@@@@@@@ ..@@"}; + "XX@@XXXXXXXXXXXX", + "@+oo@@XX@@XXXXXX", + "@ ++oo@@o.@@XXXX", + "@ ++oooo.o@XXX", + "@ ++oooo@XXX", + "@ ++oo@XXX", + "@ @o@XXX", + "@ o@O@XXX", + "@ o@O@XXX", + "@ o@O@XXX", + "@Oo o@O@XXX", + "X@@Oo o@O@XXX", + "XXX@@Oo o@O@+XX", + "XXXXX@@Ooo@O@++X", + "XXXXXXX@@O@O@++X", + "XXXXXXXXX@@@++XX"}; diff --git a/src/icon/error.c b/src/icon/error.c index c705a3f4d..2fc11d92a 100644 --- a/src/icon/error.c +++ b/src/icon/error.c @@ -5,44 +5,44 @@ char* MwIconError[] = { /* columns rows colors chars-per-pixel */ "32 32 8 1 ", - " c black", - ". c DarkSlateGray", - "X c SlateGray", + " c None", + ". c black", + "X c white", "o c gray", "O c gainsboro", "+ c lavender", - "@ c white", - "# c None", + "@ c DarkSlateGray", + "# c SlateGray", /* pixels */ - "## ###################### ##", - "## @o #################### @@ ##", - " @@o #################### @@@ ", - " @@oo #################### @@Oo ", - " @@ooo ### ###### @Oooo ", - "# @oo O+++++++o ### @oo .", - "#### @o XO++@@@@@++Oo # @oo ....", - "##### XOO+@@@@@@+OOOo Xoo ..###", - "###### OOO+@@@@@++OOOo .X ..####", - "##### XOOO+@@@@++OOOooX ..#####", - "##### XOOO+@@+++OOOOooX ..######", - "##### Xooo+++++OOOOoXXX ...#####", - "##### oo@@@@@+OOO++++XX ...#####", - "##### o@@OOOOOOO++OOooX ...#####", - "###### oo OOOOO oo ...#####", - "###### o ooo o ....#####", - "###### @ ooo .Xo ...######", - "##### o@.... @oo .XX.oo ..######", - "##### O@o.. @o o@ ..o@o ...#####", - "##### OO@@@@o o@@@Ooo ...#####", - "###### oOO@o o oOOOo . ..#####", - "####### oOOo o oOOo .XX .#####", - "###### o o@@@@@OOo o XXX #####", - "##### oo o .o@@o o .. Xo@ ##", - "#### @@o @.o .o o ... oo@@@ #", - "# @@o @.@.o.o.@ o ...# o@oo #", - " @@@oo .. @ .@.@. o ....# @oo .", - " @@@o ... @ .o.o. o ...## oo ...", - " ooo ..## @ o ....### ..#", - "## oo .### @@@@ooo ...#####...##", - "## ..#### ooooo ...###########", - "###....##### ..#############"}; + " ... ... ", + " .Xo. .XX. ", + "..XXo. .XXX..", + ".XXoo. .XXOo.", + ".XXooo. ......... .XOooo.", + " ...Xoo...O+++++++o.. .Xoo...@", + " .Xo.#O++XXXXX++Oo. .Xoo.@@@@", + " ..#OO+XXXXXX+OOOo.#oo.@@ ", + " .OOO+XXXXX++OOOo.@#.@@ ", + " .#OOO+XXXX++OOOoo#..@@ ", + " .#OOO+XX+++OOOOoo#.@@ ", + " .#ooo+++++OOOOo###.@@@ ", + " .ooXXXXX+OOO++++##.@@@ ", + " .oXXOOOOOOO++OOoo#.@@@ ", + " .oo...OOOOO...oo..@@@ ", + " .o.....ooo.....o.@@@@ ", + " .X.....ooo...@#o.@@@ ", + " .oX@@@@.Xoo.@##@oo.@@ ", + " .OXo@@.Xo.oX.@@oXo.@@@ ", + " .OOXXXXo...oXXXOoo.@@@ ", + " ..oOOXo.o.oOOOo..@.@@ ", + " ..oOOo.o.oOOo..@##.@ ", + " ..o.oXXXXXOOo.o..###. ", + " .oo.o.@oXXo...o.@@.#oX... ", + " .XXo.X@o....@o.o.@@@.ooXXX. ", + " ...XXo..X@X@o@o@X.o.@@@ .oXoo. ", + ".XXXoo.@@.X.@X@X@.o.@@@@ .Xoo..@", + ".XXXo.@@@.X.@o@o@.o.@@@ .oo.@@@", + "..ooo.@@ .X.....o.@@@@ ...@@ ", + " .oo.@ .XXXXooo.@@@ @@@ ", + " ...@@ .ooooo.@@@ ", + " @@@@ .....@@ "}; diff --git a/src/icon/file.c b/src/icon/file.c index c073f4a62..19602bb81 100644 --- a/src/icon/file.c +++ b/src/icon/file.c @@ -4,28 +4,277 @@ /* XPM */ char* MwIconFile[] = { /* columns rows colors chars-per-pixel */ - "16 16 7 1 ", - " c #393939", - ". c gray42", - "X c gray55", - "o c #CECECE", - "O c #E7E7E7", - "+ c white", - "@ c None", + "16 16 256 2 ", + " c black", + ". c #010101", + "X c #020202", + "o c gray1", + "O c #040404", + "+ c gray2", + "@ c #060606", + "# c #070707", + "$ c gray3", + "% c #090909", + "& c gray4", + "* c #0B0B0B", + "= c #0C0C0C", + "- c gray5", + "; c #0E0E0E", + ": c gray6", + "> c #101010", + ", c #111111", + "< c gray7", + "1 c #131313", + "2 c gray8", + "3 c #151515", + "4 c #161616", + "5 c gray9", + "6 c #181818", + "7 c #191919", + "8 c gray10", + "9 c #1B1B1B", + "0 c gray11", + "q c #1D1D1D", + "w c #1E1E1E", + "e c gray12", + "r c #202020", + "t c gray13", + "y c #222222", + "u c #232323", + "i c gray14", + "p c #252525", + "a c gray15", + "s c #272727", + "d c #282828", + "f c gray16", + "g c #2A2A2A", + "h c gray17", + "j c #2C2C2C", + "k c #2D2D2D", + "l c gray18", + "z c #2F2F2F", + "x c gray19", + "c c #313131", + "v c #323232", + "b c gray20", + "n c #343434", + "m c #353535", + "M c gray21", + "N c #373737", + "B c gray22", + "V c #393939", + "C c #3A3A3A", + "Z c gray23", + "A c #3C3C3C", + "S c gray24", + "D c #3E3E3E", + "F c #3F3F3F", + "G c gray25", + "H c #414141", + "J c gray26", + "K c #434343", + "L c #444444", + "P c gray27", + "I c #464646", + "U c gray28", + "Y c #484848", + "T c #494949", + "R c gray29", + "E c #4B4B4B", + "W c #4C4C4C", + "Q c gray30", + "! c #4E4E4E", + "~ c gray31", + "^ c #505050", + "/ c #515151", + "( c gray32", + ") c #535353", + "_ c gray33", + "` c #555555", + "' c #565656", + "] c gray34", + "[ c #585858", + "{ c gray35", + "} c #5A5A5A", + "| c #5B5B5B", + " . c gray36", + ".. c #5D5D5D", + "X. c gray37", + "o. c #5F5F5F", + "O. c #606060", + "+. c gray38", + "@. c #626262", + "#. c gray39", + "$. c #646464", + "%. c #656565", + "&. c gray40", + "*. c #676767", + "=. c #686868", + "-. c DimGray", + ";. c #6A6A6A", + ":. c gray42", + ">. c #6C6C6C", + ",. c #6D6D6D", + "<. c gray43", + "1. c #6F6F6F", + "2. c gray44", + "3. c #717171", + "4. c #727272", + "5. c gray45", + "6. c #747474", + "7. c gray46", + "8. c #767676", + "9. c #777777", + "0. c gray47", + "q. c #797979", + "w. c gray48", + "e. c #7B7B7B", + "r. c #7C7C7C", + "t. c gray49", + "y. c #7E7E7E", + "u. c gray50", + "i. c #808080", + "p. c #818181", + "a. c gray51", + "s. c #838383", + "d. c #848484", + "f. c gray52", + "g. c #868686", + "h. c gray53", + "j. c #888888", + "k. c #898989", + "l. c gray54", + "z. c #8B8B8B", + "x. c gray55", + "c. c #8D8D8D", + "v. c #8E8E8E", + "b. c gray56", + "n. c #909090", + "m. c gray57", + "M. c #929292", + "N. c #939393", + "B. c gray58", + "V. c #959595", + "C. c gray59", + "Z. c #979797", + "A. c #989898", + "S. c gray60", + "D. c #9A9A9A", + "F. c #9B9B9B", + "G. c gray61", + "H. c #9D9D9D", + "J. c gray62", + "K. c #9F9F9F", + "L. c #A0A0A0", + "P. c gray63", + "I. c #A2A2A2", + "U. c gray64", + "Y. c #A4A4A4", + "T. c #A5A5A5", + "R. c gray65", + "E. c #A7A7A7", + "W. c gray66", + "Q. c #A9A9A9", + "!. c #AAAAAA", + "~. c gray67", + "^. c #ACACAC", + "/. c gray68", + "(. c #AEAEAE", + "). c #AFAFAF", + "_. c gray69", + "`. c #B1B1B1", + "'. c #B2B2B2", + "]. c gray70", + "[. c #B4B4B4", + "{. c gray71", + "}. c #B6B6B6", + "|. c #B7B7B7", + " X c gray72", + ".X c #B9B9B9", + "XX c gray73", + "oX c #BBBBBB", + "OX c #BCBCBC", + "+X c gray74", + "@X c gray", + "#X c gray75", + "$X c None", + "%X c #C1C1C1", + "&X c gray76", + "*X c #C3C3C3", + "=X c gray77", + "-X c #C5C5C5", + ";X c #C6C6C6", + ":X c gray78", + ">X c #C8C8C8", + ",X c gray79", + "