From 272b1009ccf5454f198047033891f46fd35309c7 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sat, 10 Jul 2021 18:08:12 +0100 Subject: [PATCH] Define default FOCUS_RING value just once Mac is the only platform which needs, so just define it as 0 for all the other ones. No real changes. --- src/common/combocmn.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/common/combocmn.cpp b/src/common/combocmn.cpp index d9a5cc15ea..5dd8142f14 100644 --- a/src/common/combocmn.cpp +++ b/src/common/combocmn.cpp @@ -136,7 +136,6 @@ wxCONSTRUCTOR_5( wxComboBox, wxWindow*, Parent, wxWindowID, Id, \ #define TRANSIENT_POPUPWIN_IS_PERFECT 0 // wxPopupTransientWindow works, its child can have focus, and common // native controls work on it like normal. #define POPUPWIN_IS_PERFECT 0 // Same, but for non-transient popup window. -#define FOCUS_RING 0 // No focus ring on wxMSW //#undef wxUSE_POPUPWIN //#define wxUSE_POPUPWIN 0 @@ -166,7 +165,6 @@ wxCONSTRUCTOR_5( wxComboBox, wxWindow*, Parent, wxWindowID, Id, \ #define TRANSIENT_POPUPWIN_IS_PERFECT 1 // wxPopupTransientWindow works, its child can have focus, and common // native controls work on it like normal. #define POPUPWIN_IS_PERFECT 1 // Same, but for non-transient popup window. -#define FOCUS_RING 0 // No focus ring on wxGTK #elif defined(__WXMAC__) @@ -194,10 +192,13 @@ wxCONSTRUCTOR_5( wxComboBox, wxWindow*, Parent, wxWindowID, Id, \ #define TRANSIENT_POPUPWIN_IS_PERFECT 0 // wxPopupTransientWindow works, its child can have focus, and common // native controls work on it like normal. #define POPUPWIN_IS_PERFECT 0 // Same, but for non-transient popup window. -#define FOCUS_RING 0 #endif +// No focus ring by default. +#ifndef FOCUS_RING + #define FOCUS_RING 0 +#endif // Popupwin is really only supported on wxMSW and wxGTK, regardless // what the wxUSE_POPUPWIN says.