cheng/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

XRC: make wxStaticText's wrap property a dimension.

Browse Source 
Parse it as dimension type (including dlg units) and not just integer.
This is backward compatible.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74864 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík 2013-09-26 12:55:20 +00:00
parent 85d64f6aa1
commit c4c885f043
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/doxygen/overviews/xrc_format.h
View File

@ -1731,7 +1731,7 @@ No additional properties.
@hdr3col{property, type, description} @hdr3col{property, type, description}
@row3col{label, @ref overview_xrcformat_type_text, @row3col{label, @ref overview_xrcformat_type_text,
Label to display (required).} Label to display (required).}
@row3col{wrap, integer, @row3col{wrap, @ref overview_xrcformat_type_dimension,
Wrap the text so that each line is at most the given number of pixels, see Wrap the text so that each line is at most the given number of pixels, see
wxStaticText::Wrap() (default: no wrap).} wxStaticText::Wrap() (default: no wrap).}
@endTable @endTable

2
src/xrc/xh_sttxt.cpp
View File

@ -47,7 +47,7 @@ wxObject *wxStaticTextXmlHandler::DoCreateResource()
SetupWindow(text); SetupWindow(text);
long wrap = GetLong(wxT("wrap"), -1); long wrap = GetDimension(wxT("wrap"), -1);
if (wrap != -1) if (wrap != -1)
text->Wrap(wrap); text->Wrap(wrap);