From 794b203c4b8075acc02851c8dbd539214a822968 Mon Sep 17 00:00:00 2001 From: NishiOwO Date: Mon, 3 Nov 2025 21:47:21 +0000 Subject: [PATCH] move git-svn-id: http://svn2.nishi.boats/svn/milsko/trunk@583 b9cfdab3-6d41-4d17-bbe4-086880011989 --- BorMakefile | 10 ++++----- GNUmakefile | 3 ++- NTMakefile | 10 ++++----- WatMakefile | 22 ++++++++++---------- examples/basic/color_picker.c | 3 +++ include/Mw/{ => Dialog}/ColorPicker.h | 0 include/Mw/{ => Dialog}/FileChooser.h | 0 include/Mw/{ => Dialog}/MessageBox.h | 0 include/Mw/Milsko.h | 7 ++++--- src/{color_picker.c => dialog/colorpicker.c} | 0 src/{ => dialog}/filechooser.c | 0 src/{ => dialog}/messagebox.c | 0 tools/genmk.pl | 1 + 13 files changed, 31 insertions(+), 25 deletions(-) rename include/Mw/{ => Dialog}/ColorPicker.h (100%) rename include/Mw/{ => Dialog}/FileChooser.h (100%) rename include/Mw/{ => Dialog}/MessageBox.h (100%) rename src/{color_picker.c => dialog/colorpicker.c} (100%) rename src/{ => dialog}/filechooser.c (100%) rename src/{ => dialog}/messagebox.c (100%) diff --git a/BorMakefile b/BorMakefile index 11e3008a..28865438 100644 --- a/BorMakefile +++ b/BorMakefile @@ -12,14 +12,11 @@ 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 del /f /q src\color.obj del /f /q src\directory.obj - del /f /q src\color_picker.obj - del /f /q src\messagebox.obj del /f /q external\stb_ds.obj del /f /q external\stb_image.obj del /f /q external\stb_truetype.obj @@ -62,11 +59,14 @@ clean: del /f /q src\font\ttf.obj del /f /q src\font\boldfont.obj del /f /q src\font\font.obj + del /f /q src\dialog\filechooser.obj + del /f /q src\dialog\colorpicker.obj + del /f /q src\dialog\messagebox.obj del /f /q src\backend\gdi.obj del /f /q src\Mw.dll -src\Mw.dll: src\core.obj src\text.obj src\string.obj src\draw.obj src\default.obj src\filechooser.obj src\lowlevel.obj src\error.obj src\unicode.obj src\color.obj src\directory.obj src\color_picker.obj src\messagebox.obj external\stb_ds.obj external\stb_image.obj external\stb_truetype.obj src\icon\info.obj src\icon\note.obj src\icon\warning.obj src\icon\error.obj src\icon\news.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\icon\down.obj src\icon\left.obj src\icon\right.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\widget\progressbar.obj src\widget\radiobox.obj src\font\boldttf.obj src\font\ttf.obj src\font\boldfont.obj src\font\font.obj src\backend\gdi.obj - $(LD) $(LDFLAGS) -e$@ src\core.obj src\text.obj src\string.obj src\draw.obj src\default.obj src\filechooser.obj src\lowlevel.obj src\error.obj src\unicode.obj src\color.obj src\directory.obj src\color_picker.obj src\messagebox.obj external\stb_ds.obj external\stb_image.obj external\stb_truetype.obj src\icon\info.obj src\icon\note.obj src\icon\warning.obj src\icon\error.obj src\icon\news.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\icon\down.obj src\icon\left.obj src\icon\right.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\widget\progressbar.obj src\widget\radiobox.obj src\font\boldttf.obj src\font\ttf.obj src\font\boldfont.obj src\font\font.obj src\backend\gdi.obj -lopengl32.lib -lgdi32.lib -luser32.lib +src\Mw.dll: src\core.obj src\text.obj src\string.obj src\draw.obj src\default.obj src\lowlevel.obj src\error.obj src\unicode.obj src\color.obj src\directory.obj external\stb_ds.obj external\stb_image.obj external\stb_truetype.obj src\icon\info.obj src\icon\note.obj src\icon\warning.obj src\icon\error.obj src\icon\news.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\icon\down.obj src\icon\left.obj src\icon\right.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\widget\progressbar.obj src\widget\radiobox.obj src\font\boldttf.obj src\font\ttf.obj src\font\boldfont.obj src\font\font.obj src\dialog\filechooser.obj src\dialog\colorpicker.obj src\dialog\messagebox.obj src\backend\gdi.obj + $(LD) $(LDFLAGS) -e$@ src\core.obj src\text.obj src\string.obj src\draw.obj src\default.obj src\lowlevel.obj src\error.obj src\unicode.obj src\color.obj src\directory.obj external\stb_ds.obj external\stb_image.obj external\stb_truetype.obj src\icon\info.obj src\icon\note.obj src\icon\warning.obj src\icon\error.obj src\icon\news.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\icon\down.obj src\icon\left.obj src\icon\right.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\widget\progressbar.obj src\widget\radiobox.obj src\font\boldttf.obj src\font\ttf.obj src\font\boldfont.obj src\font\font.obj src\dialog\filechooser.obj src\dialog\colorpicker.obj src\dialog\messagebox.obj src\backend\gdi.obj -lopengl32.lib -lgdi32.lib -luser32.lib implib src\Mw.lib src\Mw.dll .c.obj: diff --git a/GNUmakefile b/GNUmakefile index aeb1e0b4..8459d9a8 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -23,9 +23,10 @@ L_CFLAGS = $(DEPINC) $(CFLAGS) -fPIC -D_MILSKO L_LDFLAGS = $(LDFLAGS) L_LIBS = $(LIBS) -L_OBJS = src/core.o src/default.o src/draw.o src/lowlevel.o src/error.o src/unicode.o src/color.o src/messagebox.o src/directory.o src/string.o src/filechooser.o src/color_picker.o src/text.o +L_OBJS = src/core.o src/default.o src/draw.o src/lowlevel.o src/error.o src/unicode.o src/color.o src/directory.o src/string.o src/text.o L_OBJS += external/stb_ds.o external/stb_image.o external/stb_truetype.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 src/widget/scrollbar.o src/widget/checkbox.o src/widget/label.o src/widget/entry.o src/widget/numberentry.o src/widget/viewport.o src/widget/listbox.o src/widget/progressbar.o src/widget/radiobox.o +L_OBJS += src/dialog/filechooser.o src/dialog/colorpicker.o src/dialog/messagebox.o L_OBJS += src/cursor/hidden.o src/cursor/default.o src/cursor/cross.o src/cursor/text.o L_OBJS += src/icon/warning.o src/icon/note.o src/icon/info.o src/icon/news.o src/icon/error.o src/icon/file.o src/icon/directory.o src/icon/back.o src/icon/forward.o src/icon/up.o src/icon/down.o src/icon/left.o src/icon/right.o src/icon/computer.o src/icon/search.o L_OBJS += src/font/font.o src/font/boldfont.o src/font/ttf.o src/font/boldttf.o diff --git a/NTMakefile b/NTMakefile index f89a0a80..4534787e 100644 --- a/NTMakefile +++ b/NTMakefile @@ -12,14 +12,11 @@ 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 del /f /q src\color.obj del /f /q src\directory.obj - del /f /q src\color_picker.obj - del /f /q src\messagebox.obj del /f /q external\stb_ds.obj del /f /q external\stb_image.obj del /f /q external\stb_truetype.obj @@ -62,11 +59,14 @@ clean: del /f /q src\font\ttf.obj del /f /q src\font\boldfont.obj del /f /q src\font\font.obj + del /f /q src\dialog\filechooser.obj + del /f /q src\dialog\colorpicker.obj + del /f /q src\dialog\messagebox.obj del /f /q src\backend\gdi.obj del /f /q src\Mw.dll -src\Mw.dll: src\core.obj src\text.obj src\string.obj src\draw.obj src\default.obj src\filechooser.obj src\lowlevel.obj src\error.obj src\unicode.obj src\color.obj src\directory.obj src\color_picker.obj src\messagebox.obj external\stb_ds.obj external\stb_image.obj external\stb_truetype.obj src\icon\info.obj src\icon\note.obj src\icon\warning.obj src\icon\error.obj src\icon\news.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\icon\down.obj src\icon\left.obj src\icon\right.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\widget\progressbar.obj src\widget\radiobox.obj src\font\boldttf.obj src\font\ttf.obj src\font\boldfont.obj src\font\font.obj src\backend\gdi.obj - $(LD) $(LDFLAGS) /OUT:$@ src\core.obj src\text.obj src\string.obj src\draw.obj src\default.obj src\filechooser.obj src\lowlevel.obj src\error.obj src\unicode.obj src\color.obj src\directory.obj src\color_picker.obj src\messagebox.obj external\stb_ds.obj external\stb_image.obj external\stb_truetype.obj src\icon\info.obj src\icon\note.obj src\icon\warning.obj src\icon\error.obj src\icon\news.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\icon\down.obj src\icon\left.obj src\icon\right.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\widget\progressbar.obj src\widget\radiobox.obj src\font\boldttf.obj src\font\ttf.obj src\font\boldfont.obj src\font\font.obj src\backend\gdi.obj opengl32.lib gdi32.lib user32.lib +src\Mw.dll: src\core.obj src\text.obj src\string.obj src\draw.obj src\default.obj src\lowlevel.obj src\error.obj src\unicode.obj src\color.obj src\directory.obj external\stb_ds.obj external\stb_image.obj external\stb_truetype.obj src\icon\info.obj src\icon\note.obj src\icon\warning.obj src\icon\error.obj src\icon\news.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\icon\down.obj src\icon\left.obj src\icon\right.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\widget\progressbar.obj src\widget\radiobox.obj src\font\boldttf.obj src\font\ttf.obj src\font\boldfont.obj src\font\font.obj src\dialog\filechooser.obj src\dialog\colorpicker.obj src\dialog\messagebox.obj src\backend\gdi.obj + $(LD) $(LDFLAGS) /OUT:$@ src\core.obj src\text.obj src\string.obj src\draw.obj src\default.obj src\lowlevel.obj src\error.obj src\unicode.obj src\color.obj src\directory.obj external\stb_ds.obj external\stb_image.obj external\stb_truetype.obj src\icon\info.obj src\icon\note.obj src\icon\warning.obj src\icon\error.obj src\icon\news.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\icon\down.obj src\icon\left.obj src\icon\right.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\widget\progressbar.obj src\widget\radiobox.obj src\font\boldttf.obj src\font\ttf.obj src\font\boldfont.obj src\font\font.obj src\dialog\filechooser.obj src\dialog\colorpicker.obj src\dialog\messagebox.obj src\backend\gdi.obj opengl32.lib gdi32.lib user32.lib .c.obj: diff --git a/WatMakefile b/WatMakefile index 79ef53c2..63a66e9b 100644 --- a/WatMakefile +++ b/WatMakefile @@ -11,14 +11,11 @@ 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 %erase src/color.obj %erase src/directory.obj - %erase src/color_picker.obj - %erase src/messagebox.obj %erase external/stb_ds.obj %erase external/stb_image.obj %erase external/stb_truetype.obj @@ -61,11 +58,14 @@ clean: .SYMBOLIC %erase src/font/ttf.obj %erase src/font/boldfont.obj %erase src/font/font.obj + %erase src/dialog/filechooser.obj + %erase src/dialog/colorpicker.obj + %erase src/dialog/messagebox.obj %erase src/backend/gdi.obj %erase src/Mw.dll -src/Mw.dll: src/core.obj src/text.obj src/string.obj src/draw.obj src/default.obj src/filechooser.obj src/lowlevel.obj src/error.obj src/unicode.obj src/color.obj src/directory.obj src/color_picker.obj src/messagebox.obj external/stb_ds.obj external/stb_image.obj external/stb_truetype.obj src/icon/info.obj src/icon/note.obj src/icon/warning.obj src/icon/error.obj src/icon/news.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/icon/down.obj src/icon/left.obj src/icon/right.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/widget/progressbar.obj src/widget/radiobox.obj src/font/boldttf.obj src/font/ttf.obj src/font/boldfont.obj src/font/font.obj src/backend/gdi.obj - $(LD) $(LDFLAGS) option implib=src/Mw.lib name $@ file src/core.obj file src/text.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/color.obj file src/directory.obj file src/color_picker.obj file src/messagebox.obj file external/stb_ds.obj file external/stb_image.obj file external/stb_truetype.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/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/icon/down.obj file src/icon/left.obj file src/icon/right.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/widget/progressbar.obj file src/widget/radiobox.obj file src/font/boldttf.obj file src/font/ttf.obj file src/font/boldfont.obj file src/font/font.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/text.obj src/string.obj src/draw.obj src/default.obj src/lowlevel.obj src/error.obj src/unicode.obj src/color.obj src/directory.obj external/stb_ds.obj external/stb_image.obj external/stb_truetype.obj src/icon/info.obj src/icon/note.obj src/icon/warning.obj src/icon/error.obj src/icon/news.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/icon/down.obj src/icon/left.obj src/icon/right.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/widget/progressbar.obj src/widget/radiobox.obj src/font/boldttf.obj src/font/ttf.obj src/font/boldfont.obj src/font/font.obj src/dialog/filechooser.obj src/dialog/colorpicker.obj src/dialog/messagebox.obj src/backend/gdi.obj + $(LD) $(LDFLAGS) option implib=src/Mw.lib name $@ file src/core.obj file src/text.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/color.obj file src/directory.obj file external/stb_ds.obj file external/stb_image.obj file external/stb_truetype.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/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/icon/down.obj file src/icon/left.obj file src/icon/right.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/widget/progressbar.obj file src/widget/radiobox.obj file src/font/boldttf.obj file src/font/ttf.obj file src/font/boldfont.obj file src/font/font.obj file src/dialog/filechooser.obj file src/dialog/colorpicker.obj file src/dialog/messagebox.obj file src/backend/gdi.obj library clib3r.lib library opengl32.lib library gdi32.lib library user32.lib @@ -79,8 +79,6 @@ 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 @@ -91,10 +89,6 @@ src/color.obj: src/color.c $(CC) $(CFLAGS) -fo=$@ $< src/directory.obj: src/directory.c $(CC) $(CFLAGS) -fo=$@ $< -src/color_picker.obj: src/color_picker.c - $(CC) $(CFLAGS) -fo=$@ $< -src/messagebox.obj: src/messagebox.c - $(CC) $(CFLAGS) -fo=$@ $< external/stb_ds.obj: external/stb_ds.c $(CC) $(CFLAGS) -fo=$@ $< external/stb_image.obj: external/stb_image.c @@ -179,5 +173,11 @@ src/font/boldfont.obj: src/font/boldfont.c $(CC) $(CFLAGS) -fo=$@ $< src/font/font.obj: src/font/font.c $(CC) $(CFLAGS) -fo=$@ $< +src/dialog/filechooser.obj: src/dialog/filechooser.c + $(CC) $(CFLAGS) -fo=$@ $< +src/dialog/colorpicker.obj: src/dialog/colorpicker.c + $(CC) $(CFLAGS) -fo=$@ $< +src/dialog/messagebox.obj: src/dialog/messagebox.c + $(CC) $(CFLAGS) -fo=$@ $< src/backend/gdi.obj: src/backend/gdi.c $(CC) $(CFLAGS) -fo=$@ $< diff --git a/examples/basic/color_picker.c b/examples/basic/color_picker.c index c71c620f..8bbd8d0b 100644 --- a/examples/basic/color_picker.c +++ b/examples/basic/color_picker.c @@ -13,6 +13,9 @@ void color_callback(MwWidget handle, void* user_data, void* call_data) { (void)handle; (void)user_data; + rgb->red &= 0xff; + rgb->green &= 0xff; + rgb->blue &= 0xff; sprintf(hexColor, "#%02X%02X%02X", rgb->red, rgb->green, rgb->blue); MwSetText(window, MwNbackground, hexColor); } diff --git a/include/Mw/ColorPicker.h b/include/Mw/Dialog/ColorPicker.h similarity index 100% rename from include/Mw/ColorPicker.h rename to include/Mw/Dialog/ColorPicker.h diff --git a/include/Mw/FileChooser.h b/include/Mw/Dialog/FileChooser.h similarity index 100% rename from include/Mw/FileChooser.h rename to include/Mw/Dialog/FileChooser.h diff --git a/include/Mw/MessageBox.h b/include/Mw/Dialog/MessageBox.h similarity index 100% rename from include/Mw/MessageBox.h rename to include/Mw/Dialog/MessageBox.h diff --git a/include/Mw/Milsko.h b/include/Mw/Milsko.h index 723707a7..e9e49eb7 100644 --- a/include/Mw/Milsko.h +++ b/include/Mw/Milsko.h @@ -19,13 +19,14 @@ #include #include #include -#include #include #include -#include -#include #include +#include +#include +#include + #include #include #include diff --git a/src/color_picker.c b/src/dialog/colorpicker.c similarity index 100% rename from src/color_picker.c rename to src/dialog/colorpicker.c diff --git a/src/filechooser.c b/src/dialog/filechooser.c similarity index 100% rename from src/filechooser.c rename to src/dialog/filechooser.c diff --git a/src/messagebox.c b/src/dialog/messagebox.c similarity index 100% rename from src/messagebox.c rename to src/dialog/messagebox.c diff --git a/tools/genmk.pl b/tools/genmk.pl index c1f7eacd..1fc7e27b 100755 --- a/tools/genmk.pl +++ b/tools/genmk.pl @@ -150,6 +150,7 @@ scan("src/cursor"); scan("src/widget"); scan("src/text"); scan("src/font"); +scan("src/dialog"); push(@cfiles, "src/backend/gdi.c"); generate("BorMakefile", "Borland");