Fixed ordering bug that caused an assertion because symbol list control wasn't set to unicode yet
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63746 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -505,12 +505,6 @@ bool wxSymbolPickerDialog::TransferDataToWindow()
|
|||||||
m_fontCtrl->SetSelection(0);
|
m_fontCtrl->SetSelection(0);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!m_symbol.empty())
|
|
||||||
{
|
|
||||||
int sel = (int) m_symbol[0];
|
|
||||||
m_symbolsCtrl->SetSelection(sel);
|
|
||||||
}
|
|
||||||
|
|
||||||
#if defined(__UNICODE__)
|
#if defined(__UNICODE__)
|
||||||
if (m_subsetCtrl->GetCount() == 0)
|
if (m_subsetCtrl->GetCount() == 0)
|
||||||
{
|
{
|
||||||
@@ -528,6 +522,12 @@ bool wxSymbolPickerDialog::TransferDataToWindow()
|
|||||||
m_symbolsCtrl->SetUnicodeMode(m_fromUnicode);
|
m_symbolsCtrl->SetUnicodeMode(m_fromUnicode);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
if (!m_symbol.empty())
|
||||||
|
{
|
||||||
|
int sel = (int) m_symbol[0];
|
||||||
|
m_symbolsCtrl->SetSelection(sel);
|
||||||
|
}
|
||||||
|
|
||||||
UpdateSymbolDisplay();
|
UpdateSymbolDisplay();
|
||||||
|
|
||||||
m_dontUpdate = false;
|
m_dontUpdate = false;
|
||||||
|
Reference in New Issue
Block a user