From 0bb5bfb45a948575dec1698f2c39a954878912a0 Mon Sep 17 00:00:00 2001 From: Stefan Csomor Date: Thu, 23 Oct 2025 23:51:30 +0200 Subject: [PATCH 07/48] fix warnings --- src/common/utilscmn.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/common/utilscmn.cpp b/src/common/utilscmn.cpp index 40c895c963..e522213659 100644 --- a/src/common/utilscmn.cpp +++ b/src/common/utilscmn.cpp @@ -509,7 +509,7 @@ wxString wxGetCurrentDir() // ---------------------------------------------------------------------------- #ifdef __WXOSX__ -#if wxOSX_USE_COCOA_OR_CARBON +#if defined(wxOSX_USE_COCOA_OR_CARBON) && wxOSX_USE_COCOA_OR_CARBON #include #endif #endif @@ -531,7 +531,7 @@ bool wxGetEnvMap(wxEnvVariableHashMap *map) // TODO : should we do something with logicals? char **env=nullptr; #elif defined(__DARWIN__) -#if wxOSX_USE_COCOA_OR_CARBON +#if defined(wxOSX_USE_COCOA_OR_CARBON) && wxOSX_USE_COCOA_OR_CARBON // Under Mac shared libraries don't have access to the global environ // variable so use this Mac-specific function instead as advised by // environ(7) under Darwin @@ -1513,7 +1513,7 @@ wxWindowDisabler::wxWindowDisabler(bool disable) { DoDisable(); -#if defined(__WXOSX__) && wxOSX_USE_COCOA +#if defined(__WXOSX__) && defined(wxOSX_USE_COCOA) && wxOSX_USE_COCOA AfterDisable(nullptr); #endif } @@ -1530,7 +1530,7 @@ wxWindowDisabler::wxWindowDisabler(wxWindow *winToSkip, wxWindow *winToSkip2) DoDisable(); -#if defined(__WXOSX__) && wxOSX_USE_COCOA +#if defined(__WXOSX__) && defined(wxOSX_USE_COCOA) && wxOSX_USE_COCOA AfterDisable(winToSkip); #endif } @@ -1563,7 +1563,7 @@ wxWindowDisabler::~wxWindowDisabler() if ( !m_disabled ) return; -#if defined(__WXOSX__) && wxOSX_USE_COCOA +#if defined(__WXOSX__) && defined(wxOSX_USE_COCOA) && wxOSX_USE_COCOA BeforeEnable(); #endif -- 2.24.3 (Apple Git-128)