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

diff --git a/docs/doxygen/overviews/xrc_format.h b/docs/doxygen/overviews/xrc_format.h
index 9ad73560f1e88088056cedd6f635dc503870546f..4b4dc7f29f42938faddcae1ffa9669352899254d 100644 (file)
--- 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 3b4c9b91e1976276d61ef3eabe383a3894395776..da93c2a44cd6dcffcb6041647144cf2b4ba39475 100644 (file)
--- 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);