From c4c885f043983662023cfe28fed9598f6b1e567d Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1clav=20Slav=C3=ADk?= Date: Thu, 26 Sep 2013 12:55:20 +0000 Subject: [PATCH] XRC: make wxStaticText's wrap property a dimension. 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 --- docs/doxygen/overviews/xrc_format.h | 2 +- src/xrc/xh_sttxt.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/doxygen/overviews/xrc_format.h b/docs/doxygen/overviews/xrc_format.h index 9ad73560f1..4b4dc7f29f 100644 --- a/docs/doxygen/overviews/xrc_format.h +++ b/docs/doxygen/overviews/xrc_format.h @@ -1731,7 +1731,7 @@ No additional properties. @hdr3col{property, type, description} @row3col{label, @ref overview_xrcformat_type_text, 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 wxStaticText::Wrap() (default: no wrap).} @endTable diff --git a/src/xrc/xh_sttxt.cpp b/src/xrc/xh_sttxt.cpp index 3b4c9b91e1..da93c2a44c 100644 --- a/src/xrc/xh_sttxt.cpp +++ b/src/xrc/xh_sttxt.cpp @@ -47,7 +47,7 @@ wxObject *wxStaticTextXmlHandler::DoCreateResource() SetupWindow(text); - long wrap = GetLong(wxT("wrap"), -1); + long wrap = GetDimension(wxT("wrap"), -1); if (wrap != -1) text->Wrap(wrap); -- 2.45.2