Add support for "hint" property in wxTextCtrl XRC handler.

It is convenient to allow specifying the hints directly in the resources. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76629 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
wxWidgets · May 30, 2014 · 21fd108 · 21fd108
1 parent 60972cc
commit 21fd108
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 1 deletion.
diff --git a/docs/doxygen/overviews/xrc_format.h b/docs/doxygen/overviews/xrc_format.h
@@ -1864,6 +1864,8 @@ No additional properties.
     Initial value of the control (default: empty).}
 @row3col{maxlength, integer,
     Maximum length of the text which can be entered by user (default: unlimited).}
+@row3col{hint, @ref overview_xrcformat_type_text,
+    Hint shown in empty control (new since wxWidgets 3.0.1).}
 @endTable
 
 

diff --git a/misc/schema/xrc_schema.rnc b/misc/schema/xrc_schema.rnc
@@ -1234,7 +1234,8 @@ wxRichTextCtrl =
         stdObjectNodeAttributes &
         stdWindowProperties &
         [xrc:p="o"] element value     {_, t_text }* &
-        [xrc:p="o"] element maxlength {_, t_integer }*
+        [xrc:p="o"] element maxlength {_, t_integer }* &
+        [xrc:p="o"] element hint      {_, t_text }*
     }
 
 

diff --git a/src/xrc/xh_text.cpp b/src/xrc/xh_text.cpp
@@ -69,6 +69,8 @@ wxObject *wxTextCtrlXmlHandler::DoCreateResource()
     if (HasParam(wxT("maxlength")))
         text->SetMaxLength(GetLong(wxT("maxlength")));
 
+    text->SetHint(GetText(wxS("hint")));
+
     return text;
 }