From 43e93cc801002ffd1439a0f27c6c2ad0dd462bd1 Mon Sep 17 00:00:00 2001 From: Marek Roszko Date: Wed, 14 Apr 2021 22:54:40 -0400 Subject: [PATCH] Force disable the native dropdown caret on grid comboctrl's we create Fix #7212 --- common/widgets/grid_text_button_helpers.cpp | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/common/widgets/grid_text_button_helpers.cpp b/common/widgets/grid_text_button_helpers.cpp index f4896b18b7..e8aae3fc40 100644 --- a/common/widgets/grid_text_button_helpers.cpp +++ b/common/widgets/grid_text_button_helpers.cpp @@ -176,6 +176,9 @@ public: m_preselect( aPreselect ) { SetButtonBitmaps( KiBitmap( BITMAPS::small_library ) ); + + // win32 fix, avoids drawing the "native dropdown caret" + Customize( wxCC_IFLAG_HAS_NONSTANDARD_BUTTON ); } protected: @@ -225,6 +228,9 @@ public: m_preselect( aPreselect ) { SetButtonBitmaps( KiBitmap( BITMAPS::small_library ) ); + + // win32 fix, avoids drawing the "native dropdown caret" + Customize( wxCC_IFLAG_HAS_NONSTANDARD_BUTTON ); } protected: @@ -280,6 +286,9 @@ public: m_dlg( aParentDlg ) { SetButtonBitmaps( KiBitmap( BITMAPS::www ) ); + + // win32 fix, avoids drawing the "native dropdown caret" + Customize( wxCC_IFLAG_HAS_NONSTANDARD_BUTTON ); } protected: @@ -334,6 +343,9 @@ public: m_normalizeBasePath( aNormalizeBasePath ) { SetButtonBitmaps( KiBitmap( BITMAPS::small_folder ) ); + + // win32 fix, avoids drawing the "native dropdown caret" + Customize( wxCC_IFLAG_HAS_NONSTANDARD_BUTTON ); } protected: