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

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

Browse Source 
It is convenient to allow specifying the hints directly in the resources.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_3_0_BRANCH@76628 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2014-05-30 16:34:37 +00:00
parent e18d66b9b5
commit 8f04c24d81
4 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
docs/changes.txt
View File

@@ -606,6 +606,7 @@ All (GUI):
- Fix selecting elements from wxPropertyGrid enum properties (Artur Wieczorek). - Fix selecting elements from wxPropertyGrid enum properties (Artur Wieczorek).
- Don't show the dialog twice for colours in wxPropertyGrid (Artur Wieczorek). - Don't show the dialog twice for colours in wxPropertyGrid (Artur Wieczorek).
- Fix handling of custom colours in wxPropertyGrid choices (Artur Wieczorek). - Fix handling of custom colours in wxPropertyGrid choices (Artur Wieczorek).
- Add "hint" property to wxTextCtrl XRC handler.
wxGTK: wxGTK:

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

@@ -1840,6 +1840,8 @@ No additional properties.
Initial value of the control (default: empty).} Initial value of the control (default: empty).}
@row3col{maxlength, integer, @row3col{maxlength, integer,
Maximum length of the text which can be entered by user (default: unlimited).} 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 @endTable

3
misc/schema/xrc_schema.rnc
View File

@@ -1199,7 +1199,8 @@ wxRichTextCtrl =
stdObjectNodeAttributes & stdObjectNodeAttributes &
stdWindowProperties & stdWindowProperties &
[xrc:p="o"] element value {_, t_text }* & [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 }*
} }

2
src/xrc/xh_text.cpp
View File

@@ -72,6 +72,8 @@ wxObject *wxTextCtrlXmlHandler::DoCreateResource()
if (HasParam(wxT("maxlength"))) if (HasParam(wxT("maxlength")))
text->SetMaxLength(GetLong(wxT("maxlength"))); text->SetMaxLength(GetLong(wxT("maxlength")));
text->SetHint(GetText(wxS("hint")));
return text; return text;
} }