diff --git a/BorMakefile b/BorMakefile index 19655c4..49ba8ed 100644 --- a/BorMakefile +++ b/BorMakefile @@ -6,9 +6,9 @@ MW_LDFLAGS = -tWD EXE_CFLAGS = -Iinclude EXE_LDFLAGS = .SUFFIXES: .obj .c -all: src\Mw.dll examples\basic\box.exe examples\basic\calculator.exe examples\basic\checkbox.exe examples\basic\clipboard.exe examples\basic\colorpicker.exe examples\basic\combobox.exe examples\basic\example.exe examples\basic\filechooser.exe examples\basic\image.exe examples\basic\listbox.exe examples\basic\messagebox.exe examples\basic\periodic.exe examples\basic\progressbar.exe examples\basic\radiobox.exe examples\basic\rotate.exe examples\basic\scrollbar.exe examples\basic\sevensegment.exe examples\basic\subwindow.exe examples\basic\treeview.exe examples\basic\viewport.exe examples\gldemos\boing.exe examples\gldemos\clock.exe examples\gldemos\cube.exe examples\gldemos\gears.exe examples\gldemos\triangle.exe examples\gldemos\tripaint.exe +all: src\Mw.dll examples\basic\box.exe examples\basic\calculator.exe examples\basic\checkbox.exe examples\basic\clipboard.exe examples\basic\colorpicker.exe examples\basic\combobox.exe examples\basic\example.exe examples\basic\filechooser.exe examples\basic\image.exe examples\basic\listbox.exe examples\basic\messagebox.exe examples\basic\periodic.exe examples\basic\progressbar.exe examples\basic\radiobox.exe examples\basic\rotate.exe examples\basic\scrollbar.exe examples\basic\sevensegment.exe examples\basic\subwindow.exe examples\basic\tab.exe examples\basic\treeview.exe examples\basic\viewport.exe examples\gldemos\boing.exe examples\gldemos\clock.exe examples\gldemos\cube.exe examples\gldemos\gears.exe examples\gldemos\triangle.exe examples\gldemos\tripaint.exe lib: src\Mw.dll -examples: examples\basic\box.exe examples\basic\calculator.exe examples\basic\checkbox.exe examples\basic\clipboard.exe examples\basic\colorpicker.exe examples\basic\combobox.exe examples\basic\example.exe examples\basic\filechooser.exe examples\basic\image.exe examples\basic\listbox.exe examples\basic\messagebox.exe examples\basic\periodic.exe examples\basic\progressbar.exe examples\basic\radiobox.exe examples\basic\rotate.exe examples\basic\scrollbar.exe examples\basic\sevensegment.exe examples\basic\subwindow.exe examples\basic\treeview.exe examples\basic\viewport.exe examples\gldemos\boing.exe examples\gldemos\clock.exe examples\gldemos\cube.exe examples\gldemos\gears.exe examples\gldemos\triangle.exe examples\gldemos\tripaint.exe +examples: examples\basic\box.exe examples\basic\calculator.exe examples\basic\checkbox.exe examples\basic\clipboard.exe examples\basic\colorpicker.exe examples\basic\combobox.exe examples\basic\example.exe examples\basic\filechooser.exe examples\basic\image.exe examples\basic\listbox.exe examples\basic\messagebox.exe examples\basic\periodic.exe examples\basic\progressbar.exe examples\basic\radiobox.exe examples\basic\rotate.exe examples\basic\scrollbar.exe examples\basic\sevensegment.exe examples\basic\subwindow.exe examples\basic\tab.exe examples\basic\treeview.exe examples\basic\viewport.exe examples\gldemos\boing.exe examples\gldemos\clock.exe examples\gldemos\cube.exe examples\gldemos\gears.exe examples\gldemos\triangle.exe examples\gldemos\tripaint.exe clean: del /f /q external\libz\src\adler32.obj del /f /q external\libz\src\compress.obj @@ -117,6 +117,7 @@ clean: del /f /q examples\basic\scrollbar.obj del /f /q examples\basic\sevensegment.obj del /f /q examples\basic\subwindow.obj + del /f /q examples\basic\tab.obj del /f /q examples\basic\treeview.obj del /f /q examples\basic\viewport.obj del /f /q examples\gldemos\boing.obj @@ -143,6 +144,7 @@ clean: del /f /q examples\basic\scrollbar.exe del /f /q examples\basic\sevensegment.exe del /f /q examples\basic\subwindow.exe + del /f /q examples\basic\tab.exe del /f /q examples\basic\treeview.exe del /f /q examples\basic\viewport.exe del /f /q examples\gldemos\boing.exe @@ -260,6 +262,12 @@ examples\basic\subwindow.exe: examples\basic\subwindow.obj src\Mw.dll examples\basic\subwindow.obj: examples/basic/subwindow.c $(CC) $(EXE_CFLAGS) -o$@ examples/basic/subwindow.c +examples\basic\tab.exe: examples\basic\tab.obj src\Mw.dll + $(LD) $(EXE_LDFLAGS) -e$@ examples\basic\tab.obj -lsrc\Mw.lib + +examples\basic\tab.obj: examples/basic/tab.c + $(CC) $(EXE_CFLAGS) -o$@ examples/basic/tab.c + examples\basic\treeview.exe: examples\basic\treeview.obj src\Mw.dll $(LD) $(EXE_LDFLAGS) -e$@ examples\basic\treeview.obj -lsrc\Mw.lib diff --git a/NTMakefile b/NTMakefile index 78d3bce..c60838e 100644 --- a/NTMakefile +++ b/NTMakefile @@ -6,9 +6,9 @@ MW_LDFLAGS = /DLL EXE_CFLAGS = /Iinclude EXE_LDFLAGS = .SUFFIXES: .obj .c -all: src\Mw.dll examples\basic\box.exe examples\basic\calculator.exe examples\basic\checkbox.exe examples\basic\clipboard.exe examples\basic\colorpicker.exe examples\basic\combobox.exe examples\basic\example.exe examples\basic\filechooser.exe examples\basic\image.exe examples\basic\listbox.exe examples\basic\messagebox.exe examples\basic\periodic.exe examples\basic\progressbar.exe examples\basic\radiobox.exe examples\basic\rotate.exe examples\basic\scrollbar.exe examples\basic\sevensegment.exe examples\basic\subwindow.exe examples\basic\treeview.exe examples\basic\viewport.exe examples\gldemos\boing.exe examples\gldemos\clock.exe examples\gldemos\cube.exe examples\gldemos\gears.exe examples\gldemos\triangle.exe examples\gldemos\tripaint.exe +all: src\Mw.dll examples\basic\box.exe examples\basic\calculator.exe examples\basic\checkbox.exe examples\basic\clipboard.exe examples\basic\colorpicker.exe examples\basic\combobox.exe examples\basic\example.exe examples\basic\filechooser.exe examples\basic\image.exe examples\basic\listbox.exe examples\basic\messagebox.exe examples\basic\periodic.exe examples\basic\progressbar.exe examples\basic\radiobox.exe examples\basic\rotate.exe examples\basic\scrollbar.exe examples\basic\sevensegment.exe examples\basic\subwindow.exe examples\basic\tab.exe examples\basic\treeview.exe examples\basic\viewport.exe examples\gldemos\boing.exe examples\gldemos\clock.exe examples\gldemos\cube.exe examples\gldemos\gears.exe examples\gldemos\triangle.exe examples\gldemos\tripaint.exe lib: src\Mw.dll -examples: examples\basic\box.exe examples\basic\calculator.exe examples\basic\checkbox.exe examples\basic\clipboard.exe examples\basic\colorpicker.exe examples\basic\combobox.exe examples\basic\example.exe examples\basic\filechooser.exe examples\basic\image.exe examples\basic\listbox.exe examples\basic\messagebox.exe examples\basic\periodic.exe examples\basic\progressbar.exe examples\basic\radiobox.exe examples\basic\rotate.exe examples\basic\scrollbar.exe examples\basic\sevensegment.exe examples\basic\subwindow.exe examples\basic\treeview.exe examples\basic\viewport.exe examples\gldemos\boing.exe examples\gldemos\clock.exe examples\gldemos\cube.exe examples\gldemos\gears.exe examples\gldemos\triangle.exe examples\gldemos\tripaint.exe +examples: examples\basic\box.exe examples\basic\calculator.exe examples\basic\checkbox.exe examples\basic\clipboard.exe examples\basic\colorpicker.exe examples\basic\combobox.exe examples\basic\example.exe examples\basic\filechooser.exe examples\basic\image.exe examples\basic\listbox.exe examples\basic\messagebox.exe examples\basic\periodic.exe examples\basic\progressbar.exe examples\basic\radiobox.exe examples\basic\rotate.exe examples\basic\scrollbar.exe examples\basic\sevensegment.exe examples\basic\subwindow.exe examples\basic\tab.exe examples\basic\treeview.exe examples\basic\viewport.exe examples\gldemos\boing.exe examples\gldemos\clock.exe examples\gldemos\cube.exe examples\gldemos\gears.exe examples\gldemos\triangle.exe examples\gldemos\tripaint.exe clean: del /f /q external\libz\src\adler32.obj del /f /q external\libz\src\compress.obj @@ -117,6 +117,7 @@ clean: del /f /q examples\basic\scrollbar.obj del /f /q examples\basic\sevensegment.obj del /f /q examples\basic\subwindow.obj + del /f /q examples\basic\tab.obj del /f /q examples\basic\treeview.obj del /f /q examples\basic\viewport.obj del /f /q examples\gldemos\boing.obj @@ -143,6 +144,7 @@ clean: del /f /q examples\basic\scrollbar.exe del /f /q examples\basic\sevensegment.exe del /f /q examples\basic\subwindow.exe + del /f /q examples\basic\tab.exe del /f /q examples\basic\treeview.exe del /f /q examples\basic\viewport.exe del /f /q examples\gldemos\boing.exe @@ -260,6 +262,12 @@ examples\basic\subwindow.exe: examples\basic\subwindow.obj src\Mw.dll examples\basic\subwindow.obj: examples/basic/subwindow.c $(CC) $(EXE_CFLAGS) /Fo$@ examples/basic/subwindow.c +examples\basic\tab.exe: examples\basic\tab.obj src\Mw.dll + $(LD) $(EXE_LDFLAGS) /OUT:$@ examples\basic\tab.obj src\Mw.lib + +examples\basic\tab.obj: examples/basic/tab.c + $(CC) $(EXE_CFLAGS) /Fo$@ examples/basic/tab.c + examples\basic\treeview.exe: examples\basic\treeview.obj src\Mw.dll $(LD) $(EXE_LDFLAGS) /OUT:$@ examples\basic\treeview.obj src\Mw.lib diff --git a/README.txt b/README.txt index 3a73a74..9278f3f 100644 --- a/README.txt +++ b/README.txt @@ -1,5 +1,5 @@ -Greetings - Welcome to the Milsko GUI Toolkit (Version 1.1) +Greetings - Welcome to the Milsko GUI Toolkit (Version 1.2) This document contains a brief summary of the contents of this source distributions and building instructions for Milsko GUI Toolkit. diff --git a/WatMakefile b/WatMakefile index 89bdc85..eab9e5b 100644 --- a/WatMakefile +++ b/WatMakefile @@ -5,9 +5,9 @@ MW_CFLAGS = -bd -i=include -i=external/libz/include -d_MILSKO -dUSE_GDI -dUSE_ST MW_LDFLAGS = system nt_dll EXE_CFLAGS = -i=include EXE_LDFLAGS = system nt -all: src/Mw.dll examples/basic/box.exe examples/basic/calculator.exe examples/basic/checkbox.exe examples/basic/clipboard.exe examples/basic/colorpicker.exe examples/basic/combobox.exe examples/basic/example.exe examples/basic/filechooser.exe examples/basic/image.exe examples/basic/listbox.exe examples/basic/messagebox.exe examples/basic/periodic.exe examples/basic/progressbar.exe examples/basic/radiobox.exe examples/basic/rotate.exe examples/basic/scrollbar.exe examples/basic/sevensegment.exe examples/basic/subwindow.exe examples/basic/treeview.exe examples/basic/viewport.exe examples/gldemos/boing.exe examples/gldemos/clock.exe examples/gldemos/cube.exe examples/gldemos/gears.exe examples/gldemos/triangle.exe examples/gldemos/tripaint.exe +all: src/Mw.dll examples/basic/box.exe examples/basic/calculator.exe examples/basic/checkbox.exe examples/basic/clipboard.exe examples/basic/colorpicker.exe examples/basic/combobox.exe examples/basic/example.exe examples/basic/filechooser.exe examples/basic/image.exe examples/basic/listbox.exe examples/basic/messagebox.exe examples/basic/periodic.exe examples/basic/progressbar.exe examples/basic/radiobox.exe examples/basic/rotate.exe examples/basic/scrollbar.exe examples/basic/sevensegment.exe examples/basic/subwindow.exe examples/basic/tab.exe examples/basic/treeview.exe examples/basic/viewport.exe examples/gldemos/boing.exe examples/gldemos/clock.exe examples/gldemos/cube.exe examples/gldemos/gears.exe examples/gldemos/triangle.exe examples/gldemos/tripaint.exe lib: src/Mw.dll -examples: examples/basic/box.exe examples/basic/calculator.exe examples/basic/checkbox.exe examples/basic/clipboard.exe examples/basic/colorpicker.exe examples/basic/combobox.exe examples/basic/example.exe examples/basic/filechooser.exe examples/basic/image.exe examples/basic/listbox.exe examples/basic/messagebox.exe examples/basic/periodic.exe examples/basic/progressbar.exe examples/basic/radiobox.exe examples/basic/rotate.exe examples/basic/scrollbar.exe examples/basic/sevensegment.exe examples/basic/subwindow.exe examples/basic/treeview.exe examples/basic/viewport.exe examples/gldemos/boing.exe examples/gldemos/clock.exe examples/gldemos/cube.exe examples/gldemos/gears.exe examples/gldemos/triangle.exe examples/gldemos/tripaint.exe +examples: examples/basic/box.exe examples/basic/calculator.exe examples/basic/checkbox.exe examples/basic/clipboard.exe examples/basic/colorpicker.exe examples/basic/combobox.exe examples/basic/example.exe examples/basic/filechooser.exe examples/basic/image.exe examples/basic/listbox.exe examples/basic/messagebox.exe examples/basic/periodic.exe examples/basic/progressbar.exe examples/basic/radiobox.exe examples/basic/rotate.exe examples/basic/scrollbar.exe examples/basic/sevensegment.exe examples/basic/subwindow.exe examples/basic/tab.exe examples/basic/treeview.exe examples/basic/viewport.exe examples/gldemos/boing.exe examples/gldemos/clock.exe examples/gldemos/cube.exe examples/gldemos/gears.exe examples/gldemos/triangle.exe examples/gldemos/tripaint.exe clean: .SYMBOLIC %erase external/libz/src/adler32.obj %erase external/libz/src/compress.obj @@ -116,6 +116,7 @@ clean: .SYMBOLIC %erase examples/basic/scrollbar.obj %erase examples/basic/sevensegment.obj %erase examples/basic/subwindow.obj + %erase examples/basic/tab.obj %erase examples/basic/treeview.obj %erase examples/basic/viewport.obj %erase examples/gldemos/boing.obj @@ -142,6 +143,7 @@ clean: .SYMBOLIC %erase examples/basic/scrollbar.exe %erase examples/basic/sevensegment.exe %erase examples/basic/subwindow.exe + %erase examples/basic/tab.exe %erase examples/basic/treeview.exe %erase examples/basic/viewport.exe %erase examples/gldemos/boing.exe @@ -259,6 +261,12 @@ examples/basic/subwindow.exe: examples/basic/subwindow.obj src/Mw.dll examples/basic/subwindow.obj: examples/basic/subwindow.c $(CC) $(EXE_CFLAGS) -fo=$@ examples/basic/subwindow.c +examples/basic/tab.exe: examples/basic/tab.obj src/Mw.dll + $(LD) $(EXE_LDFLAGS) name $@ file examples/basic/tab.obj library clib3r.lib library src/Mw.lib + +examples/basic/tab.obj: examples/basic/tab.c + $(CC) $(EXE_CFLAGS) -fo=$@ examples/basic/tab.c + examples/basic/treeview.exe: examples/basic/treeview.obj src/Mw.dll $(LD) $(EXE_LDFLAGS) name $@ file examples/basic/treeview.obj library clib3r.lib library src/Mw.lib diff --git a/examples/basic/listbox.c b/examples/basic/listbox.c index 7c8f884..0ec9fe7 100644 --- a/examples/basic/listbox.c +++ b/examples/basic/listbox.c @@ -32,9 +32,9 @@ int main() { MwLibraryInit(); w_main = MwVaCreateWidget(MwWindowClass, "main", NULL, MwDEFAULT, MwDEFAULT, 640, 480, - MwNtitle, "listbox", - NULL); - lb = MwCreateWidget(MwListBoxClass, "listbox", w_main, 5, 5, 630, 470); + MwNtitle, "listbox", + NULL); + lb = MwCreateWidget(MwListBoxClass, "listbox", w_main, 5, 5, 630, 470); px = MwLoadIcon(lb, MwIconInfo); diff --git a/include/Mw/Version.h b/include/Mw/Version.h index 2a121eb..02ca715 100644 --- a/include/Mw/Version.h +++ b/include/Mw/Version.h @@ -13,7 +13,7 @@ /*! * @brief Minor version */ -#define MwMINOR 1 +#define MwMINOR 2 /*! * @brief Patchlevel of version, calculated by `patchlevel_alphabet - 'a'` @@ -23,7 +23,7 @@ /*! * @brief Version in string */ -#define MwVERSION "1.1" +#define MwVERSION "1.2" /*! * @brief Version in string diff --git a/src/backend/wayland/wayland.c b/src/backend/wayland/wayland.c index 63f966d..ed2516f 100644 --- a/src/backend/wayland/wayland.c +++ b/src/backend/wayland/wayland.c @@ -1606,7 +1606,7 @@ static void MwLLClipImpl(MwLL handle, MwRect* rect) { if(rect == NULL) { handle->wayland.is_clipping = MwFALSE; } else { - handle->wayland.clip = *rect; + handle->wayland.clip = *rect; handle->wayland.is_clipping = MwTRUE; } } diff --git a/vms/build.com b/vms/build.com index 944918f..b94143e 100644 --- a/vms/build.com +++ b/vms/build.com @@ -163,6 +163,11 @@ $ then $ write sys$output "CC [.src.widget]calendar.obj" $ cc /include_directory=("./include","./src/widget") /define=(_MILSKO,USE_X11,NO_IMAGE) /object=[.src.widget]calendar.obj [.src.widget]calendar.c $ endif +$ if f$search("[.src.widget]tab.obj;*") .eqs. "" +$ then +$ write sys$output "CC [.src.widget]tab.obj" +$ cc /include_directory=("./include","./src/widget") /define=(_MILSKO,USE_X11,NO_IMAGE) /object=[.src.widget]tab.obj [.src.widget]tab.c +$ endif $ if f$search("[.src.dialog]colorpicker.obj;*") .eqs. "" $ then $ write sys$output "CC [.src.dialog]colorpicker.obj" @@ -330,6 +335,7 @@ $ WRITE LINK_OPT "[.src.widget]viewport.obj" $ WRITE LINK_OPT "[.src.widget]window.obj" $ WRITE LINK_OPT "[.src.widget]subwindow.obj" $ WRITE LINK_OPT "[.src.widget]calendar.obj" +$ WRITE LINK_OPT "[.src.widget]tab.obj" $ WRITE LINK_OPT "[.src.dialog]colorpicker.obj" $ WRITE LINK_OPT "[.src.dialog]directorychooser.obj" $ WRITE LINK_OPT "[.src.dialog]filechooser.obj" diff --git a/vms/clean.com b/vms/clean.com index da1ffb3..3faee1d 100644 --- a/vms/clean.com +++ b/vms/clean.com @@ -31,6 +31,7 @@ $ if f$search("[.src.widget]viewport.obj") .nes. "" then delete [.src.widget]vie $ if f$search("[.src.widget]window.obj") .nes. "" then delete [.src.widget]window.obj;* $ if f$search("[.src.widget]subwindow.obj") .nes. "" then delete [.src.widget]subwindow.obj;* $ if f$search("[.src.widget]calendar.obj") .nes. "" then delete [.src.widget]calendar.obj;* +$ if f$search("[.src.widget]tab.obj") .nes. "" then delete [.src.widget]tab.obj;* $ if f$search("[.src.dialog]colorpicker.obj") .nes. "" then delete [.src.dialog]colorpicker.obj;* $ if f$search("[.src.dialog]directorychooser.obj") .nes. "" then delete [.src.dialog]directorychooser.obj;* $ if f$search("[.src.dialog]filechooser.obj") .nes. "" then delete [.src.dialog]filechooser.obj;*