forgetest5
/
uiLitejhksdhkfj
mirror of https://gitee.com/idea4good/GuiLite.git
1
0
Fork 0
Code Issues Releases Wiki Activity

refactor connect_clone

This commit is contained in:
idea4good 2018-01-29 18:49:29 +08:00
parent be277b51a2
commit 049d465343
5 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/core.vcxproj
View File

@ -22,7 +22,7 @@
<ProjectGuid>{8C80C76D-F437-4C69-BC94-252AC44171C2}</ProjectGuid> <ProjectGuid>{8C80C76D-F437-4C69-BC94-252AC44171C2}</ProjectGuid>
<Keyword>Win32Proj</Keyword> <Keyword>Win32Proj</Keyword>
<RootNamespace>core</RootNamespace> <RootNamespace>core</RootNamespace>
<WindowsTargetPlatformVersion>10.0.14393.0</WindowsTargetPlatformVersion> <WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
</PropertyGroup> </PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

12
core/src/wnd.cpp
View File

@ -166,16 +166,8 @@ int c_wnd::load_clone_child_wnd(WND_TREE *p_child_tree)
WND_TREE* p_cur = p_child_tree; WND_TREE* p_cur = p_child_tree;
while(p_cur->p_wnd) while(p_cur->p_wnd)
{ {
if (0 != p_cur->p_wnd->m_resource_id) p_cur->p_wnd->connect_clone(this, p_cur->resource_id, p_cur->caption_id,
{//This wnd has been used! Do not share! p_cur->x, p_cur->y, p_cur->width, p_cur->height,p_cur->p_child_tree);
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_cur++;
sum++; sum++;
} }

4
doc/HowToBuild.md
View File

@ -22,8 +22,10 @@ For example: arm-linux-gnueabi-gcc
- Output here: /GuiLite/libcore.a libgui.a - Output here: /GuiLite/libcore.a libgui.a
## How to build core&gui libary for Android? ## How to build core&gui libary for Android?
### Install cross compiler:
`sudo apt-get install gcc-arm-linux-androideabi`
- `cd GuiLite` - `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++" .` - `cmake -D CMAKE_C_COMPILER="/usr/bin/arm-linux-androideabi-gcc" -D CMAKE_CXX_COMPILER="/usr/bin/arm-linux-androideabi-g++" .`
- `make` - `make`
- Output here: /GuiLite/libcore.a libgui.a - Output here: /GuiLite/libcore.a libgui.a

BIN
doc/qq.group.jpg
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 60 KiB

After

Width:  |  Height:  |  Size: 43 KiB

2
gui/gui.vcxproj
View File

@ -22,7 +22,7 @@
<ProjectGuid>{89DB54E6-EFE1-4722-BD31-27FEBE39DFC6}</ProjectGuid> <ProjectGuid>{89DB54E6-EFE1-4722-BD31-27FEBE39DFC6}</ProjectGuid>
<Keyword>Win32Proj</Keyword> <Keyword>Win32Proj</Keyword>
<RootNamespace>gui</RootNamespace> <RootNamespace>gui</RootNamespace>
<WindowsTargetPlatformVersion>10.0.14393.0</WindowsTargetPlatformVersion> <WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
</PropertyGroup> </PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">