diff --git a/Updater b/Updater index 6255498..6d54c40 160000 --- a/Updater +++ b/Updater @@ -1 +1 @@ -Subproject commit 625549838e089c888e2ae60fc83086736f0c715e +Subproject commit 6d54c4075b042c3b366949dd0c4e5cf89a77ee53 diff --git a/ZRCola/zrcolachrslct.cpp b/ZRCola/zrcolachrslct.cpp index 4205642..ddfb5e3 100644 --- a/ZRCola/zrcolachrslct.cpp +++ b/ZRCola/zrcolachrslct.cpp @@ -237,8 +237,10 @@ wxZRColaCharSelect::wxZRColaCharSelect(wxWindow* parent) : wxZRColaCharSelect::~wxZRColaCharSelect() { - if (m_searchThread) + if (m_searchThread) { + #pragma warning(suppress: 26812) // wxThreadError is unscoped. m_searchThread->Delete(); + } Disconnect(wxID_ANY, wxEVT_SEARCH_COMPLETE, wxThreadEventHandler(wxZRColaCharSelect::OnSearchComplete), NULL, this); } diff --git a/ZRCola/zrcolaupdater.cpp b/ZRCola/zrcolaupdater.cpp index ea40b17..b0204d0 100644 --- a/ZRCola/zrcolaupdater.cpp +++ b/ZRCola/zrcolaupdater.cpp @@ -41,6 +41,7 @@ wxZRColaUpdater::wxZRColaUpdater(wxWindow* parent) : // Prepare Updater. auto app = dynamic_cast(wxTheApp); + #pragma warning(suppress: 26812) // wxLanguage is unscoped. m_updater = new wxUpdCheckThread(app->m_lang_ui == wxLANGUAGE_DEFAULT ? wxT("en_US") : wxLocale::GetLanguageCanonicalName(app->m_lang_ui), this); //if (m_updater->Run() != wxTHREAD_NO_ERROR) { // wxFAIL_MSG(wxT("Can't create the thread!")); diff --git a/lib/wxExtend b/lib/wxExtend index fcfe641..d9af15c 160000 --- a/lib/wxExtend +++ b/lib/wxExtend @@ -1 +1 @@ -Subproject commit fcfe641d5c52bd6541c4c7e1927db48750910c35 +Subproject commit d9af15c0e6354b0a20fea901bdd9c7d9d359d1e5