diff options
| author | Yuqian Yang <crupest@outlook.com> | 2018-09-25 10:13:48 +0000 |
|---|---|---|
| committer | Yuqian Yang <crupest@outlook.com> | 2018-09-25 10:13:48 +0000 |
| commit | c8ddc4bc7d96b67aac9526089ade64b31007fa3e (patch) | |
| tree | 27317ae0d9ac5b1409408ef165595f9c127aa027 /CruUI.vcxproj | |
| parent | ea4b0966d8eb5a8e76dfbe4d833a07a4797a3284 (diff) | |
| parent | da768af31952a28aa7aca8f60acd85bf2832465c (diff) | |
| download | cru-c8ddc4bc7d96b67aac9526089ade64b31007fa3e.tar.gz cru-c8ddc4bc7d96b67aac9526089ade64b31007fa3e.tar.bz2 cru-c8ddc4bc7d96b67aac9526089ade64b31007fa3e.zip | |
Merge branch 'issue4-dev' into 'master'
Resolve "Abstract out the common part of TextBlock and TextBox."
Closes #4
See merge request crupest/CruUI!3
Diffstat (limited to 'CruUI.vcxproj')
| -rw-r--r-- | CruUI.vcxproj | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/CruUI.vcxproj b/CruUI.vcxproj index bb1e1f63..4c10ad6a 100644 --- a/CruUI.vcxproj +++ b/CruUI.vcxproj @@ -126,6 +126,7 @@ <ClCompile Include="src\ui\controls\margin_container.cpp" /> <ClCompile Include="src\ui\controls\text_block.cpp" /> <ClCompile Include="src\ui\controls\text_box.cpp" /> + <ClInclude Include="src\ui\controls\text_control.h" /> <ClCompile Include="src\ui\controls\toggle_button.cpp" /> <ClCompile Include="src\ui\events\ui_event.cpp" /> <ClCompile Include="src\ui\layout_base.cpp" /> @@ -149,6 +150,7 @@ <ClInclude Include="src\ui\controls\margin_container.h" /> <ClInclude Include="src\ui\controls\text_block.h" /> <ClInclude Include="src\ui\controls\text_box.h" /> + <ClCompile Include="src\ui\controls\text_control.cpp" /> <ClInclude Include="src\ui\controls\toggle_button.h" /> <ClInclude Include="src\ui\events\ui_event.h" /> <ClInclude Include="src\ui\layout_base.h" /> |