diff --git a/src/slic3r/GUI/BBLTopbar.cpp b/src/slic3r/GUI/BBLTopbar.cpp
index defc6d51ec..801a5a6862 100644
--- a/src/slic3r/GUI/BBLTopbar.cpp
+++ b/src/slic3r/GUI/BBLTopbar.cpp
@@ -493,7 +493,7 @@ void BBLTopbar::OnFullScreen(wxAuiToolBarEvent& event)
         m_frame->Restore();
     }
     else {
-        wxDisplay display(wxDisplay::GetFromWindow(this));
+        wxDisplay display(this);
         auto      size = display.GetClientArea().GetSize();
         m_frame->SetMaxSize(size + wxSize{16, 16});
         m_normalRect = m_frame->GetRect();
@@ -524,7 +524,7 @@ void BBLTopbar::OnMouseLeftDClock(wxMouseEvent& mouse)
         m_frame->Restore();
     }
     else {
-        wxDisplay display(wxDisplay::GetFromWindow(this));
+        wxDisplay display(this);
         auto      size = display.GetClientArea().GetSize();
         m_frame->SetMaxSize(size + wxSize{16, 16});
         m_normalRect = m_frame->GetRect();
diff --git a/src/slic3r/GUI/GUI_ObjectTable.cpp b/src/slic3r/GUI/GUI_ObjectTable.cpp
index b92a346c5c..0f07a6d576 100644
--- a/src/slic3r/GUI/GUI_ObjectTable.cpp
+++ b/src/slic3r/GUI/GUI_ObjectTable.cpp
@@ -2911,7 +2911,7 @@ ObjectTableDialog::ObjectTableDialog(wxWindow* parent, Plater* platerObj, Model
     wxSize panel_size = m_obj_panel->get_init_size();
     g_max_size_from_parent = maxSize;
     if ((maxSize.GetWidth() == -1) || (maxSize.GetHeight() == -1)) {
-        wxDisplay display(wxDisplay::GetFromWindow(this));
+        wxDisplay display(this);
         //auto drect = display.GetGeometry();
         wxRect 	client_area = display.GetClientArea ();
         g_max_size_from_parent.SetWidth(client_area.GetWidth());
diff --git a/src/slic3r/GUI/MainFrame.cpp b/src/slic3r/GUI/MainFrame.cpp
index 9b72c288b7..4e3fd2f45b 100644
--- a/src/slic3r/GUI/MainFrame.cpp
+++ b/src/slic3r/GUI/MainFrame.cpp
@@ -342,7 +342,7 @@ DPIFrame(NULL, wxID_ANY, "", wxDefaultPosition, wxDefaultSize, BORDERLESS_FRAME_
     // BBS: fix taskbar overlay on windows
 #ifdef WIN32
     auto setMaxSize = [this]() {
-        wxDisplay display(wxDisplay::GetFromWindow(this));
+        wxDisplay display(this);
         auto size = display.GetClientArea().GetSize();
         // 8 pixels shadow
         SetMaxSize(size + wxSize{16, 16});
@@ -353,7 +353,7 @@ DPIFrame(NULL, wxID_ANY, "", wxDefaultPosition, wxDefaultSize, BORDERLESS_FRAME_
         });
     setMaxSize();
     this->Bind(wxEVT_MAXIMIZE, [this](auto &e) {
-        wxDisplay display(wxDisplay::GetFromWindow(this));
+        wxDisplay display(this);
         auto pos = display.GetClientArea().GetPosition();
         Move(pos - wxPoint{8, 8});
         e.Skip();
diff --git a/src/slic3r/GUI/MarkdownTip.cpp b/src/slic3r/GUI/MarkdownTip.cpp
index 72504b5ce4..cb62678d23 100644
--- a/src/slic3r/GUI/MarkdownTip.cpp
+++ b/src/slic3r/GUI/MarkdownTip.cpp
@@ -141,7 +141,7 @@ bool MarkdownTip::ShowTip(wxPoint pos, std::string const &tip, std::string const
             this->Hide();
     }
     if (_tipView->GetParent() == this) {
-        wxSize size = wxDisplay(wxDisplay::GetFromWindow(this)).GetClientArea().GetSize();
+        wxSize size = wxDisplay(this).GetClientArea().GetSize();
         _requestPos = pos;
         if (pos.y + this->GetSize().y > size.y)
             pos.y = size.y - this->GetSize().y;
@@ -254,7 +254,7 @@ void MarkdownTip::OnTitleChanged(wxWebViewEvent& event)
             return;
         _lastHeight = height;
         height *= 1.25; height += 50;
-        wxSize size = wxDisplay(wxDisplay::GetFromWindow(this)).GetClientArea().GetSize();
+        wxSize size = wxDisplay(this).GetClientArea().GetSize();
         if (height > size.y)
             height = size.y;
         wxPoint pos = _requestPos;
diff --git a/src/slic3r/GUI/Widgets/DropDown.cpp b/src/slic3r/GUI/Widgets/DropDown.cpp
index f588864c18..8095969edb 100644
--- a/src/slic3r/GUI/Widgets/DropDown.cpp
+++ b/src/slic3r/GUI/Widgets/DropDown.cpp
@@ -354,7 +354,7 @@ void DropDown::autoPosition()
     }
     if (GetPosition().y > pos.y) {
         // may exceed
-        auto drect = wxDisplay(wxDisplay::GetFromWindow(GetParent())).GetGeometry();
+        auto drect = wxDisplay(GetParent()).GetGeometry();
         if (GetPosition().y + size.y + 10 > drect.GetBottom()) {
             if (use_content_width && texts.size() <= 15) size.x += 6;
             size.y = drect.GetBottom() - GetPosition().y - 10;