fix minor bugs

.gitignore

@@ -24,7 +24,3 @@ Makefile.in
 /*config.h.in
 /*config.h.in~
 
-/src/font/utils/emoji/
-/src/font/utils/ucd/
-/src/sysres/font_list
-/src/sysres/license/dat_files/

3rd-party/scripteasy/test/font_table.c

@@ -83,7 +83,7 @@ const se_font_description se_font_desc = {
 
 /* The following is the scripteasy mem pool definition */
 
-#define SE_MEM_POOL_SIZE            (64 * 1024)
+#define SE_MEM_POOL_SIZE	        (64 * 1024)
 #define SE_CACHE_MEM_POOL_SIZE      (256 * 1024)
 
 int   se_minigui_mem_pool[SE_MEM_POOL_SIZE];

AUTHORS

@@ -0,0 +1,2 @@
+Beijing FMSoft Technologies Co., Ltd.. (http://www.fmsoft.cn)
+

AUTHORS.md

@@ -1,16 +0,0 @@
-The current main maintainers and/or developers:
-
-* WEI Yongming
-
-As employed engineers of [Beijing FMSoft Technologies Co., Ltd.],
-the following people have participated in the development of MiniGUI Core:
-
-* HOU Huihua
-* WAN Zheng
-* DONG Kai
-* DONG Junjie
-* YAN Xiaowei
-
-For community contributors, please see RELASENOTES.md documentation.
-
-[Beijing FMSoft Technologies Co., Ltd.]: http://www.fmsoft.cn

ChangeLog

@@ -3216,7 +3216,7 @@ alExtra.(xwyan)
 	* src/gui/lf_flat.c
 	* src/gui/lf_skin.c
 
-08/24: ENHANCEMENT #1: Add a new method for FONTOPS: get_char_type to return
+08/24: ENHANCEMENT #1: Add a new method for FONTOPS: get_glyph_type to return
 the glyph type the devfont can give us.
 	* src/include/devfont.h
 	* src/font/*.c
@@ -4761,7 +4761,7 @@ create_skin_main_window_ex:
 	* ext/skin/skin.c
 
 05/16. ENHANCEMENT #8: Support for UTF-16LE and UTF-16BE charsets/encodings.
-	* Change the definition of Uchar32 to 'int'.
+	* Change the definition of UChar32 to 'int'.
 		* include/gdi.h
 
 05/16. ENHANCEMENT #11: Support for FreeType2.
@@ -4984,11 +4984,11 @@ provide the function whether the file exist or not.(xwyan)
 	* src/server/request.c
 
 10/24. MODIFICATION: Use 1980/01/01 00:00:00 to return the default local time 
-for __mg_os_localtime.
+for __mg_localtime.
 	* src/misc/nposix.c
 
 10/24. MODIFICATION: Use HAVE_TIME, HAVE_MKTIME, and HAVE_LOCALTIME to define 
-__mg_os_time, __mg_os_mktime, and __mg_os_localtime functions.
+__mg_time, __mg_mktime, and __mg_localtime functions.
 	* configure.in
 	* src/misc/nposix.c
 

Doxyfile.procs

@@ -38,7 +38,7 @@ PROJECT_NAME           = "MiniGUI API Reference (MiniGUI-Processes)"
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = v5.0.0
+PROJECT_NUMBER         = v3.2.0
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a
@@ -58,7 +58,7 @@ PROJECT_LOGO           =
 # entered, it will be relative to the location where doxygen was started. If
 # left blank the current directory will be used.
 
-OUTPUT_DIRECTORY       = doc-api-ref-minigui-procs-5.0.0
+OUTPUT_DIRECTORY       = doc
 
 # If the CREATE_SUBDIRS tag is set to YES then doxygen will create 4096 sub-
 # directories (in 2 levels) under the output directory of each output format and
@@ -782,7 +782,6 @@ WARN_LOGFILE           =
 # Note: If this tag is empty the current directory is searched.
 
 INPUT                  = ./include
-INPUT                  += README.md
 
 # This tag can be used to specify the character encoding of the source files
 # that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses
@@ -940,7 +939,7 @@ FILTER_SOURCE_PATTERNS =
 # (index.html). This can be useful if you have a project on for instance GitHub
 # and want to reuse the introduction page also for the doxygen output.
 
-USE_MDFILE_AS_MAINPAGE = README.md
+USE_MDFILE_AS_MAINPAGE =
 
 #---------------------------------------------------------------------------
 # Configuration options related to source browsing
@@ -2074,7 +2073,6 @@ PREDEFINED             = _MGRM_PROCESSES \
                          _MGMISC_SAVEBITMAP \
                          _MGHAVE_CURSOR \
                          _MGCHARSET_UNICODE \
-                         _MGCOMPLEX_SCRIPTS \
                          _MGCTRL_STATIC \
                          _MGCTRL_SLEDIT \
                          _MGCTRL_BIDISLEDIT \
@@ -2101,12 +2099,7 @@ PREDEFINED             = _MGRM_PROCESSES \
                          _MGCTRL_ANIMATION \
                          _MGFONT_FT2 \
                          _MGFONT_UPF \
-                         _MGFONT_BMPF \
-                         _MGSCHEMA_COMPOSITING \
-                         _MGHAVE_VIRTUAL_WINDOW \
-                         _MGGAL_DRM \
-                         _MGGAL_COMMLCD \
-                         _MGIAL_COMM
+                         _MGFONT_BMPF
 
 # If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then this
 # tag can be used to specify a list of macro names that should be expanded. The

Doxyfile.sa

@@ -38,7 +38,7 @@ PROJECT_NAME           = "MiniGUI API Reference (MiniGUI-Standalone)"
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = v5.0.0
+PROJECT_NUMBER         = v3.2.0
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a
@@ -58,7 +58,7 @@ PROJECT_LOGO           =
 # entered, it will be relative to the location where doxygen was started. If
 # left blank the current directory will be used.
 
-OUTPUT_DIRECTORY       = doc-api-ref-minigui-sa-5.0.0
+OUTPUT_DIRECTORY       = doc
 
 # If the CREATE_SUBDIRS tag is set to YES then doxygen will create 4096 sub-
 # directories (in 2 levels) under the output directory of each output format and
@@ -782,7 +782,6 @@ WARN_LOGFILE           =
 # Note: If this tag is empty the current directory is searched.
 
 INPUT                  = ./include
-INPUT                  += README.md
 
 # This tag can be used to specify the character encoding of the source files
 # that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses
@@ -940,7 +939,7 @@ FILTER_SOURCE_PATTERNS =
 # (index.html). This can be useful if you have a project on for instance GitHub
 # and want to reuse the introduction page also for the doxygen output.
 
-USE_MDFILE_AS_MAINPAGE = README.md
+USE_MDFILE_AS_MAINPAGE =
 
 #---------------------------------------------------------------------------
 # Configuration options related to source browsing
@@ -2074,7 +2073,6 @@ PREDEFINED             = _MGRM_STANDALONE \
                          _MGMISC_SAVEBITMAP \
                          _MGHAVE_CURSOR \
                          _MGCHARSET_UNICODE \
-                         _MGCOMPLEX_SCRIPTS \
                          _MGCTRL_STATIC \
                          _MGCTRL_SLEDIT \
                          _MGCTRL_BIDISLEDIT \
@@ -2101,11 +2099,7 @@ PREDEFINED             = _MGRM_STANDALONE \
                          _MGCTRL_ANIMATION \
                          _MGFONT_FT2 \
                          _MGFONT_UPF \
-                         _MGFONT_BMPF \
-                         _MGHAVE_VIRTUAL_WINDOW \
-                         _MGGAL_DRM \
-                         _MGGAL_COMMLCD \
-                         _MGIAL_COMM
+                         _MGFONT_BMPF
 
 # If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then this
 # tag can be used to specify a list of macro names that should be expanded. The

Doxyfile.ths

@@ -38,7 +38,7 @@ PROJECT_NAME           = "MiniGUI API Reference (MiniGUI-Threads)"
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = v5.0.0
+PROJECT_NUMBER         = v3.2.0
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a
@@ -58,7 +58,7 @@ PROJECT_LOGO           =
 # entered, it will be relative to the location where doxygen was started. If
 # left blank the current directory will be used.
 
-OUTPUT_DIRECTORY       = doc-api-ref-minigui-ths-5.0.0
+OUTPUT_DIRECTORY       = doc
 
 # If the CREATE_SUBDIRS tag is set to YES then doxygen will create 4096 sub-
 # directories (in 2 levels) under the output directory of each output format and
@@ -782,7 +782,6 @@ WARN_LOGFILE           =
 # Note: If this tag is empty the current directory is searched.
 
 INPUT                  = ./include
-INPUT                  += README.md
 
 # This tag can be used to specify the character encoding of the source files
 # that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses
@@ -940,7 +939,7 @@ FILTER_SOURCE_PATTERNS =
 # (index.html). This can be useful if you have a project on for instance GitHub
 # and want to reuse the introduction page also for the doxygen output.
 
-USE_MDFILE_AS_MAINPAGE = README.md
+USE_MDFILE_AS_MAINPAGE =
 
 #---------------------------------------------------------------------------
 # Configuration options related to source browsing
@@ -2074,7 +2073,6 @@ PREDEFINED             = _MGRM_THREADS \
                          _MGMISC_SAVEBITMAP \
                          _MGHAVE_CURSOR \
                          _MGCHARSET_UNICODE \
-                         _MGCOMPLEX_SCRIPTS \
                          _MGCTRL_STATIC \
                          _MGCTRL_SLEDIT \
                          _MGCTRL_BIDISLEDIT \
@@ -2101,11 +2099,7 @@ PREDEFINED             = _MGRM_THREADS \
                          _MGCTRL_ANIMATION \
                          _MGFONT_FT2 \
                          _MGFONT_UPF \
-                         _MGFONT_BMPF \
-                         _MGHAVE_VIRTUAL_WINDOW \
-                         _MGGAL_DRM \
-                         _MGGAL_COMMLCD \
-                         _MGIAL_COMM
+                         _MGFONT_BMPF
 
 # If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then this
 # tag can be used to specify a list of macro names that should be expanded. The

GNUmakefile

@@ -1,6 +1,6 @@
-MAJOR_VERSION = 4
-MINOR_VERSION = 1
-MICRO_VERSION = 0
+MAJOR_VERSION = 3
+MINOR_VERSION = 0
+MICRO_VERSION = 13
 EXTRAVERSION =
 
 MINIGUI_RELEASE=$(MAJOR_VERSION).$(MINOR_VERSION).$(MICRO_VERSION)$(EXTRAVERSION)

Makefile.am

@@ -1,9 +1,10 @@
 SUBDIRS = src 3rd-party include rtos etc m4 cmake build
 
-EXTRA_DIST = minigui.pc.in \
+EXTRA_DIST = \
+			minigui.pc.in \
             GNUmakefile makefile.ng makefile.msvc rules.make \
-            INSTALL LICENSE \
-            Version.md README.md RELEASE-NOTES.md \
+            Version INSTALL LICENSE \
+            README.md RELEASE-NOTES.md \
             LICENSE-POLICY-en.md LICENSE-POLICY-zh.md 
 
 # The directory where the include files will be installed
@@ -12,17 +13,15 @@ libminiguiincludedir = $(includedir)/minigui
 # Which header files to install
 libminiguiinclude_HEADERS = mgconfig.h
 
+docs:
+	doxygen Doxyfile.procs Doxyfile.ths Doxyfile.sa
+
+dist-nolicense: dist
+	./clean_license.sh $(DIST_ARCHIVES)
+
+dist:
+distcheck-nolicense:dist-nolicense distcheck
+
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = minigui.pc
 
-docs:
-	doxygen Doxyfile.procs
-	doxygen Doxyfile.ths
-	doxygen Doxyfile.sal
-
-#dist-nolicense: dist
-#	./clean_license.sh $(DIST_ARCHIVES)
-#
-#dist:
-#distcheck-nolicense:dist-nolicense distcheck
-

Version

@@ -0,0 +1,9 @@
+Version 3.2.3 (2019/10/31)
+
+This release needs the following resource packages:
+
+    * minigui-res-3.0.13.tar.gz
+
+The latest samples package is:
+
+    * mg-samples-3.2.2.tar.gz

Version.md

@@ -1,16 +0,0 @@
-Version 4.9.1 (2019/03/11)
-
-This is the second preview version of MiniGUI 5.0.0, an unstable version.
-
-Other packages for MiniGUI resource, tools, components, and samples:
-
-- GVFB: `gvfb-1.2.4.tar.gz`
-- The resource package: `minigui-res-4.0.0.tar.gz`
-- mGUtils component: `libmgutils-1.5.0.tar.gz`
-- mGPlus component: `libmgplus-1.5.0.tar.gz`
-- mGEff component: `libmgeff-1.5.0.tar.gz`
-- mGNCS component: `libmgncs-1.5.0.tar.gz`
-- mGNCS4Touch component: `libmgncs4touch-1.5.0.tar.gz`
-- The test cases package: `mg-tests-5.0.0.tar.gz`
-- The sample package: `mg-samples-5.0.0.tar.gz`
-

build/buildlib-min

@@ -1,6 +1,7 @@
 #!/bin/sh
 
 ./configure \
+    --with-runmode=ths \
     --disable-dblclk \
     --disable-cursor \
     --disable-mousecalibrate \

build/buildlib-rtems

@@ -0,0 +1,44 @@
+#!/bin/sh
+
+RTEMS_DIR=/home/projects/movidius/m8_gui/tools/18.11.4/linux64/sparc-myriad-rtems-6.3.0
+
+#RTEMS_GLOBAL_CFLAGS="-ffunction-sections -fdata-sections -fno-rtti -fno-exceptions -finit-priority"
+
+rm -f config.cache config.status
+
+CC=${RTEMS_DIR}/bin/sparc-myriad-rtems-gcc \
+CFLAGS="-I${RTEMS_DIR}/sparc-myriad-rtems/include -I${RTEMS_DIR}/pnglib/include -I${RTEMS_DIR}/zlib/include" \
+LDFLAGS="-L${RTEMS_DIR}/lib/gcc/sparc-myriad-rtems/6.3.0 -L${RTEMS_DIR}/pnglib/lib -L${RTEMS_DIR}/zlib/lib" \
+./configure --prefix=/home/projects/movidius/m8_gui/tools/18.11.4/linux64/sparc-myriad-rtems-6.3.0/minigui \
+    --build=i686-linux \
+    --host=sparc-myriad-rtems \
+    --target=sparc-myriad-rtems \
+    --with-osname=rtems \
+	--with-runmode=ths \
+	--enable-miniguientry \
+    --enable-incoreres \
+    --disable-cursor \
+    --disable-videofbcon \
+    --disable-qvfbial \
+    --disable-vbfsupport \
+    --disable-qpfsupport \
+    --disable-latin9support \
+    --enable-gbksupport \
+    --disable-big5support \
+    --enable-unicodesupport \
+    --disable-savebitmap \
+    --disable-jpgsupport \
+    --disable-pngsupport \
+    --disable-aboutdlg \
+    --enable-adv2dapi \
+	--enable-videodummy \
+	--disable-consoleial \
+	--disable-videopcxvfb \
+	--with-targetname=external \
+	--enable-pngsupport \
+	--disable-develmode \
+	--disable-detaildebug \
+	--disable-tracemsg \
+	--enable-videocommlcd \
+	--enable-commial \
+	--disable-splash

build/config-mgdemo-win.h

@@ -130,9 +130,9 @@
 /* If using the C implementation of alloca, define if you know the
    direction of stack growth for your system; otherwise it will be
    automatically deduced at run-time.
-    STACK_DIRECTION > 0 => grows toward higher addresses
-    STACK_DIRECTION < 0 => grows toward lower addresses
-    STACK_DIRECTION = 0 => direction of growth unknown */
+	STACK_DIRECTION > 0 => grows toward higher addresses
+	STACK_DIRECTION < 0 => grows toward lower addresses
+	STACK_DIRECTION = 0 => direction of growth unknown */
 /* #undef STACK_DIRECTION */
 
 /* Define to 1 if you have the ANSI C header files. */

build/config-nucleus-mnt.h

@@ -130,9 +130,9 @@
 /* If using the C implementation of alloca, define if you know the
    direction of stack growth for your system; otherwise it will be
    automatically deduced at run-time.
-    STACK_DIRECTION > 0 => grows toward higher addresses
-    STACK_DIRECTION < 0 => grows toward lower addresses
-    STACK_DIRECTION = 0 => direction of growth unknown */
+	STACK_DIRECTION > 0 => grows toward higher addresses
+	STACK_DIRECTION < 0 => grows toward lower addresses
+	STACK_DIRECTION = 0 => direction of growth unknown */
 /* #undef STACK_DIRECTION */
 
 /* Define to 1 if you have the ANSI C header files. */

build/config-nucleus-monaco.h

@@ -130,9 +130,9 @@
 /* If using the C implementation of alloca, define if you know the
    direction of stack growth for your system; otherwise it will be
    automatically deduced at run-time.
-    STACK_DIRECTION > 0 => grows toward higher addresses
-    STACK_DIRECTION < 0 => grows toward lower addresses
-    STACK_DIRECTION = 0 => direction of growth unknown */
+	STACK_DIRECTION > 0 => grows toward higher addresses
+	STACK_DIRECTION < 0 => grows toward lower addresses
+	STACK_DIRECTION = 0 => direction of growth unknown */
 /* #undef STACK_DIRECTION */
 
 /* Define to 1 if you have the ANSI C header files. */

build/config-nucleus-null.h

@@ -366,7 +366,7 @@
 /* #undef _MGINCOREFONT_VGAS */
 
 /* Define if include in-core font: 12x12 RBF for GB2312 */
-#define    _MGINCORERBF_GB12 1
+#define	_MGINCORERBF_GB12 1
 /* Define if include in-core font: 16x16 RBF for GB2312 */
 /* #undef _MGINCORERBF_GB16 */
 

build/config-threadx-null.h

@@ -377,7 +377,7 @@
 /* #undef _MGINCOREFONT_VGAS */
 
 /* Define if include in-core font: 12x12 RBF for GB2312 */
-#define    _MGINCORERBF_GB12 1
+#define	_MGINCORERBF_GB12 1
 /* Define if include in-core font: 16x16 RBF for GB2312 */
 #define _MGINCORERBF_GB16 1
 

build/config-threadx-vfanvil.h

@@ -377,7 +377,7 @@
 /* #undef _MGINCOREFONT_VGAS */
 
 /* Define if include in-core font: 12x12 RBF for GB2312 */
-#define    _MGINCORERBF_GB12 1
+#define	_MGINCORERBF_GB12 1
 /* Define if include in-core font: 16x16 RBF for GB2312 */
 #define _MGINCORERBF_GB16 1
 

build/rules-pc.linux

@@ -30,7 +30,7 @@ SOFLAGS=-fPIC -shared -o
 ##################################################
 # set your compile flags and install prefix path # 
 PREFIX=/usr/local
-CFLAGS+=-g -Wall -fPIC `pkg-config --cflags freetype2` -I/usr/local/include/harfbuzz
+CFLAGS+=-g -Wall -fPIC `pkg-config --cflags freetype2`
 LDFLAGS+=
 ##################################################
 

build/win32/config-win32.h

@@ -91,12 +91,12 @@
 /* Define to 1 if you have the `tmpfile' function. */
 #define HAVE_TMPFILE 1
 
-/*#define HAVE_MODE_T    1*/
+/*#define HAVE_MODE_T	1*/
 /* Define to 1 if you have the `mktime' function. */
 #define HAVE_MKTIME 1
 
 /* Define to 1 if you have the `time' function. */
-#define HAVE_TIME        1
+#define HAVE_TIME		1
 
 /* Define to 1 if you have the `localtime' function. */
 #define HAVE_LOCALTIME 1
@@ -140,9 +140,9 @@
 /* If using the C implementation of alloca, define if you know the
    direction of stack growth for your system; otherwise it will be
    automatically deduced at run-time.
-    STACK_DIRECTION > 0 => grows toward higher addresses
-    STACK_DIRECTION < 0 => grows toward lower addresses
-    STACK_DIRECTION = 0 => direction of growth unknown */
+	STACK_DIRECTION > 0 => grows toward higher addresses
+	STACK_DIRECTION < 0 => grows toward lower addresses
+	STACK_DIRECTION = 0 => direction of growth unknown */
 /* #undef STACK_DIRECTION */
 
 /* Define to 1 if you have the ANSI C header files. */

build/win32/msvc_recommended_pragmas.h

@@ -24,5 +24,5 @@
 #pragma warning(disable:4101) /* unreferenced local variable */
 #pragma warning(error:4150)
 
-#pragma warning(disable:4244)    /* No possible loss of data warnings */
+#pragma warning(disable:4244)	/* No possible loss of data warnings */
 #pragma warning(disable:4305)   /* No truncation from int to char warnings */

clean_license.sh

@@ -1,15 +1,15 @@
 #! /bin/bash
 
 keyword_list="
-__mg_license_create
-__mg_license_destroy
-__mg_screensaver_create
-__mg_screensaver_destroy
-__mg_splash_draw_framework
-__mg_splash_progress
-__mg_splash_delay
-__mg_license_on_input
-__mg_license_on_timeout
+license_create
+license_destroy
+screensaver_create
+screensaver_destroy
+splash_draw_framework
+splash_progress
+splash_delay
+license_on_input
+license_on_timeout
 license_get_processor_id
 #\s*include.*license\/c_files.*
 #\s*include.*license\.h

cleanup-code.sh

@@ -1,176 +0,0 @@
-#!/bin/bash
-
-tab2space() {
-    sed -i 's/\t/    /g' `find . -name '*.c'`
-    sed -i 's/\t/    /g' `find . -name '*.h'`
-
-    sed -i 's/\s\+$//g' `find . -name '*.c'`
-    sed -i 's/\s\+$//g' `find . -name '*.h'`
-}
-
-# tab2space
-
-# templates
-# sed -i 's/\<AAA\>/__AAA/g' `grep '\<AAA\>' -rl include/ src/`
-# sed -i 's/\<AAA\>/__mgAAA/g' `grep '\<AAA\>' -rl include/ src/`
-# sed -i 's/\<AAA\>/__gdiAAA/g' `grep '\<AAA\>' -rl include/ src/`
-# sed -i 's/\<AAA\>/__mg_AAA/g' `grep '\<AAA\>' -rl include/ src/`
-# sed -i 's/\<AAA\>/dbg_AAA/g' `grep '\<AAA\>' -rl include/ src/`
-
-# sed -i 's/\<kernel_alloc_z_order_info\>/__kernel_alloc_z_order_info/g' `grep kernel_alloc_z_order_info -rl include/ src/`
-# sed -i 's/\<kernel_free_z_order_info\>/__kernel_free_z_order_info/g' `grep kernel_free_z_order_info -rl include/ src/`
-# sed -i 's/\<kernel_change_z_order_mask_rect\>/__kernel_change_z_order_mask_rect/g' `grep kernel_change_z_order_mask_rect -rl include/ src/`
-# sed -i 's/\<kernel_get_window_region\>/__kernel_get_window_region/g' `grep kernel_get_window_region -rl include/ src/`
-# sed -i 's/\<kernel_get_next_znode\>/__kernel_get_next_znode/g' `grep kernel_get_next_znode -rl include/ src/`
-# sed -i 's/\<kernel_get_prev_znode\>/__kernel_get_prev_znode/g' `grep kernel_get_prev_znode -rl include/ src/`
-
-# sed -i 's/\<gui_open_ime_window\>/__gui_open_ime_window/g' `grep gui_open_ime_window -rl include/ src/`
-
-# sed -i 's/\<_begin_fill_bitmap\>/__mg_begin_fill_bitmap/g' `grep _begin_fill_bitmap -rl include/ src/`
-# sed -i 's/\<_fill_bitmap_scanline\>/__mg_fill_bitmap_scanline/g' `grep _fill_bitmap_scanline -rl include/ src/`
-# sed -i 's/\<_end_fill_bitmap\>/__mg_end_fill_bitmap/g' `grep _end_fill_bitmap -rl include/ src/`
-# sed -i 's/\<DumpCtrlClassInfoTable\>/dbg_DumpCtrlClassInfoTable/g' `grep DumpCtrlClassInfoTable -rl include/ src/`
-# sed -i 's/\<GetPixelUnderCursor\>/kernel_GetPixelUnderCursor/g' `grep GetPixelUnderCursor -rl include/ src/`
-# sed -i 's/\<update_secondary_dc\>/__mg_update_secondary_dc/g' `grep update_secondary_dc -rl include/ src/`
-
-# sed -i 's/\<initialize_scripteasy\>/font_InitializeScripteasy/g' `grep initialize_scripteasy -rl include/ src/`
-# sed -i 's/\<uninitialize_scripteasy\>/font_UninitializeScripteasy/g' `grep uninitialize_scripteasy -rl include/ src/`
-
-# sed -i 's/\<free_window_element_data\>/__mg_free_window_element_data/g' `grep free_window_element_data -rl include/ src/`
-# sed -i 's/\<append_window_element_data\>/__mg_append_window_element_data/g' `grep append_window_element_data -rl include/ src/`
-# sed -i 's/\<set_window_element_data\>/__mg_set_window_element_data/g' `grep set_window_element_data -rl include/ src/`
-# sed -i 's/\<__compsor_check_znodes\>/__mg_composite_dirty_znodes/g' `grep __compsor_check_znodes -rl include/ src/`
-
-# sed -i 's/\<mg_linux_tty_init\>/__mg_linux_tty_init/g' `grep mg_linux_tty_init -rl include/ src/`
-# sed -i 's/\<mg_linux_tty_enable_vt_switch\>/__mg_linux_tty_enable_vt_switch/g' `grep mg_linux_tty_enable_vt_switch -rl include/ src/`
-# sed -i 's/\<mg_linux_tty_disable_vt_switch\>/__mg_linux_tty_disable_vt_switch/g' `grep mg_linux_tty_disable_vt_switch -rl include/ src/`
-# sed -i 's/\<mg_linux_tty_switch_vt\>/__mg_linux_tty_switch_vt/g' `grep mg_linux_tty_switch_vt -rl include/ src/`
-# sed -i 's/\<mg_linux_tty_fini\>/__mg_linux_tty_fini/g' `grep mg_linux_tty_fini -rl include/ src/`
-
-# sed -i 's/\<DumpMenu\>/dbg_DumpMenu/g' `grep DumpMenu -rl include/ src/`
-
-# sed -i 's/\<sysres_init_inner_resource\>/__sysres_init_inner_resource/g' `grep sysres_init_inner_resource -rl include/ src/`
-# sed -i 's/\<sysres_get_system_res_path\>/__sysres_get_system_res_path/g' `grep sysres_get_system_res_path -rl include/ src/`
-
-# sed -i 's/\<_set_pixel_helper\>/_gdi_set_pixel_helper/g' `grep _set_pixel_helper -rl src/`
-
-# sed -i 's/\<err_dump\>/__mg_err_dump/g' `grep err_dump -rl src/`
-# sed -i 's/\<err_msg\>/__mg_err_msg/g' `grep err_msg -rl src/`
-# sed -i 's/\<err_quit\>/__mg_err_quit/g' `grep err_quit -rl src/`
-# sed -i 's/\<err_ret\>/__mg_err_ret/g' `grep err_ret -rl src/`
-# sed -i 's/\<err_sys\>/__mg_err_sys/g' `grep err_sys -rl src/`
-# sed -i 's/\<mg_dispatch_timer_message\>/__mg_dispatch_timer_message/g' `grep mg_dispatch_timer_message -rl src/`
-# sed -i 's/\<mgDeleteObject\>/mg_DeleteObject/g' `grep mgDeleteObject -rl src/`
-
-# sed -i 's/\<init_arabic_kbd_layout\>/__mg_init_arabic_kbd_layout/g' `grep init_arabic_kbd_layout -rl src/`
-# sed -i 's/\<init_default_kbd_layout\>/__mg_init_default_kbd_layout/g' `grep init_default_kbd_layout -rl src/`
-# sed -i 's/\<init_de_kbd_layout\>/__mg_init_de_kbd_layout/g' `grep init_de_kbd_layout -rl src/`
-# sed -i 's/\<init_delatin1_kbd_layout\>/__mg_init_delatin1_kbd_layout/g' `grep init_delatin1_kbd_layout -rl src/`
-# sed -i 's/\<init_escp850_kbd_layout\>/__mg_init_escp850_kbd_layout/g' `grep init_escp850_kbd_layout -rl src/`
-# sed -i 's/\<init_es_kbd_layout\>/__mg_init_es_kbd_layout/g' `grep init_es_kbd_layout -rl src/`
-# sed -i 's/\<init_fr_kbd_layout\>/__mg_init_fr_kbd_layout/g' `grep init_fr_kbd_layout -rl src/`
-# sed -i 's/\<init_frpc_kbd_layout\>/__mg_init_frpc_kbd_layout/g' `grep init_frpc_kbd_layout -rl src/`
-# sed -i 's/\<init_it_kbd_layout\>/__mg_init_it_kbd_layout/g' `grep init_it_kbd_layout -rl src/`
-# sed -i 's/\<init_hebrew_kbd_layout\>/__mg_init_hebrew_kbd_layout/g' `grep init_hebrew_kbd_layout -rl src/`
-
-# sed -i 's/\<InitAutoInput\>/ial_InitAutoInput/g' `grep InitAutoInput -rl src/`
-# sed -i 's/\<InitDummyInput\>/ial_InitDummyInput/g' `grep InitDummyInput -rl src/`
-# sed -i 's/\<InitLibInput\>/ial_InitLibInput/g' `grep InitLibInput -rl src/`
-# sed -i 's/\<InitNetInput\>/ial_InitNetInput/g' `grep InitNetInput -rl src/`
-# sed -i 's/\<InitPCXVFBInput\>/ial_InitPCXVFBInput/g' `grep InitPCXVFBInput -rl src/`
-# sed -i 's/\<InitRandomInput\>/ial_InitRandomInput/g' `grep InitRandomInput -rl src/`
-
-# sed -i 's/\<InitializeResManager\>/mg_InitResManager/g' `grep InitializeResManager -rl src/`
-# sed -i 's/\<InitTextBitmapBuffer\>/gdi_InitTextBitmapBuffer/g' `grep InitTextBitmapBuffer -rl src/`
-
-# sed -i 's/\<clipboard_op\>/__mg_clipboard_op/g' `grep clipboard_op -rl src/`
-
-# sed -i 's/\<mg_miFreeArcCache\>/miFreeArcCache/g' `grep mg_miFreeArcCache -rl src/`
-# sed -i 's/\<mgNewObject\>/mgNewObjectEx/g' `grep mgNewObject -rl src/`
-# sed -i 's/\<mg_newObject\>/mgNewObject/g' `grep mg_newObject -rl src/`
-# sed -i 's/\<mg_remove_timers_by_msg_queue\>/__mg_remove_timers_by_msg_queue/g' `grep mg_remove_timers_by_msg_queue -rl src/`
-
-# sed -i 's/\<mg_DeleteObject\>/mgDeleteObject/g' `grep mg_DeleteObject -rl src/`
-
-# sed -i 's/\<GetMsgQueueThisThread\>/getMsgQueueThisThread/g' `grep GetMsgQueueThisThread -rl src/`
-
-# sed -i 's/\<pMessages\>/pMsgQueue/g' `grep pMessages -rl src/`
-
-# sed -i 's/\<mg_InitMsgQueueThisThread\>/mg_AllocMsgQueueThisThread/g' `grep mg_InitMsgQueueThisThread -rl include/ src/`
-
-# sed -i 's/\<mg_AllocMsgQueueThisThread\>/mg_AllocMsgQueueForThisThread/g' `grep mg_AllocMsgQueueThisThread -rl src/`
-# sed -i 's/\<mg_FreeMsgQueueThisThread\>/mg_FreeMsgQueueForThisThread/g' `grep mg_FreeMsgQueueThisThread -rl src/`
-
-# sed -i 's/\<GetMsgQueueThisThread\>/mg_GetMsgQueueForThisThread/g' `grep GetMsgQueueThisThread -rl src/`
-
-# sed -i 's/\<kernel_GetMsgQueue\>/getMsgQueue/g' `grep kernel_GetMsgQueue -rl src/`
-
-# sed -i 's/\<BE_THIS_THREAD\>/isWindowInThisThread/g' `grep BE_THIS_THREAD -rl src/`
-
-# sed -i 's/\<SetMsgQueueTimerFlag\>/setMsgQueueTimerFlag/g' `grep SetMsgQueueTimerFlag -rl src/`
-# sed -i 's/\<RemoveMsgQueueTimerFlag\>/removeMsgQueueTimerFlag/g' `grep RemoveMsgQueueTimerFlag -rl src/`
-
-# sed -i 's/\<getMsgQueueByWindowInThisThread\>/getMsgQueueIfWindowInThisThread/g' `grep getMsgQueueByWindowInThisThread -rl include/ src/`
-
-# sed -i 's/\<FirstTimerSlot\>/first_time_slot/g' `grep FirstTimerSlot -rl src/`
-# sed -i 's/\<TimerMask\>/expired_timer_mask/g' `grep TimerMask -rl src/`
-
-# sed -i 's/\<first_time_slot\>/first_timer_slot/g' `grep first_time_slot -rl src/`
-# sed -i 's/\<__mg_dispatch_timer_message\>/__mg_check_expired_timers/g' `grep __mg_dispatch_timer_message -rl src/`
-
-# sed -i 's/\<4\.2\.0\>/5.0.0/g' `grep '4\.2\.0' -rl include/ src/`
-
-# sed -i 's/\<__mg_check_hook_func\>/____mg_check_hook_event/g' `grep __mg_check_hook_func -rl src/`
-# sed -i 's/\<____mg_check_hook_event\>/__mg_check_hook_event/g' `grep ____mg_check_hook_event -rl src/`
-
-# sed -i 's/\<__mg_capture_wnd\>/_captured_wnd/g' `grep __mg_capture_wnd -rl include/ src/`
-
-# sed -i 's/\<_captured_wnd\>/__mg_captured_wnd/g' `grep _captured_wnd -rl include/ src/`
-
-# sed -i 's/\<__mg_check_hook_event\>/__mg_check_hook_func/g' `grep __mg_check_hook_event -rl include/ src/`
-
-# sed -i 's/\<DEF_NR_FIXEDZNODES\>/NR_FIXED_ZNODES/g' `grep DEF_NR_FIXEDZNODES -rl src/`
-
-#sed -i 's/\<ZOF_TYPE_TOPMOST\>/__ZOF_TYPE_HIGHER/g' `grep ZOF_TYPE_TOPMOST -rl include/ src/`
-
-# sed -i 's/\<__ZOF_TYPE_HIGHER\>/ZOF_TYPE_HIGHER/g' `grep __ZOF_TYPE_HIGHER -rl include/ src/`
-
-# sed -i 's/\<SetDesktopTimerFlag\>/AlertDesktopTimerEvent/g' `grep SetDesktopTimerFlag -rl include/ src/`
-
-# sed -i 's/\<__mg_update_timer_count\>/__mg_update_tick_count/g' `grep __mg_update_timer_count -rl include/ src/`
-
-# sed -i 's/\<__mg_timer_counter\>/__mg_tick_counter/g' `grep __mg_timer_counter -rl include/ src/`
-
-# sed -i 's/\<pAdd\>/pSyncMsg/g' `grep '\<pAdd\>' -rl include/ src/`
-
-# sed -i 's/\<isWindowInThisThread\>/getMainWinIfWindowInThisThread/g' `grep '\<isWindowInThisThread\>' -rl include/ src/`
-
-# sed -i 's/\<GetMainVirtWindowById\>/GetHostedById/g' `grep '\<GetMainVirtWindowById\>' -rl include/ src/`
-
-# sed -i 's/\<__mg_os_start_time_ms\>/__mg_os_start_time/g' `grep '\<__mg_os_start_time_ms\>' -rl include/ src/`
-
-# sed -i 's/\<Gets\>/Get/g' `grep '\<Gets\>' -rl include/ src/`
-# sed -i 's/\<Sets\>/Set/g' `grep '\<Sets\>' -rl include/ src/`
-# sed -i 's/\<Retrieves\>/Retrieve/g' `grep '\<Retrieves\>' -rl include/ src/`
-
-# sed -i 's/\<Determines\>/Determine/g' `grep '\<Determines\>' -rl include/ src/`
-# sed -i 's/\<Checks\>/Check/g' `grep '\<Checks\>' -rl include/ src/`
-
-#sed -i 's/\<SetWindowExStyle\>/gui_SetWindowExStyle/g' `grep '\<SetWindowExStyle\>' -rl include/ src/`
-#sed -i 's/\<AddNewControlClass\>/gui_AddNewControlClass/g' `grep '\<AddNewControlClass\>' -rl include/ src/`
-#sed -i 's/\<SetCtrlClassAddData\>/gui_SetCtrlClassAddData/g' `grep '\<SetCtrlClassAddData\>' -rl include/ src/`
-#sed -i 's/\<GetCtrlClassAddData\>/gui_GetCtrlClassAddData/g' `grep '\<GetCtrlClassAddData\>' -rl include/ src/`
-
-# sed -i 's/\<get_valid_dc\>/get_effective_dc/g' `grep '\<get_valid_dc\>' -rl include/ src/`
-# sed -i 's/\<release_valid_dc\>/release_effective_dc/g' `grep '\<release_valid_dc\>' -rl include/ src/`
-
-# sed -i 's/\<gui_GetMainWindowPtrOfControl\>/checkAndGetMainWindowPtrOfControl/g' `grep '\<gui_GetMainWindowPtrOfControl\>' -rl include/ src/`
-# sed -i 's/\<gui_CheckAndGetMainWindowPtr\>/checkAndGetMainWindowPtrOfMainWin/g' `grep '\<gui_CheckAndGetMainWindowPtr\>' -rl include/ src/`
-
-# sed -i 's/\<GetSubDCInSecondaryDC\>/GetDCInSecondarySurface/g' `grep '\<GetSubDCInSecondaryDC\>' -rl include/ src/`
-
-# sed -i 's/\<checkAndGetMainWindowPtrOfMainWin\>/checkAndGetMainWinIfMainWin/g' `grep '\<checkAndGetMainWindowPtrOfMainWin\>' -rl include/ src/`
-# sed -i 's/\<checkAndGetMainWindowPtrOfControl\>/checkAndGetMainWinIfWindow/g' `grep '\<checkAndGetMainWindowPtrOfControl\>' -rl include/ src/`
-
-sed -i 's/\<mg_GetMsgQueueForThisThread\>/getMsgQueueForThisThread/g' `grep '\<mg_GetMsgQueueForThisThread\>' -rl include/ src/`
-exit 0

doc/articles/minigui-7/index.html

@@ -239,9 +239,9 @@ int GUIAPI GetFirstWord (PLOGFONT log_font, const char* mstr, int len,
  496 static int euckr_is_this_charset (const unsigned char* charset)
  497 {
  498     int i;
- 499     char name [LEN_LOGFONT_NAME_FIELD + 1];
+ 499     char name [LEN_FONT_NAME + 1];
  500 
- 501     for (i = 0; i < LEN_LOGFONT_NAME_FIELD + 1; i++) {
+ 501     for (i = 0; i < LEN_FONT_NAME + 1; i++) {
  502         if (charset [i] == '\0')
  503             break;
  504         name [i] = toupper (charset [i]);
@@ -388,9 +388,9 @@ int GUIAPI GetFirstWord (PLOGFONT log_font, const char* mstr, int len,
 
 <table border="0" cellpadding="0" class="code-sample" width="100%"><tr><td> <pre>
  228 typedef struct _LOGFONT {
- 229     char type [LEN_LOGFONT_NAME_FIELD + 1];
- 230     char family [LEN_LOGFONT_NAME_FIELD + 1];
- 231     char charset [LEN_LOGFONT_NAME_FIELD + 1];
+ 229     char type [LEN_FONT_NAME + 1];
+ 230     char family [LEN_FONT_NAME + 1];
+ 231     char charset [LEN_FONT_NAME + 1];
  232     DWORD style;
  233     int size;
  234     int rotation;

etc/MiniGUI.cfg

@@ -1,20 +1,16 @@
-# This configuration file is for MiniGUI V4.2.x or later
+# This configuration file is for MiniGUI V3.x.x
 #
-# Copyright (C) 2002~2020 FMSoft
+# Copyright (C) 2002~2018 FMSoft
 # Copyright (C) 1998~2002 Wei Yongming.
 #
 # Web: http://www.minigui.com
 #
 # This configuration file must be installed in /etc,
-# /usr/local/etc, your home directory, or the current working direcotry.
-# When you install it in your home directory, it should be named
-# ".MiniGUI.cfg".
+# /usr/local/etc or your home directory. When you install it in your
+# home directory, it should be named ".MiniGUI.cfg".
 # 
-# The priority of above configruation files is ./MiniGUI.cfg,
-# ~/.MiniGUI.cfg, /usr/local/etc/MiniGUI.cfg, and then /etc/MiniGUI.cfg.
-#
-# NOTE that the one in the current working directory will have
-# always have the highest priority.
+# The priority of above configruation files is ~/.MiniGUI.cfg, 
+# /usr/local/etc/MiniGUI.cfg, and then /etc/MiniGUI.cfg.
 #
 # If you change the install path of MiniGUI resource, you should 
 # modify this file to meet your configuration.
@@ -22,72 +18,21 @@
 
 [system]
 # GAL engine and default options
-# The equivalent environment variable: MG_GAL_ENGINE
 gal_engine=pc_xvfb
-# The equivalent environment variable: MG_DEFAULTMODE
 defaultmode=800x600-16bpp
 
 # IAL engine
-# The equivalent environment variable: MG_IAL_ENGINE
 ial_engine=pc_xvfb
 mdev=/dev/input/mice
 mtype=IMPS2
 
-# Linux IAL engine based on libinput
-# ial_engine=libinut
-
-#{{ifdef _MGSCHEMA_COMPOSITING
-# Options for compositing schema
-[compositing_schema]
-# The size of wallpaper pattern surface (the fake screen for clients).
-# Optional values: <w>x<h>, full, half, quarter, octant, and empty.
-# Default value is empty.
-wallpaper_pattern_size=full
-# wallpaper_pattern_size=half
-# wallpaper_pattern_size=quarter
-# wallpaper_pattern_size=octant
-# wallpaper_pattern_size=empty
-# wallpaper_pattern_size=32x32
-
-# The shared object name of the default compositor. If it is not defined
-# or failed to load, MiniGUI will use the built-in fallback compositor.
-# The equivalent environment variable: MG_DEF_COMPOSITOR_SO
-# def_compositor_so=
-#}}
-
-#{{ifdef _MGGAL_DRM
-[drm]
-defaultmode=1024x768-32bpp
-
-# We use DRM fourcc code to defined the pixel format of the video surface.
-# For more information, please see <drm/drm_fourcc.h> header file.
-# Note that only 8/16/24/32 bpp RGB formats are supported.
-pixelformat=XR24
-
-# The DRI device
-device=/dev/dri/card0
-
+[fbcon]
+defaultmode=1024x768-16bpp
 # The resolution of the display
 # It is defined in dots (physical pixels) per inch
 # The default value is 96.
 dpi=96
 
-# The filename of the shared library for the external driver.
-# The equivalent environment variable: MG_GAL_DRM_DRIVER
-exdriver=libhidrmdrivers.so.0
-#}}
-
-#{{ifdef _MGIAL_LIBINPUT
-[libinput]
-seat=seat0
-#}}
-
-#{{ifdef _MGGAL_FBCON
-[fbcon]
-defaultmode=1024x768-16bpp
-dpi=96
-#}}
-
 #{{ifdef _MGGAL_PCXVFB
 [pc_xvfb]
 defaultmode=800x600-16bpp
@@ -113,19 +58,7 @@ def_bgcolor=0x00FF00
 double_buffer=enable
 #}}
 
-#{{ifdef _MGIAL_RANDOM
-[random]
-logfile=/dev/null
-eventtypes=mouse-keyboard-button-gesture
-minkeycode=1
-maxkeycode=128
-minbtncode=0x100
-maxbtncode=0x1ff
-#}}
-
 # The first system font must be a logical font using RBF device font.
-# NOTE that the maxiaml number of system logfonts is 6. You should not
-# set `font_number` in this section to be a number larger than 6.
 [systemfont]
 font_number=5
 font0=rbf-FixedSys-rrncnn-8-16-ISO8859-1
@@ -155,10 +88,6 @@ font_number=0
 
 [truetypefonts]
 font_number=0
-# The devfont now supports multiple font family names since V4.0.0.
-name0=ttf-Source Sans Pro,SansSerif-rrncnn-0-0-ISO8859-1,UTF-8
-# The path of font file can be relative to the current working directory.
-fontfile0=font/SourceSansPro-Regular.ttf
 
 [mouse]
 dblclicktime=300
@@ -195,12 +124,6 @@ cursor20=h_select.cur
 cursor21=ho_split.cur
 cursor22=ve_split.cur
 
-# Under compositing schema, you can specify a PNG file as the cursor.
-# You should use a 'hotspotN' key to specify the hotspot coordinates
-# of a PNG cursor. For example:
-# cursor23=foo.png
-# hotspot23=32,32
-
 [resinfo]
 respath=/usr/local/share/minigui/res/
  

examples/createlogfont.c

@@ -1,14 +1,14 @@
     static LOGFONT  *logfont, *logfontgb12, *logfontbig24;
 
-    logfont = CreateLogFont (NULL, "SansSerif", "ISO8859-1",
-                FONT_WEIGHT_REGULAR, FONT_SLANT_ITALIC, FONT_FLIP_NONE,
-                FONT_OTHER_NIL, FONT_UNDERLINE_NONE, FONT_STRUCKOUT_LINE,
-                16, 0);
-    logfontgb12 = CreateLogFont (NULL, "song", "GB2312",
-                FONT_WEIGHT_REGULAR, FONT_SLANT_ROMAN, FONT_FLIP_NONE,
-                FONT_OTHER_NIL, FONT_UNDERLINE_LINE, FONT_STRUCKOUT_LINE,
-                12, 0);
-    logfontbig24 = CreateLogFont (NULL, "ming", "BIG5",
-                FONT_WEIGHT_REGULAR, FONT_SLANT_ROMAN, FONT_FLIP_NONE,
-                FONT_OTHER_NIL, FONT_UNDERLINE_LINE, FONT_STRUCKOUT_NONE,
-                24, 0);
+            logfont = CreateLogFont (NULL, "SansSerif", "ISO8859-1", 
+                        FONT_WEIGHT_REGULAR, FONT_SLANT_ITALIC, FONT_SETWIDTH_NORMAL,
+                        FONT_SPACING_CHARCELL, FONT_UNDERLINE_NONE, FONT_STRUCKOUT_LINE, 
+                        16, 0);
+            logfontgb12 = CreateLogFont (NULL, "song", "GB2312", 
+                        FONT_WEIGHT_REGULAR, FONT_SLANT_ROMAN, FONT_SETWIDTH_NORMAL,
+                        FONT_SPACING_CHARCELL, FONT_UNDERLINE_LINE, FONT_STRUCKOUT_LINE, 
+                        12, 0);
+            logfontbig24 = CreateLogFont (NULL, "ming", "BIG5", 
+                        FONT_WEIGHT_REGULAR, FONT_SLANT_ROMAN, FONT_SETWIDTH_NORMAL,
+                        FONT_SPACING_CHARCELL, FONT_UNDERLINE_LINE, FONT_STRUCKOUT_NONE, 
+                        24, 0);

examples/createlogfontex.c

@@ -1,14 +0,0 @@
-    static LOGFONT  *logfont, *logfontgb12, *logfontttf;
-
-    logfont = CreateLogFontEx (NULL, "SansSerif", "ISO8859-1",
-                FONT_WEIGHT_REGULAR, FONT_SLANT_ITALIC, FONT_FLIP_NONE,
-                FONT_OTHER_NIL, FONT_DECORATE_NONE, FONT_RENDER_MONO,
-                16, 0);
-    logfontgb12 = CreateLogFontEx (NULL, "song", "GB2312",
-                FONT_WEIGHT_REGULAR, FONT_SLANT_ROMAN, FONT_FLIP_NONE,
-                FONT_OTHER_NIL, FONT_DECORATE_NONE, FONT_RENDER_MONO,
-                12, 0);
-    logfontttf = CreateLogFontEx ("ttf", "Courier", "UTF-8",
-                FONT_WEIGHT_BLACK, FONT_SLANT_ROMAN, FONT_FLIP_NONE,
-                FS_OTHER_LCDPORTRAIT, FONT_DECORATE_NONE, FONT_RENDER_SUBPIXEL,
-                24, 0);

examples/createvirtualwindow.c

@@ -1,24 +0,0 @@
-/*
- * The following code creates a virtual window.
- */
-static LRESULT
-my_virt_wnd_proc (HWND hwnd, UINT message, WPARAM wparam, LPARAM lparam)
-{
-    switch (message) {
-        ...
-    }
-
-    return DefaultVirtualWinProc (hwnd, message, wparam, lparam);
-}
-
-...
-
-    HWND new_wnd = CreateVirtualWindow (HWND_NULL, my_virt_wnd_proc,
-            "A Virtual Window", 0, 0);
-
-    if (new_wnd != HWND_INVALID) {
-        // failed to create the virtual window.
-    }
-
-    // go on...
-    ...

examples/destroymainwindow.c

@@ -2,19 +2,19 @@
  * The following code destroies all resource used by the main window
  * and then destroies the main window itself.
  */
-        case MSG_CLOSE:
-            /* Destroy the resource used by the main window. */
-            DestroyLogFont (logfont1);
-            DestroyLogFont (logfont2);
-            DestroyLogFont (logfont3);
+		case MSG_CLOSE:
+		    /* Destroy the resource used by the main window. */
+		    DestroyLogFont (logfont1);
+		    DestroyLogFont (logfont2);
+		    DestroyLogFont (logfont3);
 		    
-            /* Destroy the child windows. */
-            DestroyWindow(hWndButton);
-            DestroyWindow(hWndEdit);
+		    /* Destroy the child windows. */
+		    DestroyWindow(hWndButton);
+		    DestroyWindow(hWndEdit);
 
-            /* Destroy the main window. */
-            DestroyMainWindow (hWnd);
+		    /* Destroy the main window. */
+		    DestroyMainWindow (hWnd);
 
-            /* Send a MSG_QUIT message to quit the message loop. */
-            PostQuitMessage(hWnd);
-            return 0;
+		    /* Send a MSG_QUIT message to quit the message loop. */
+		    PostQuitMessage(hWnd);
+		    return 0;

examples/drawtext.c

@@ -18,7 +18,7 @@ void OnModeDrawText (HDC hdc)
     rc3.left = 0; rc3.top  = 361; rc3.right = 401; rc3.bottom = 451;
     rc4.left = 0; rc4.top  = 461; rc4.right = 401; rc4.bottom = 551;
 
-    SetBkColor (hdc, DWORD2Pixel (hdc, RGBA_lightwhite));
+    SetBkColor (hdc, COLOR_lightwhite);
 
     Rectangle (hdc, rc1.left, rc1.top, rc1.right, rc1.bottom);
     Rectangle (hdc, rc2.left, rc2.top, rc2.right, rc2.bottom);

examples/msg_sizechanged.c

@@ -2,10 +2,10 @@
  * The handler makes sure that the client area always
  * is _WIDTH wide and _HEIGHT high.
  */
-        case MSG_SIZECHANGED:
-        {
-            RECT* rcClient = (RECT*)lParam;
-            rcClient->right = rcClient->left + _WIDTH;
-            rcClient->bottom = rcClient->top + _HEIGHT;
-            return 1;
-        }
+		case MSG_SIZECHANGED:
+		{
+			RECT* rcClient = (RECT*)lParam;
+			rcClient->right = rcClient->left + _WIDTH;
+			rcClient->bottom = rcClient->top + _HEIGHT;
+			return 1;
+		}

examples/msg_sizechanging.c

@@ -2,14 +2,14 @@
  * The handler set the actual size of the window always
  * to be _WIDTH wide and _HEIGHT high.
  */
-        case MSG_SIZECHANGING:
-        {
-            const RECT* rcExpect = (const RECT*)wParam;
-            RECT* rcResult = (RECT*)lParam;
+		case MSG_SIZECHANGING:
+		{
+			const RECT* rcExpect = (const RECT*)wParam;
+			RECT* rcResult = (RECT*)lParam;
 
-            rcResult->left = rcExpect->left;
-            rcResult->top = rcExpect->top;
-            rcResult->right = rcExpect->left + _WIDTH;
-            rcResult->bottom = rcExpect->top + _HEIGHT;
-            return 0;
-        }
+			rcResult->left = rcExpect->left;
+			rcResult->top = rcExpect->top;
+			rcResult->right = rcExpect->left + _WIDTH;
+			rcResult->bottom = rcExpect->top + _HEIGHT;
+		    return 0;
+		}

examples/rectvisible.c

@@ -3,14 +3,14 @@
  */
 case MSG_PAINT:
 {
-    HDC hdc = BeginPaint (hWnd);
+	HDC hdc = BeginPaint (hWnd);
 
-    for (j = 0; j < 10; j ++) {
-        if (RectVisible  (hdc, rcs + j)) {
-            FillBox (hdc, rcs[j].left, rcs[j].top, rcs [j].right, rcs [j].bottom);
-        }
-    }
+	for (j = 0; j < 10; j ++) {
+		if (RectVisible  (hdc, rcs + j)) {
+			FillBox (hdc, rcs[j].left, rcs[j].top, rcs [j].right, rcs [j].bottom);
+		}
+	}
 
-    EndPaint (hWnd, hdc);
-    return 0;
+	EndPaint (hWnd, hdc);
+	return 0;
 }

examples/registerwindowclass.c

@@ -17,7 +17,7 @@ static LRESULT StepControlProc (HWND hwnd, UINT message, WPARAM wParam, LPARAM l
         info = (HELPWININFO*)GetWindowAdditionalData (hwnd);
 
         /* Draw the step information. */
-        ...
+        ......
 
         EndPaint (hwnd, hdc);
         break;
@@ -43,7 +43,8 @@ static LRESULT StepControlProc (HWND hwnd, UINT message, WPARAM wParam, LPARAM l
     return DefaultControlProc (hwnd, message, wParam, lParam);
 }
 
-static BOOL RegisterStepControl (void)
+
+static BOOL RegisterStepControl ()
 {
     int result;
     WNDCLASS StepClass;
@@ -51,17 +52,13 @@ static BOOL RegisterStepControl (void)
     StepClass.spClassName = STEP_CTRL_NAME;
     StepClass.dwStyle     = 0;
     StepClass.hCursor     = GetSystemCursor (IDC_ARROW);
-#ifdef _MGSCHEMA_COMPOSITING
-    StepClass.dwBkRGBA    = COLOR_lightwhite;
-#else
-    StepClass.iBkColor    = PIXEL_lightwhite;
-#endif
+    StepClass.iBkColor    = COLOR_lightwhite;
     StepClass.WinProc     = StepControlProc;
 
     return RegisterWindowClass (&StepClass);
 }
 
-static void UnregisterStepControl (void)
+static void UnregisterStepControl ()
 {
     UnregisterWindowClass (STEP_CTRL_NAME);
 }

include/Makefile.am

@@ -10,7 +10,7 @@ libminiguiincludedir = $(includedir)/minigui
 COMM_HDRS =     \
     common.h endianrw.h fixedmath.h \
     minigui.h gdi.h window.h control.h \
-    own_malloc.h own_stdio.h \
+    own_malloc.h  own_stdio.h \
     xvfb.h customial.h exstubs.h \
     dti.c
 
@@ -23,12 +23,12 @@ OSE_HDRS=ose_semaphore.h
 PSOS_HDRS=psos_pthread.h psos_semaphore.h
 
 EXTRA_DIST=$(UCOSII_HDRS) $(THREADX_HDRS) $(NUCLEUS_HDRS) $(VXWORKS_HDRS) \
-            $(OSE_HDRS) $(PSOS_HDRS) $(WIN32_HDRS) makefile.ng makefile.msvc
+           $(OSE_HDRS) $(PSOS_HDRS) $(WIN32_HDRS) makefile.ng makefile.msvc
 
 #CLEANFILES=pthread.h semaphore.h
 
 libminiguiinclude_HEADERS=$(COMM_HDRS) $(UCOSII_HDRS) $(THREADX_HDRS) \
-            $(NUCLEUS_HDRS) $(VXWORKS_HDRS) $(OSE_HDRS) $(PSOS_HDRS) $(WIN32_HDRS)
+				$(NUCLEUS_HDRS) $(VXWORKS_HDRS) $(OSE_HDRS) $(PSOS_HDRS) $(WIN32_HDRS)
 
 if MGUSE_OWN_PTHREAD
 install-data-local:

include/control.h

@@ -1,15 +1,3 @@
-///////////////////////////////////////////////////////////////////////////////
-//
-//                          IMPORTANT NOTICE
-//
-// The following open source license statement does not apply to any
-// entity in the Exception List published by FMSoft.
-//
-// For more information, please visit:
-//
-// https://www.fmsoft.cn/exception-list
-//
-//////////////////////////////////////////////////////////////////////////////
 /**
  * \file control.h
  * \author Wei Yongming <vincent@minigui.org>
@@ -23,7 +11,7 @@
     and Graphics User Interface (GUI) support system for embedded systems
     and smart IoT devices.
 
-    Copyright (C) 2002~2020, Beijing FMSoft Technologies Co., Ltd.
+    Copyright (C) 2002~2018, Beijing FMSoft Technologies Co., Ltd.
     Copyright (C) 1998~2002, WEI Yongming
 
     This program is free software: you can redistribute it and/or modify
@@ -65,6 +53,10 @@
 #ifndef _MGUI_CONTROL_H
 #define _MGUI_CONTROL_H
 
+#ifdef __cplusplus
+extern "C" {
+#endif  /* __cplusplus */
+
 #include "ctrl/ctrlhelper.h"
 
     /**
@@ -162,10 +154,6 @@
 #include "ctrl/animation.h"
 #endif  /* _MGCTRL_ANIMATION */
 
-#ifdef __cplusplus
-extern "C" {
-#endif  /* __cplusplus */
-
 #ifdef __cplusplus
 }
 #endif  /* __cplusplus */

include/ctrl/animation.h

@@ -1,15 +1,3 @@
-///////////////////////////////////////////////////////////////////////////////
-//
-//                          IMPORTANT NOTICE
-//
-// The following open source license statement does not apply to any
-// entity in the Exception List published by FMSoft.
-//
-// For more information, please visit:
-//
-// https://www.fmsoft.cn/exception-list
-//
-//////////////////////////////////////////////////////////////////////////////
 /**
  * \file animation.h
  * \author Wei Yongming <vincent@minigui.org>
@@ -62,6 +50,7 @@
 #ifndef EXT_ANIMATION_H
 #define EXT_ANIMATION_H
 
+
 #ifdef  __cplusplus
 extern "C" {
 #endif
@@ -264,7 +253,7 @@ MG_EXPORT void DestroyAnimation (ANIMATION* anim, BOOL free_it);
 
 /**
  * \def ANM_SETANIMATION
- * \brief Set the animation object for the control.
+ * \brief Sets the animation object for the control.
  *
  * An application can send ANM_SETANIMATION to set the animation object of a control.
  *
@@ -282,7 +271,7 @@ MG_EXPORT void DestroyAnimation (ANIMATION* anim, BOOL free_it);
 
 /**
  * \def ANM_GETANIMATION
- * \brief Get the animation object of the control.
+ * \brief Gets the animation object of the control.
  *
  * An application can send ANM_GETANIMATION to retrive the animation object of a control.
  *

include/ctrl/button.h

@@ -1,15 +1,3 @@
-///////////////////////////////////////////////////////////////////////////////
-//
-//                          IMPORTANT NOTICE
-//
-// The following open source license statement does not apply to any
-// entity in the Exception List published by FMSoft.
-//
-// For more information, please visit:
-//
-// https://www.fmsoft.cn/exception-list
-//
-//////////////////////////////////////////////////////////////////////////////
 /**
  * \file button.h
  * \author Wei Yongming <vincent@minigui.org>
@@ -420,7 +408,7 @@ extern "C" {
 
 /**
  * \def BM_GETCHECK
- * \brief Retrieve the check state of a radio button or check box.
+ * \brief Retrieves the check state of a radio button or check box.
  *
  * An application sends a BM_GETCHECK message to retrieve 
  * the check state of a radio button or check box.
@@ -443,7 +431,7 @@ extern "C" {
 
 /**
  * \def BM_SETCHECK
- * \brief Set the check state of a radio button or check box.
+ * \brief Sets the check state of a radio button or check box.
  *
  * An application sends a BM_SETCHECK message to set 
  * the check state of a radio button or check box.
@@ -469,7 +457,7 @@ extern "C" {
 
 /**
  * \def BM_GETSTATE
- * \brief Get the state of a button or check box.
+ * \brief Gets the state of a button or check box.
  *
  * An application sends a BM_GETSTATE message to 
  * determine the state of a button or check box.
@@ -488,7 +476,7 @@ extern "C" {
 
 /**
  * \def BM_SETSTATE
- * \brief Set the state of a button.
+ * \brief Sets the state of a button.
  *
  * An application sends a BM_SETSTATE message to set the state of a 
  * button.
@@ -569,7 +557,7 @@ extern "C" {
 
 /**
  * \def BM_GETIMAGE
- * \brief Retrieve the handle to the image.
+ * \brief Retrieves the handle to the image.
  *
  * An application sends a BM_GETIMAGE message to 
  * retrieve a handle to the image (icon or bitmap) associated with the button.

include/ctrl/combobox.h

@@ -1,15 +1,3 @@
-///////////////////////////////////////////////////////////////////////////////
-//
-//                          IMPORTANT NOTICE
-//
-// The following open source license statement does not apply to any
-// entity in the Exception List published by FMSoft.
-//
-// For more information, please visit:
-//
-// https://www.fmsoft.cn/exception-list
-//
-//////////////////////////////////////////////////////////////////////////////
 /**
  * \file combobox.h
  * \author Wei Yongming <vincent@minigui.org>
@@ -238,7 +226,7 @@ extern "C" {
 
 /**
  * \def CB_GETEDITSEL
- * \brief Get the starting and ending character positions of the current
+ * \brief Gets the starting and ending character positions of the current 
  *        selection.
  *
  * An application sends a CB_GETEDITSEL message to get the starting and ending 
@@ -285,7 +273,7 @@ extern "C" {
 
 /**
  * \def CB_SETEDITSEL
- * \brief Set the starting and ending character positions of the current
+ * \brief Sets the starting and ending character positions of the current 
  *        selection.
  *
  * An application sends a CB_SETEDITSEL message to set the starting and ending 
@@ -419,7 +407,7 @@ extern "C" {
 
 /**
  * \def CB_GETLBTEXTLEN
- * \brief Get the string length of an item in the list box.
+ * \brief Gets the string length of an item in the list box.
  *
  * An application sends a CB_GETLBTEXTLEN message to get the string length
  * of a specified item in the list box of a combo box. 
@@ -556,7 +544,7 @@ extern "C" {
 
 /**
  * \def CB_SETITEMADDDATA
- * \brief Set a 32-bit data value with the specified item.
+ * \brief Sets a 32-bit data value with the specified item.
  * 
  * An application sends an CB_SETITEMADDDATA message to associate a 32-bit data 
  * value specified in the lParam parameter with an item in the list box that 
@@ -598,7 +586,7 @@ extern "C" {
 
 /**
  * \def CB_SETITEMHEIGHT
- * \brief Set the height of all items of the list box in a combo box.
+ * \brief Sets the height of all items of the list box in a combo box.
  * 
  * An application sends an CB_SETITEMHEIGHT message to set the height of 
  * all items of the list box in a combo box.
@@ -619,7 +607,7 @@ extern "C" {
 
 /**
  * \def CB_GETITEMHEIGHT
- * \brief Get the height of items of the list box in a combo box.
+ * \brief Gets the height of items of the list box in a combo box.
  *
  * \code
  * CB_GETITEMHEIGHT
@@ -637,7 +625,7 @@ extern "C" {
 
 /**
  * \def CB_GETDROPPEDSTATE
- * \brief Determine whether the list box of a combo box is dropped down.
+ * \brief Determines whether the list box of a combo box is dropped down.
  *
  * \code
  * CB_GETIDROPSTATE
@@ -686,7 +674,7 @@ extern "C" {
 
 /**
  * \def CB_SETSPINFORMAT
- * \brief Set the format string of value for CBS_AUTOSPIN type.
+ * \brief Sets the format string of value for CBS_AUTOSPIN type.
  *
  * \code
  * CB_SETSPINFORMAT
@@ -705,7 +693,7 @@ extern "C" {
 
 /**
  * \def CB_SETSPINRANGE
- * \brief Determine the range of the spin box in a combo box.
+ * \brief Determines the range of the spin box in a combo box.
  *
  * \code
  * CB_SETSPINRANGE
@@ -725,7 +713,7 @@ extern "C" {
 
 /**
  * \def CB_GETSPINRANGE
- * \brief Get the range of the spin box in a combo box.
+ * \brief Gets the range of the spin box in a combo box.
  *
  * \code
  * CB_GETSPINRANGE
@@ -745,7 +733,7 @@ extern "C" {
 
 /**
  * \def CB_SETSPINVALUE
- * \brief Determine the value of the spin box in a combo box.
+ * \brief Determines the value of the spin box in a combo box.
  *
  * \code
  * CB_SETSPINVALUE
@@ -763,7 +751,7 @@ extern "C" {
 
 /**
  * \def CB_GETSPINVALUE
- * \brief Get the current value of the spin box in a combo box.
+ * \brief Gets the current value of the spin box in a combo box.
  *
  * \code
  * CB_GETSPINVALUE
@@ -778,7 +766,7 @@ extern "C" {
 
 /**
  * \def CB_SETSPINPACE
- * \brief Determine the pace and the fast pace of the spin box in a combo box.
+ * \brief Determines the pace and the fast pace of the spin box in a combo box.
  *
  * \code
  * CB_SETSPINPACE
@@ -798,7 +786,7 @@ extern "C" {
 
 /**
  * \def CB_GETSPINPACE
- * \brief Get the pace and the fast pace of the spin box in a combo box.
+ * \brief Gets the pace and the fast pace of the spin box in a combo box.
  *
  * \code
  * CB_GETSPINPACE
@@ -856,7 +844,7 @@ extern "C" {
 
 /**
  * \def CB_SETSTRCMPFUNC
- * \brief Set the STRCMP function used to sort items.
+ * \brief Sets the STRCMP function used to sort items.
  *
  * An application sends a CB_SETSTRCMPFUNC message to set a 
  * new STRCMP function to sort items in the combo-box.
@@ -889,7 +877,7 @@ extern "C" {
 
 /**
  * \def CB_GETCHILDREN
- * \brief Get the handles to the children of a ComboBox control.
+ * \brief Gets the handles to the children of a ComboBox control.
  *
  * An application sends a CB_GETCHILDREN message to get the handles 
  * to the children of a ComboBox control.

include/ctrl/coolbar.h

@@ -1,15 +1,3 @@
-///////////////////////////////////////////////////////////////////////////////
-//
-//                          IMPORTANT NOTICE
-//
-// The following open source license statement does not apply to any
-// entity in the Exception List published by FMSoft.
-//
-// For more information, please visit:
-//
-// https://www.fmsoft.cn/exception-list
-//
-//////////////////////////////////////////////////////////////////////////////
 /**
  * \file coolbar.h
  * \author Wei Yongming <vincent@minigui.org>
@@ -213,7 +201,7 @@ typedef COOLBARITEMINFO *PCOOLBARITEMINFO;
 
 /**
  * \def CBM_ENABLE
- * \brief Set an item to be enabled or disabled.
+ * \brief Sets an item to be enabled or disabled.
  *
  * \code
  * CBM_ENABLE

include/ctrl/ctrlhelper.h

@@ -1,15 +1,3 @@
-///////////////////////////////////////////////////////////////////////////////
-//
-//                          IMPORTANT NOTICE
-//
-// The following open source license statement does not apply to any
-// entity in the Exception List published by FMSoft.
-//
-// For more information, please visit:
-//
-// https://www.fmsoft.cn/exception-list
-//
-//////////////////////////////////////////////////////////////////////////////
 /**
  * \file ctrlhelper.h
  * \author Wei Yongming <vincent@minigui.org>
@@ -114,7 +102,7 @@ typedef enum
  * This function outputs a grayed text at the specified position.
  *
  * \param hdc The device context.
- * \param hwnd Tell the function to draw with the color definitions of the window.
+ * \param hwnd Tell the function to draw with the color definitions of this window.
  * \param x The x-coordinate of start point.
  * \param y The y-coordinate of start point.
  * \param szText The null-terminated text to be output.
@@ -172,9 +160,9 @@ MG_EXPORT void ResetToolTipWin (HWND hwnd, int x, int y,
 
 /**
  * \fn void DestroyToolTipWin (HWND hwnd)
- * \brief Destroy a tool tip window.
+ * \brief Destroies a tool tip window.
  *
- * This function destroys the specified tool tip window \a hwnd, which
+ * This function destroies the specified tool tip window \a hwnd, which 
  * is returned by \a CreateToolTipWin.
  *
  * \param hwnd The handle to the tool tip window.
@@ -184,29 +172,24 @@ MG_EXPORT void ResetToolTipWin (HWND hwnd, int x, int y,
 MG_EXPORT void DestroyToolTipWin (HWND hwnd);
 
 /**
- * \fn void GUIAPI NotifyParentEx (HWND hwnd, LINT id, int code,
- *      DWORD add_data)
- * \brief Send a notification message to the parent.
+ * \fn void GUIAPI NotifyParentEx (HWND hwnd, LINT id, int code, DWORD add_data)
+ * \brief Sends a notification message to the parent.
  *
- * This function send a notification message to the parent.
+ * By default, the notification from a control will be sent to its parent
+ * window within a MSG_COMMAND messsage.
  *
- * In the early version, the notification from a control will be sent to
- * its parent window within a MSG_COMMAND message.
- *
- * Since version 1.2.6, MiniGUI defines the Notification Callback Procedure
- * for a window. You can specify a callback function to a window by calling
+ * Since version 1.2.6, MiniGUI defines the Nofication Callback Procedure 
+ * for control. You can specify a callback function for a control by calling
  * \a SetNotificationCallback to receive and handle the notification from 
- * its children in the procedure.
+ * the control.
  *
- * Note that if the control has \a WS_EX_NOPARENTNOTIFY style, this function
+ * If you have defined the Notificaton Callback Procedure for the control,
+ * calling NotifyParentEx will call the notification callback procedure,
+ * not send the notification message to the parent.
+ *
+ * Note that if the control has WS_EX_NOPARENTNOTIFY style, this function
  * will not notify the parent.
  *
- * Note taht there was a mistake in the implementation. This function will
- * check and call the notification callback procedure of the control itself
- * instead of its parent.
- *
- * Since 5.0.0, you can call NotifyWindow to notify any kind of window.
- *
  * \param hwnd The handle to current control window.
  * \param id The identifier of current control.
  * \param code The notification code.
@@ -214,10 +197,9 @@ MG_EXPORT void DestroyToolTipWin (HWND hwnd);
  *
  * \note The type of \a id change from int to LINT since v3.2.
  *
- * \sa NotifyWindow, SetNotificationCallback
+ * \sa SetNotificationCallback
  */
-MG_EXPORT void GUIAPI NotifyParentEx (HWND hwnd, LINT id, int code,
-        DWORD add_data);
+MG_EXPORT void GUIAPI NotifyParentEx (HWND hwnd, LINT id, int code, DWORD add_data);
 
 /**
  * \def NotifyParent(hwnd, id, code)
@@ -228,7 +210,7 @@ MG_EXPORT void GUIAPI NotifyParentEx (HWND hwnd, LINT id, int code,
  * \param id The identifier of current control.
  * \param code The notification code.
  *
- * \note This function is actually a macro of \a NotifyParentEx with
+ * \note This function is actually a macro of NotifyParentEx with 
  *       \a dwAddData being zero.
  *
  * \sa NotifiyParentEx

include/ctrl/edit.h

@@ -1,15 +1,3 @@
-///////////////////////////////////////////////////////////////////////////////
-//
-//                          IMPORTANT NOTICE
-//
-// The following open source license statement does not apply to any
-// entity in the Exception List published by FMSoft.
-//
-// For more information, please visit:
-//
-// https://www.fmsoft.cn/exception-list
-//
-//////////////////////////////////////////////////////////////////////////////
 /**
  * \file edit.h
  * \author Wei Yongming <vincent@minigui.org>
@@ -233,7 +221,7 @@ extern "C" {
 
 /**
  * \def EM_GETSEL
- * \brief Get the selected string in the edit control.
+ * \brief Gets the selected string in the edit control.
  *
  * \code
  * EM_GETSEL
@@ -254,7 +242,7 @@ extern "C" {
 
 /**
  * \def EM_SETSEL
- * \brief Set the selected point in the edit control and makes
+ * \brief Sets the selected point in the edit control and makes
  *        the text between insertion point and selection point selected.
  *
  *        Generally, you should send EM_SETCARETPOS first to set insertion
@@ -308,7 +296,7 @@ extern "C" {
 
 /**
  * \def EM_GETSELPOS
- * \brief Get the position of the selection point.
+ * \brief Gets the position of the selection point.
  *
  * \code
  * EM_GETSELPOS
@@ -380,7 +368,7 @@ extern "C" {
 
 /**
  * \def EM_SETLFDISPCHAR
- * \brief Set the char used to represent the line seperator.
+ * \brief Sets the char used to represent the line seperator.
  *        
  * In default case, the line sperator will not be shown.
  * If the char used to represent the line seperator is not zero,
@@ -400,7 +388,7 @@ extern "C" {
 
 /**
  * \def EM_SETLINESEP
- * \brief Set the line seperator.
+ * \brief Sets the line seperator.
  *        
  * In default case, the line sperator is Line Feed
  * characters(LF , ASCII 10, '\n').
@@ -424,7 +412,7 @@ extern "C" {
 
 /**
  * \def EM_GETCARETPOS
- * \brief Get the position of the caret.
+ * \brief Gets the position of the caret.
  *
  * \code
  * EM_GETCARETPOS
@@ -448,7 +436,7 @@ extern "C" {
 
 /**
  * \def EM_SETCARETPOS
- * \brief Set the position of the caret.
+ * \brief Sets the position of the caret.
  *
  * \code
  * EM_SETCARETPOS
@@ -482,7 +470,7 @@ extern "C" {
 
 /**
  * \def EM_GETLINECOUNT
- * \brief Get the line number.
+ * \brief Gets the line number.
  *
  * \code
  * EM_GETLINECOUNT
@@ -498,7 +486,7 @@ extern "C" {
 
 /**
  * \def EM_GETLINEHEIGHT
- * \brief Get the height of a line.
+ * \brief Gets the height of a line.
  *
  * \code
  * EM_GETLINEHEIGHT
@@ -514,7 +502,7 @@ extern "C" {
 
 /**
  * \def EM_SETLINEHEIGHT
- * \brief Set the height of a line.
+ * \brief Sets the height of a line.
  *
  * \code
  * EM_SETLINEHEIGHT
@@ -679,7 +667,7 @@ extern "C" {
 
 /**
  * \def EM_SETREADONLY
- * \brief Set or removes the read-only style (ES_READONLY) in an edit control.
+ * \brief Sets or removes the read-only style (ES_READONLY) in an edit control.
  *
  * \code
  * EM_SETREADONLY
@@ -715,7 +703,7 @@ typedef int (*ED_DRAWSEL_FUNC) (HWND, HDC, int, int, const char*, int, int);
 
 /**
  * \def EM_SETDRAWSELECTFUNC
- * \brief Set the callback function on drawing selected chars
+ * \brief Sets the callback function on drawing selected chars
  *
  * \code
  * EM_SETDRAWSELECTFUNC
@@ -731,7 +719,7 @@ typedef int (*ED_DRAWSEL_FUNC) (HWND, HDC, int, int, const char*, int, int);
 
 /**
  * \def EM_SETGETCARETWIDTHFUNC
- * \brief Set the callback function on getting caret width
+ * \brief Sets the callback function on getting caret width
  *
  * \code
  * EM_SETGETCARETWIDTHFUNC
@@ -907,7 +895,7 @@ typedef int (*ED_DRAWSEL_FUNC) (HWND, HDC, int, int, const char*, int, int);
 
 /**
  * \def EM_SETTITLETEXT
- * \brief Set the title text displayed before content text.
+ * \brief Sets the title text displayed before content text. 
  *
  * \code
  * EM_SETTITLETEXT
@@ -924,7 +912,7 @@ typedef int (*ED_DRAWSEL_FUNC) (HWND, HDC, int, int, const char*, int, int);
 
 /**
  * \def EM_GETTITLETEXT
- * \brief Get the title text displayed before content text.
+ * \brief Gets the title text displayed before content text. 
  *
  * \code
  * EM_GETTITLETEXT
@@ -946,7 +934,7 @@ typedef int (*ED_DRAWSEL_FUNC) (HWND, HDC, int, int, const char*, int, int);
 
 /**
  * \def EM_SETTIPTEXT
- * \brief Set the tip text displayed when content is empty.
+ * \brief Sets the tip text displayed when content is empty. 
  *
  * \code
  * EM_SETTIPTEXT
@@ -962,7 +950,7 @@ typedef int (*ED_DRAWSEL_FUNC) (HWND, HDC, int, int, const char*, int, int);
 
 /**
  * \def EM_GETTIPTEXT
- * \brief Get the tip text displayed when content is empty.
+ * \brief Gets the tip text displayed when content is empty. 
  *
  * \code
  * EM_GETTIPTEXT
@@ -1002,14 +990,14 @@ typedef struct _TEXTPOSINFO {
 
 /**
  * \def EM_GETNUMOFPARAGRAPHS
- * \brief Get the number of paragraphs in textedit control.
+ * \brief Gets the number of paragraphs in textedit control. 
  *
  * \return The number of paragraphs.
  */
 #define EM_GETNUMOFPARAGRAPHS   0xF0E0
 /**
  * \def EM_GETPARAGRAPHLENGTH
- * \brief Get the specified paragraph length in textedit control.
+ * \brief Gets the specified paragraph length in textedit control. 
  *
  * \code
  * EM_GETPARAGRAPHLENGTH
@@ -1021,7 +1009,7 @@ typedef struct _TEXTPOSINFO {
 #define EM_GETPARAGRAPHLENGTH  0xF0E1
 /**
  * \def EM_GETPARAGRAPHTEXT
- * \brief Get the specified paragraph text from textedit control.
+ * \brief Gets the specified paragraph text from textedit control. 
  *
  * \code
  * EM_GETPARAGRAPHTEXT
@@ -1055,7 +1043,7 @@ typedef struct _TEXTPOSINFO {
 
 /**
  * \def EM_SETCARETPOSBYLINE
- * \brief Set the selected point in the edit control and makes
+ * \brief Sets the selected point in the edit control and makes
  *        the text between insertion point and selection point selected.
  *        This is set by really line. That means if you set the TES_AUTOWRAP,
  *        the line number you set, the caret pos line number you see. This is
@@ -1085,7 +1073,7 @@ typedef struct _TEXTPOSINFO {
 
 /**
  * \def EM_GETCARETPOSBYLINE
- * \brief Get the position of the caret.
+ * \brief Gets the position of the caret.
  *
  * \code
  * EM_GETCARETPOSBYLINE
@@ -1113,7 +1101,7 @@ typedef struct _TEXTPOSINFO {
 
 /**
  * \def EM_GETSELPOSBYLINE
- * \brief Get the position of the selection point.
+ * \brief Gets the position of the selection point.
  *
  * \code
  * EM_GETSELPOSBYLINE
@@ -1134,7 +1122,7 @@ typedef struct _TEXTPOSINFO {
 
 /**
  * \def EM_GETPARAGRAPHLENGTHINMCHAR
- * \brief Get the specified paragraph length in textedit control.
+ * \brief Gets the specified paragraph length in textedit control.
  * in text not charactors. 
  *
  * \code
@@ -1148,7 +1136,7 @@ typedef struct _TEXTPOSINFO {
 
 /**
  * \def EM_GETLINELENGTHINMCHAR
- * \brief Get the specified line length in textedit control.
+ * \brief Gets the specified line length in textedit control.
  * in charactors not byte. 
  *
  * \code
@@ -1162,7 +1150,7 @@ typedef struct _TEXTPOSINFO {
 
 /**
  * \def EM_GETLINELENGTH
- * \brief Get the specified line length in textedit control.
+ * \brief Gets the specified line length in textedit control.
  *
  * \code
  * EM_GETLINELENGTH
@@ -1175,7 +1163,7 @@ typedef struct _TEXTPOSINFO {
 
 /**
  * \def EM_GETLINETEXT
- * \brief Get the specified line text from textedit control.
+ * \brief Gets the specified line text from textedit control. 
  *
  * \code
  * EM_GETLINETEXT

include/ctrl/gridview.h

@@ -1,15 +1,3 @@
-///////////////////////////////////////////////////////////////////////////////
-//
-//                          IMPORTANT NOTICE
-//
-// The following open source license statement does not apply to any
-// entity in the Exception List published by FMSoft.
-//
-// For more information, please visit:
-//
-// https://www.fmsoft.cn/exception-list
-//
-//////////////////////////////////////////////////////////////////////////////
 /**
  * \file gridview.h
  * \author Wei Yongming <vincent@minigui.org>
@@ -503,7 +491,7 @@ typedef struct _GRIDCELLDATA
 #define  GRIDM_DELCOLUMN      0xF219
 /**
  * \def GRIDM_GETROWCOUNT
- * \brief Get the number of all rows in the grid control.
+ * \brief Gets the number of all rows in the grid control.
  *
  * An application sends an GRIDM_GETROWCOUNT message to get the number of all rows in the grid control.
  *
@@ -519,7 +507,7 @@ typedef struct _GRIDCELLDATA
 #define  GRIDM_GETROWCOUNT    0xF21A
 /**
  * \def GRIDM_GETCOLCOUNT
- * \brief Get the number of all columns in the grid control.
+ * \brief Gets the number of all columns in the grid control.
  *
  * An application sends an GRIDM_GETCOLCOUNT message to get the number of all columns in the grid control.
  *
@@ -535,7 +523,7 @@ typedef struct _GRIDCELLDATA
 #define  GRIDM_GETCOLCOUNT    0xF21B
 /**
  * \def GRIDM_SETNUMFORMAT
- * \brief Set the number format of a cell in the grid control. the format is
+ * \brief Sets the number format of a cell in the grid control. the format is
  * just same as format in c printf.
  *
  * An application sends an GRIDM_SETNUMFORMAT message to
@@ -557,7 +545,7 @@ typedef struct _GRIDCELLDATA
 
 /**
  * \def GRIDM_SETSELECTED
- * \brief Set the selected cell(s) in the grid control.
+ * \brief Sets the selected cell(s) in the grid control.
  *
  * An application sends an GRIDM_SETSELECTED message to
  * set the selected cell(s) in the grid control.
@@ -577,7 +565,7 @@ typedef struct _GRIDCELLDATA
 
 /**
  * \def GRIDM_GETSELECTED
- * \brief Get the selected cell(s) in the grid control.
+ * \brief Gets the selected cell(s) in the grid control.
  *
  * An application sends an GRIDM_GETSELECTED message to
  * get the selected cell(s) in the grid control.

include/ctrl/iconview.h

@@ -1,15 +1,3 @@
-///////////////////////////////////////////////////////////////////////////////
-//
-//                          IMPORTANT NOTICE
-//
-// The following open source license statement does not apply to any
-// entity in the Exception List published by FMSoft.
-//
-// For more information, please visit:
-//
-// https://www.fmsoft.cn/exception-list
-//
-//////////////////////////////////////////////////////////////////////////////
 /**
  * \file iconview.h
  * \author Wei Yongming <vincent@minigui.org>
@@ -128,9 +116,9 @@ typedef struct _IVITEMINFO
 typedef IVITEMINFO* PIVITEMINFO;
 
 /** Iconview bitmap flags, reserved */
-#define IVFLAG_BITMAP    0x0001
+#define IVFLAG_BITMAP	0x0001
 /** Iconview icon flags, reserved */
-#define IVFLAG_ICON    0x0002
+#define IVFLAG_ICON	0x0002
 
 
 /**
@@ -235,7 +223,7 @@ MG_EXPORT PBITMAP iconview_set_item_bitmap(GHANDLE hivi, PBITMAP pbmp);
 
 /**
  * \def IVM_SETITEMSIZE
- * \brief Set the item width and height of an iconview control
+ * \brief Sets the item width and height of an iconview control
  *
  * All the items have the same item size. This message should be sent
  * before you add items to iconview control.