Unicode code in Character Selector is four hexadecimal digits long now

This commit is contained in:
Simon Rozman 2016-05-23 15:02:08 +02:00
parent 72ba4377c8
commit ff6a551c50

View File

@ -36,7 +36,7 @@ wxZRColaCharSelect::wxZRColaCharSelect(wxWindow* parent) :
{ {
Connect(wxID_ANY, wxEVT_SEARCH_COMPLETE, wxThreadEventHandler(wxZRColaCharSelect::OnSearchComplete), NULL, this); Connect(wxID_ANY, wxEVT_SEARCH_COMPLETE, wxThreadEventHandler(wxZRColaCharSelect::OnSearchComplete), NULL, this);
m_unicode->SetValidator(wxHexValidator<wchar_t>(&m_char)); m_unicode->SetValidator(wxHexValidator<wchar_t>(&m_char, wxNUM_VAL_DEFAULT, 4));
// Fill categories. // Fill categories.
ZRColaApp *app = (ZRColaApp*)wxTheApp; ZRColaApp *app = (ZRColaApp*)wxTheApp;
@ -169,8 +169,11 @@ void wxZRColaCharSelect::OnSearchComplete(wxThreadEvent& event)
void wxZRColaCharSelect::OnResultSelectCell(wxGridEvent& event) void wxZRColaCharSelect::OnResultSelectCell(wxGridEvent& event)
{ {
wxString val(m_gridResults->GetCellValue(event.GetRow(), event.GetCol())); wxString val(m_gridResults->GetCellValue(event.GetRow(), event.GetCol()));
m_char = val.IsEmpty() ? 0 : val[0]; wchar_t c = val.IsEmpty() ? 0 : val[0];
m_unicode->GetValidator()->TransferToWindow(); if (m_char != c) {
m_char = c;
m_unicode->GetValidator()->TransferToWindow();
}
} }