Disable symbols visibility support for the Clang compiler.

[wxWidgets.git] / src / common / utilscmn.cpp

diff --git a/src/common/utilscmn.cpp b/src/common/utilscmn.cpp
index 837e2c22397c7b42229b6d6eafd8737fba1bb5e6..6e9a224e9d5a0e74c3b25976a35a091449ea8e81 100644 (file)
--- a/src/common/utilscmn.cpp
+++ b/src/common/utilscmn.cpp
@@ -549,8 +549,10 @@ wxString wxGetCurrentDir()
 // ----------------------------------------------------------------------------
 
 #ifdef __WXOSX__
 // ----------------------------------------------------------------------------
 
 #ifdef __WXOSX__

+#if wxOSX_USE_COCOA_OR_CARBON

     #include <crt_externs.h>
 #endif
     #include <crt_externs.h>
 #endif

+#endif

 
 bool wxGetEnvMap(wxEnvVariableHashMap *map)
 {
 
 bool wxGetEnvMap(wxEnvVariableHashMap *map)
 {


@@ -563,6 +565,7 @@ bool wxGetEnvMap(wxEnvVariableHashMap *map)
    // TODO : should we do something with logicals?
     char **env=NULL;
 #elif defined(__WXOSX__)
    // TODO : should we do something with logicals?
     char **env=NULL;
 #elif defined(__WXOSX__)

+#if 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
     // 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


@@ -570,9 +573,17 @@ bool wxGetEnvMap(wxEnvVariableHashMap *map)
     if ( !penv )
         return false;
     char **env = *penv;
     if ( !penv )
         return false;
     char **env = *penv;

+#else
+    char **env=NULL;
+    // todo translate NSProcessInfo environment into map
+#endif

 #else // non-MSVC non-Mac
     // Not sure if other compilers have _tenviron so use the (more standard)
     // ANSI version only for them.
 #else // non-MSVC non-Mac
     // Not sure if other compilers have _tenviron so use the (more standard)
     // ANSI version only for them.

+#ifdef __BSD__
+    // POSIX, but not in an include file
+    extern char **environ;
+#endif

     char **env = environ;
 #endif
 
     char **env = environ;
 #endif
 


@@ -1525,7 +1536,7 @@ wxColour wxGetColourFromUser(wxWindow *parent,
 wxFont wxGetFontFromUser(wxWindow *parent, const wxFont& fontInit, const wxString& caption)
 {
     wxFontData data;
 wxFont wxGetFontFromUser(wxWindow *parent, const wxFont& fontInit, const wxString& caption)
 {
     wxFontData data;

-    if ( fontInit.Ok() )
+    if ( fontInit.IsOk() )

     {
         data.SetInitialFont(fontInit);
     }
     {
         data.SetInitialFont(fontInit);
     }


@@ -1556,6 +1567,12 @@ void wxEnableTopLevelWindows(bool enable)
         node->GetData()->Enable(enable);
 }
 
         node->GetData()->Enable(enable);
 }
 

+#if defined(__WXOSX__) && wxOSX_USE_COCOA
+
+// defined in evtloop.mm
+
+#else
+

 wxWindowDisabler::wxWindowDisabler(bool disable)
 {
     m_disabled = disable;
 wxWindowDisabler::wxWindowDisabler(bool disable)
 {
     m_disabled = disable;


@@ -1618,6 +1635,8 @@ wxWindowDisabler::~wxWindowDisabler()
     delete m_winDisabled;
 }
 
     delete m_winDisabled;
 }
 

+#endif
+

 // Yield to other apps/messages and disable user input to all windows except
 // the given one
 bool wxSafeYield(wxWindow *win, bool onlyIfNeeded)
 // Yield to other apps/messages and disable user input to all windows except
 // the given one
 bool wxSafeYield(wxWindow *win, bool onlyIfNeeded)