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

Add support for "forceupper" attribute to wxTextCtrl in XRC

Browse Source 
Call ForceUpper() if this attribute is specified.

Currently this is done only for wxTextCtrl but could be extended to wxComboBox
later too if necessary.
This commit is contained in:
Vadim Zeitlin
2015-11-25 17:12:35 +01:00
parent 69b66e9e2e
commit 60c2b96aef
3 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1900,6 +1900,9 @@ 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{forceupper, @ref overview_xrcformat_type_bool,
If true, use wxTextEntry::ForceUpper() to force the control contents to be
upper case.}
@row3col{hint, @ref overview_xrcformat_type_text, @row3col{hint, @ref overview_xrcformat_type_text,
Hint shown in empty control (new since wxWidgets 3.0.1).} Hint shown in empty control (new since wxWidgets 3.0.1).}
@endTable @endTable

1
misc/schema/xrc_schema.rnc
View File

@@ -1432,6 +1432,7 @@ wxTextCtrl =
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 forceupper{_, t_bool }* &
[xrc:p="o"] element hint {_, t_text }* [xrc:p="o"] element hint {_, t_text }*
} }

2
src/xrc/xh_text.cpp
View File

@@ -68,6 +68,8 @@ wxObject *wxTextCtrlXmlHandler::DoCreateResource()
if (HasParam(wxT("maxlength"))) if (HasParam(wxT("maxlength")))
text->SetMaxLength(GetLong(wxT("maxlength"))); text->SetMaxLength(GetLong(wxT("maxlength")));
if (GetBool(wxS("forceupper")))
text->ForceUpper();
const wxString hint = GetText(wxS("hint")); const wxString hint = GetText(wxS("hint"));
if (!hint.empty()) if (!hint.empty())