X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/edb31724bcbba7bec4a66bb998340ac1ae848779..026c6eff708c867efe9eca35e41bf82b58ba1c1a:/src/common/utilscmn.cpp

diff --git a/src/common/utilscmn.cpp b/src/common/utilscmn.cpp
index 246d94f22c..6e9a224e9d 100644
--- a/src/common/utilscmn.cpp
+++ b/src/common/utilscmn.cpp
@@ -580,6 +580,10 @@ bool wxGetEnvMap(wxEnvVariableHashMap *map)
 #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
 
@@ -1532,7 +1536,7 @@ wxColour wxGetColourFromUser(wxWindow *parent,
 wxFont wxGetFontFromUser(wxWindow *parent, const wxFont& fontInit, const wxString& caption)
 {
     wxFontData data;
-    if ( fontInit.Ok() )
+    if ( fontInit.IsOk() )
     {
         data.SetInitialFont(fontInit);
     }
@@ -1563,6 +1567,12 @@ void wxEnableTopLevelWindows(bool enable)
         node->GetData()->Enable(enable);
 }
 
+#if defined(__WXOSX__) && wxOSX_USE_COCOA
+
+// defined in evtloop.mm
+
+#else
+
 wxWindowDisabler::wxWindowDisabler(bool disable)
 {
     m_disabled = disable;
@@ -1625,6 +1635,8 @@ wxWindowDisabler::~wxWindowDisabler()
     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)