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

Move wxHAS_NATIVE_ENABLED_MANAGEMENT definition to the source file

Browse Source 
There doesn't seem to be any need to have this symbol in the header,
when it's only used in NotifyWindowOnEnableChange() in wincmn.cpp.

No real changes.
This commit is contained in:
Vadim Zeitlin
2018-01-13 22:44:44 +01:00
parent 564df77283
commit 2163b00b93
2 changed files with 15 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
include/wx/window.h
View File

@@ -48,22 +48,6 @@
#define wxUSE_MENUS_NATIVE wxUSE_MENUS #define wxUSE_MENUS_NATIVE wxUSE_MENUS
#endif // __WXUNIVERSAL__/!__WXUNIVERSAL__ #endif // __WXUNIVERSAL__/!__WXUNIVERSAL__
// Define this macro if the corresponding operating system handles the state
// of children windows automatically when the parent is enabled/disabled.
// Otherwise wx itself must ensure that when the parent is disabled its
// children are disabled too, and their initial state is restored when the
// parent is enabled back.
#if defined(__WXMSW__)
// must do everything ourselves
#undef wxHAS_NATIVE_ENABLED_MANAGEMENT
#elif defined(__WXOSX__)
// must do everything ourselves
#undef wxHAS_NATIVE_ENABLED_MANAGEMENT
#else
#define wxHAS_NATIVE_ENABLED_MANAGEMENT
#endif
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// forward declarations // forward declarations
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------

15
src/common/wincmn.cpp
View File

@@ -1166,6 +1166,21 @@ bool wxWindowBase::IsEnabled() const
return IsThisEnabled() && (IsTopLevel() || !GetParent() || GetParent()->IsEnabled()); return IsThisEnabled() && (IsTopLevel() || !GetParent() || GetParent()->IsEnabled());
} }
// Define this macro if the corresponding operating system handles the state
// of children windows automatically when the parent is enabled/disabled.
// Otherwise wx itself must ensure that when the parent is disabled its
// children are disabled too, and their initial state is restored when the
// parent is enabled back.
#if defined(__WXMSW__)
// must do everything ourselves
#undef wxHAS_NATIVE_ENABLED_MANAGEMENT
#elif defined(__WXOSX__)
// must do everything ourselves
#undef wxHAS_NATIVE_ENABLED_MANAGEMENT
#else
#define wxHAS_NATIVE_ENABLED_MANAGEMENT
#endif
void wxWindowBase::NotifyWindowOnEnableChange(bool enabled) void wxWindowBase::NotifyWindowOnEnableChange(bool enabled)
{ {
// Under some platforms there is no need to update the window state // Under some platforms there is no need to update the window state