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

Define default FOCUS_RING value just once

Browse Source 
Mac is the only platform which needs, so just define it as 0 for all the
other ones.

No real changes.
This commit is contained in:
Vadim Zeitlin 2021-07-10 18:08:12 +01:00
parent 67f27f1b89
commit 272b1009cc
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/common/combocmn.cpp
View File

@ -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 #define TRANSIENT_POPUPWIN_IS_PERFECT 0 // wxPopupTransientWindow works, its child can have focus, and common
// native controls work on it like normal. // native controls work on it like normal.
#define POPUPWIN_IS_PERFECT 0 // Same, but for non-transient popup window. #define POPUPWIN_IS_PERFECT 0 // Same, but for non-transient popup window.
#define FOCUS_RING 0 // No focus ring on wxMSW
//#undef wxUSE_POPUPWIN //#undef wxUSE_POPUPWIN
//#define wxUSE_POPUPWIN 0 //#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 #define TRANSIENT_POPUPWIN_IS_PERFECT 1 // wxPopupTransientWindow works, its child can have focus, and common
// native controls work on it like normal. // native controls work on it like normal.
#define POPUPWIN_IS_PERFECT 1 // Same, but for non-transient popup window. #define POPUPWIN_IS_PERFECT 1 // Same, but for non-transient popup window.
#define FOCUS_RING 0 // No focus ring on wxGTK
#elif defined(__WXMAC__) #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 #define TRANSIENT_POPUPWIN_IS_PERFECT 0 // wxPopupTransientWindow works, its child can have focus, and common
// native controls work on it like normal. // native controls work on it like normal.
#define POPUPWIN_IS_PERFECT 0 // Same, but for non-transient popup window. #define POPUPWIN_IS_PERFECT 0 // Same, but for non-transient popup window.
#define FOCUS_RING 0
#endif #endif
// No focus ring by default.
#ifndef FOCUS_RING
#define FOCUS_RING 0
#endif
// Popupwin is really only supported on wxMSW and wxGTK, regardless // Popupwin is really only supported on wxMSW and wxGTK, regardless
// what the wxUSE_POPUPWIN says. // what the wxUSE_POPUPWIN says.