From 80c5ba3b9974c9efb2f3f2457bc6e56edf9812d7 Mon Sep 17 00:00:00 2001 From: NishiOwO Date: Sun, 12 Oct 2025 13:49:18 +0000 Subject: [PATCH] fix document git-svn-id: http://svn2.nishi.boats/svn/milsko/trunk@299 b9cfdab3-6d41-4d17-bbe4-086880011989 --- BorMakefile | 6 +++--- NTMakefile | 6 +++--- WatMakefile | 10 +++++----- doc/index.html | 28 ++++++++++++++-------------- resource/icon/error.png | Bin 663 -> 663 bytes resource/icon/info.png | Bin 434 -> 434 bytes resource/icon/news.png | Bin 542 -> 542 bytes resource/icon/note.png | Bin 594 -> 594 bytes resource/icon/question.png | Bin 529 -> 529 bytes resource/icon/warning.png | Bin 498 -> 498 bytes tools/doc.pl | 1 + 11 files changed, 26 insertions(+), 25 deletions(-) diff --git a/BorMakefile b/BorMakefile index e6bffad..a53da65 100644 --- a/BorMakefile +++ b/BorMakefile @@ -37,12 +37,12 @@ clean: del /f /q src\widget\menu.obj del /f /q src\widget\entry.obj del /f /q src\widget\submenu.obj + del /f /q src\widget\viewport.obj del /f /q src\widget\image.obj del /f /q src\widget\scrollbar.obj del /f /q src\widget\checkbox.obj del /f /q src\widget\label.obj del /f /q src\widget\numberentry.obj - del /f /q src\widget\viewport.obj del /f /q src\backend\gdi.obj del /f /q oosrc\base.obj del /f /q oosrc\widget\button.obj @@ -61,8 +61,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\messagebox.obj src\boldfont.obj src\external\ds.obj src\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\image.obj src\widget\scrollbar.obj src\widget\checkbox.obj src\widget\label.obj src\widget\numberentry.obj src\widget\viewport.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\messagebox.obj src\boldfont.obj src\external\ds.obj src\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\image.obj src\widget\scrollbar.obj src\widget\checkbox.obj src\widget\label.obj src\widget\numberentry.obj src\widget\viewport.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\messagebox.obj src\boldfont.obj src\external\ds.obj src\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\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\messagebox.obj src\boldfont.obj src\external\ds.obj src\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\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\label.obj oosrc\widget\entry.obj oosrc\widget\numberentry.obj diff --git a/NTMakefile b/NTMakefile index d65573e..e1d4cc3 100644 --- a/NTMakefile +++ b/NTMakefile @@ -37,12 +37,12 @@ clean: del /f /q src\widget\menu.obj del /f /q src\widget\entry.obj del /f /q src\widget\submenu.obj + del /f /q src\widget\viewport.obj del /f /q src\widget\image.obj del /f /q src\widget\scrollbar.obj del /f /q src\widget\checkbox.obj del /f /q src\widget\label.obj del /f /q src\widget\numberentry.obj - del /f /q src\widget\viewport.obj del /f /q src\backend\gdi.obj del /f /q oosrc\base.obj del /f /q oosrc\widget\button.obj @@ -61,8 +61,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\messagebox.obj src\boldfont.obj src\external\ds.obj src\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\image.obj src\widget\scrollbar.obj src\widget\checkbox.obj src\widget\label.obj src\widget\numberentry.obj src\widget\viewport.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\messagebox.obj src\boldfont.obj src\external\ds.obj src\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\image.obj src\widget\scrollbar.obj src\widget\checkbox.obj src\widget\label.obj src\widget\numberentry.obj src\widget\viewport.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\messagebox.obj src\boldfont.obj src\external\ds.obj src\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\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\messagebox.obj src\boldfont.obj src\external\ds.obj src\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\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\label.obj oosrc\widget\entry.obj oosrc\widget\numberentry.obj diff --git a/WatMakefile b/WatMakefile index c93cd79..eb43d39 100644 --- a/WatMakefile +++ b/WatMakefile @@ -36,12 +36,12 @@ clean: .SYMBOLIC %erase src/widget/menu.obj %erase src/widget/entry.obj %erase src/widget/submenu.obj + %erase src/widget/viewport.obj %erase src/widget/image.obj %erase src/widget/scrollbar.obj %erase src/widget/checkbox.obj %erase src/widget/label.obj %erase src/widget/numberentry.obj - %erase src/widget/viewport.obj %erase src/backend/gdi.obj %erase oosrc/base.obj %erase oosrc/widget/button.obj @@ -60,8 +60,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/messagebox.obj src/boldfont.obj src/external/ds.obj src/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/image.obj src/widget/scrollbar.obj src/widget/checkbox.obj src/widget/label.obj src/widget/numberentry.obj src/widget/viewport.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/messagebox.obj file src/boldfont.obj file src/external/ds.obj file src/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/image.obj file src/widget/scrollbar.obj file src/widget/checkbox.obj file src/widget/label.obj file src/widget/numberentry.obj file src/widget/viewport.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/messagebox.obj src/boldfont.obj src/external/ds.obj src/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/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/messagebox.obj file src/boldfont.obj file src/external/ds.obj file src/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/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/label.obj oosrc/widget/entry.obj oosrc/widget/numberentry.obj @@ -125,6 +125,8 @@ src/widget/entry.obj: src/widget/entry.c $(CC) $(CFLAGS) -fo=$@ $< src/widget/submenu.obj: src/widget/submenu.c $(CC) $(CFLAGS) -fo=$@ $< +src/widget/viewport.obj: src/widget/viewport.c + $(CC) $(CFLAGS) -fo=$@ $< src/widget/image.obj: src/widget/image.c $(CC) $(CFLAGS) -fo=$@ $< src/widget/scrollbar.obj: src/widget/scrollbar.c @@ -135,8 +137,6 @@ src/widget/label.obj: src/widget/label.c $(CC) $(CFLAGS) -fo=$@ $< src/widget/numberentry.obj: src/widget/numberentry.c $(CC) $(CFLAGS) -fo=$@ $< -src/widget/viewport.obj: src/widget/viewport.c - $(CC) $(CFLAGS) -fo=$@ $< src/backend/gdi.obj: src/backend/gdi.c $(CC) $(CFLAGS) -fo=$@ $< oosrc/base.obj: oosrc/base.cc diff --git a/doc/index.html b/doc/index.html index da03af4..e80e85f 100644 --- a/doc/index.html +++ b/doc/index.html @@ -21,25 +21,25 @@ MwALIGNMENT
- #define MwDEFAULT 0x0fffffff + MwDEFAULT
- #define MwMB_ICONMASK 0xf + MwMB_ICONMASK
- #define MwMB_BUTTONMASK 0xf0 + MwMB_BUTTONMASK
- #define MwMB_BUTTONOK 0x10 + MwMB_BUTTONOK
- #define MwMB_BUTTONCANCEL 0x20 + MwMB_BUTTONCANCEL
- #define MwMB_BUTTONYES 0x40 + MwMB_BUTTONYES
- #define MwMB_BUTTONNO 0x80 + MwMB_BUTTONNO
MwMB_BUTTONOKCANCEL @@ -482,49 +482,49 @@
-
#define MwDEFAULT 0x0fffffff
+
#define MwDEFAULT 0x0fffffff
Default.
-
#define MwMB_ICONMASK 0xf
+
#define MwMB_ICONMASK 0xf
Icon mask.
-
#define MwMB_BUTTONMASK 0xf0
+
#define MwMB_BUTTONMASK 0xf0
Button mask.
-
#define MwMB_BUTTONOK 0x10
+
#define MwMB_BUTTONOK 0x10
OK button.
-
#define MwMB_BUTTONCANCEL 0x20
+
#define MwMB_BUTTONCANCEL 0x20
Cancel button.
-
#define MwMB_BUTTONYES 0x40
+
#define MwMB_BUTTONYES 0x40
Yes button.
-
#define MwMB_BUTTONNO 0x80
+
#define MwMB_BUTTONNO 0x80
No button. diff --git a/resource/icon/error.png b/resource/icon/error.png index a8e22cfc6d18a4cd553652227268ff2faadbcc34..fd3691150fbe0bf69046bb5e858b5aa21caf392d 100644 GIT binary patch delta 48 zcmbQvI-PaGbaq}t_O%jj8#m6o!zgQPWnyV%V6JUoU}a#ic9NMV0}yz+`njxgN@xNA DWPT0- delta 48 zcmbQvI-PaGbapOn)^8=J4{w}zhf&tR%EZ{pz*O77z{gTe~DWM4f DoQV)1 diff --git a/resource/icon/info.png b/resource/icon/info.png index 5e5a7d38d9539bf67d295fcb930c3d757b830347..5c8a50c53b56cf403b16328660ac5fd1b930d1b7 100644 GIT binary patch delta 48 zcmdnQyoq^2H#@H(hwbucg^iP#8D)*FOf0PoEVK;_tPBjIZ@DdC00K`}KbLh*2~7Y- C%?(5V delta 48 zcmdnQyoq^2H#?U$>$j5Ahc`}QW|TFsGBLI?Fx56Nure^1@bq>%0}yz+`njxgN@xNA DhYJs3 diff --git a/resource/icon/news.png b/resource/icon/news.png index 190d024afccd9b1b5a815912769f9b0a2fbf37e2..f95f73c5ad5171774cbc7afc6f2c4f43208f84ab 100644 GIT binary patch delta 48 zcmbQoGLL1#M0Q?74%_9?3L9r+GRhiTnOIsGSZEsbP0l+XkK Dj+YOu diff --git a/resource/icon/note.png b/resource/icon/note.png index 2cc533c513ef2fe66d5887dc975318543f772f41..79c0b469c59983b3c564ddb30f7d937b792a400f 100644 GIT binary patch delta 48 zcmcb_a*1Wabaq}t4%_9?3LEE5XOuOzGO@HWu+TOzure@+zU8)n0SG)@{an^LB{Ts5 DX!#B@ delta 48 zcmcb_a*1WabapOn)^8=J4{w||ol(}n%EZ{pz*O77z{gTe~DWM4f DsW%W$ diff --git a/resource/icon/question.png b/resource/icon/question.png index 926680e94f64faaa0920f10b82644a827aef2f0a..575a4e42ba84775697faedef05c49c8888d3211d 100644 GIT binary patch delta 48 zcmbQpGLdD%M0Q?74%_9?3L9s{Fv=QRnOIsGSZEsbP0l+XkK Dh%pa_ diff --git a/resource/icon/warning.png b/resource/icon/warning.png index b323e22dd10210f4e63ae874be6292f8e8caaeab..5cab4ab1d9a72a36967750e1ea3ea5cb20d56266 100644 GIT binary patch delta 48 zcmeyw{E2zOM0Q?74%_9?3L9tGGRhiTnOIsGSZEsbP0l+XkK Dr;`vT diff --git a/tools/doc.pl b/tools/doc.pl index d8cf0e7..ceef837 100755 --- a/tools/doc.pl +++ b/tools/doc.pl @@ -151,6 +151,7 @@ sub scan_dir { $sl = $l; $sl =~ s/\n//g; $sl =~ s/=.+$//g; + $sl =~ s/^#[^ ]+(?:[ \t]+([^ \(]+)(?:.+$))?/\1/; $sl =~ s/^.+[ \t]+([^ ]+)[ \t]*\(.+\);?$/\1/g; $sl =~ s/^.+[ \t]+([^ ]+);$/\1/g;