From e3491fc5370fbad53fce3d8092a21ab12dd068e2 Mon Sep 17 00:00:00 2001
From: Maarten Bent <MaartenBent@users.noreply.github.com>
Date: Sat, 13 Feb 2021 21:11:18 +0100
Subject: [PATCH] Create a wxDisplay directly from wxWindow

---
 src/common/combocmn.cpp   | 4 +---
 src/propgrid/propgrid.cpp | 3 +--
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/common/combocmn.cpp b/src/common/combocmn.cpp
index 57e1c2b861..b61aac35bf 100644
--- a/src/common/combocmn.cpp
+++ b/src/common/combocmn.cpp
@@ -2285,9 +2285,6 @@ void wxComboCtrlBase::ShowPopup()
 
     SetFocus();
 
-    int displayIdx = wxDisplay::GetFromWindow(this);
-    wxRect displayRect = wxDisplay(displayIdx != wxNOT_FOUND ? displayIdx : 0u).GetGeometry();
-
     // Space above and below
     int screenHeight;
     wxPoint scrPos;
@@ -2296,6 +2293,7 @@ void wxComboCtrlBase::ShowPopup()
     int maxHeightPopup;
     wxSize ctrlSz = GetSize();
 
+    wxRect displayRect = wxDisplay(this).GetGeometry();
     screenHeight = displayRect.GetHeight();
     scrPos = GetScreenPosition();
 
diff --git a/src/propgrid/propgrid.cpp b/src/propgrid/propgrid.cpp
index ae6a7f69a1..61be08bb01 100644
--- a/src/propgrid/propgrid.cpp
+++ b/src/propgrid/propgrid.cpp
@@ -1716,8 +1716,7 @@ wxPoint wxPropertyGrid::GetGoodEditorDialogPosition( wxPGProperty* p,
 
     ImprovedClientToScreen( &x, &y );
 
-    int displayIdx = wxDisplay::GetFromWindow(this);
-    wxRect displayRect = wxDisplay(displayIdx != wxNOT_FOUND ? displayIdx : 0u).GetGeometry();
+    wxRect displayRect = wxDisplay(this).GetGeometry();
 
     x -= displayRect.GetX();
     y -= displayRect.GetY();