diff --git a/core/core.vcxproj b/core/core.vcxproj index 20976cb..2996153 100644 --- a/core/core.vcxproj +++ b/core/core.vcxproj @@ -22,7 +22,7 @@ {8C80C76D-F437-4C69-BC94-252AC44171C2} Win32Proj core - 10.0.14393.0 + 10.0.16299.0 diff --git a/core/src/wnd.cpp b/core/src/wnd.cpp index 04045de..2deb55d 100644 --- a/core/src/wnd.cpp +++ b/core/src/wnd.cpp @@ -166,16 +166,8 @@ int c_wnd::load_clone_child_wnd(WND_TREE *p_child_tree) WND_TREE* p_cur = p_child_tree; while(p_cur->p_wnd) { - if (0 != p_cur->p_wnd->m_resource_id) - {//This wnd has been used! Do not share! - ASSERT(FALSE); - return -1; - } - else - { - p_cur->p_wnd->connect_clone(this, p_cur->resource_id, p_cur->caption_id, - p_cur->x, p_cur->y, p_cur->width, p_cur->height,p_cur->p_child_tree); - } + p_cur->p_wnd->connect_clone(this, p_cur->resource_id, p_cur->caption_id, + p_cur->x, p_cur->y, p_cur->width, p_cur->height,p_cur->p_child_tree); p_cur++; sum++; } diff --git a/doc/HowToBuild.md b/doc/HowToBuild.md index dd4fbab..0fd396c 100644 --- a/doc/HowToBuild.md +++ b/doc/HowToBuild.md @@ -22,8 +22,10 @@ For example: arm-linux-gnueabi-gcc - Output here: /GuiLite/libcore.a libgui.a ## How to build core&gui libary for Android? +### Install cross compiler: +`sudo apt-get install gcc-arm-linux-androideabi` + - `cd GuiLite` -- `sudo apt-get install gcc-arm-linux-androideabi` skip this if you have got the tool - `cmake -D CMAKE_C_COMPILER="/usr/bin/arm-linux-androideabi-gcc" -D CMAKE_CXX_COMPILER="/usr/bin/arm-linux-androideabi-g++" .` - `make` - Output here: /GuiLite/libcore.a libgui.a diff --git a/doc/qq.group.jpg b/doc/qq.group.jpg index 95d2bf7..31f0e23 100644 Binary files a/doc/qq.group.jpg and b/doc/qq.group.jpg differ diff --git a/gui/gui.vcxproj b/gui/gui.vcxproj index a1218fd..2c10453 100644 --- a/gui/gui.vcxproj +++ b/gui/gui.vcxproj @@ -22,7 +22,7 @@ {89DB54E6-EFE1-4722-BD31-27FEBE39DFC6} Win32Proj gui - 10.0.14393.0 + 10.0.16299.0