Merge pull request #991 from vktr/fix/wxwidgets-update

Update wxWidgets, fix splitter flickering
picotorrent · Oct 20, 2020 · 1a11ee9 · 1a11ee9
2 parents b9816e4 + ddb2d0d
commit 1a11ee9
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -234,7 +234,7 @@ target_link_libraries(
     ${Boost_LIBRARIES}
 
     # wxWidgets
-    core base propgrid
+    wxcore wxbase wxpropgrid
 
     # Windows
     Comctl32

diff --git a/src/picotorrent/ui/mainframe.cpp b/src/picotorrent/ui/mainframe.cpp
@@ -61,6 +61,8 @@ MainFrame::MainFrame(std::shared_ptr<Core::Environment> env, std::shared_ptr<Cor
     m_menuItemFilters(nullptr),
     m_ipc(std::make_unique<IPC::Server>(this))
 {
+    m_splitter->SetWindowStyleFlag(
+        m_splitter->GetWindowStyleFlag() | wxSP_LIVE_UPDATE);
     m_splitter->SetMinimumPaneSize(10);
     m_splitter->SetSashGravity(0.5);
     m_splitter->SplitHorizontally(

diff --git a/vendor/wx b/vendor/wx