From a2c6620907259ab006ada23d31446cf198e4c887 Mon Sep 17 00:00:00 2001
From: Artur Wieczorek <7330332+a-wi@users.noreply.github.com>
Date: Sun, 5 Feb 2023 19:06:25 +0100
Subject: [PATCH] Pass size to wxToolbar::SetToolBitmapSize() given in logical
 pixels

Previously the size was given DIPs but now logical pixels are used.

(cherry picked from commit ff7476fcd0f3fccad19b849511b73cbfd9a317bd)
---
 docs/changes.txt         | 1 +
 src/propgrid/manager.cpp | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/changes.txt b/docs/changes.txt
index 0347785bf7..14c79ea1b5 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -268,6 +268,7 @@ All (GUI):
 - Update wxOwnerDrawnComboBox best size when adding items (Reza Karimi, #23681).
 - Keep wxProgressDialog size when updating the message (Oleg Samarin, #23727).
 - Fix crash when deleting selected item in wxGenericListCtrl (#23729).
+- Use DIPs for toolbar image sizes in wxPropertyGrid.
 
 wxGTK:
 
diff --git a/src/propgrid/manager.cpp b/src/propgrid/manager.cpp
index fb62bf3dbe..dfe2acb109 100644
--- a/src/propgrid/manager.cpp
+++ b/src/propgrid/manager.cpp
@@ -1665,7 +1665,7 @@ void wxPropertyGridManager::RecreateControls()
                                        wxDefaultPosition,
                                        wxDefaultSize,
                                        toolBarFlags);
-            m_pToolbar->SetToolBitmapSize(wxSize(16, 15));
+            m_pToolbar->SetToolBitmapSize(FromDIP(wxSize(16, 15)));
 
         #if defined(__WXMSW__)
             // Eliminate toolbar flicker on XP