Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Create a wxDisplay directly from wxWindow

Browse Source
This commit is contained in:
Maarten Bent
2021-02-13 21:11:18 +01:00
parent dbcfe56ae5
commit e3491fc537
2 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/common/combocmn.cpp
View File

@@ -2285,9 +2285,6 @@ void wxComboCtrlBase::ShowPopup()
SetFocus(); SetFocus();
int displayIdx = wxDisplay::GetFromWindow(this);
wxRect displayRect = wxDisplay(displayIdx != wxNOT_FOUND ? displayIdx : 0u).GetGeometry();
// Space above and below // Space above and below
int screenHeight; int screenHeight;
wxPoint scrPos; wxPoint scrPos;
@@ -2296,6 +2293,7 @@ void wxComboCtrlBase::ShowPopup()
int maxHeightPopup; int maxHeightPopup;
wxSize ctrlSz = GetSize(); wxSize ctrlSz = GetSize();
wxRect displayRect = wxDisplay(this).GetGeometry();
screenHeight = displayRect.GetHeight(); screenHeight = displayRect.GetHeight();
scrPos = GetScreenPosition(); scrPos = GetScreenPosition();

3
src/propgrid/propgrid.cpp
View File

@@ -1716,8 +1716,7 @@ wxPoint wxPropertyGrid::GetGoodEditorDialogPosition( wxPGProperty* p,
ImprovedClientToScreen( &x, &y ); ImprovedClientToScreen( &x, &y );
int displayIdx = wxDisplay::GetFromWindow(this); wxRect displayRect = wxDisplay(this).GetGeometry();
wxRect displayRect = wxDisplay(displayIdx != wxNOT_FOUND ? displayIdx : 0u).GetGeometry();
x -= displayRect.GetX(); x -= displayRect.GetX();
y -= displayRect.GetY(); y -= displayRect.GetY();