#include "wx/uri.h"
#include "wx/mimetype.h"
#include "wx/config.h"
+#include "wx/versioninfo.h"
#if defined(__WXWINCE__) && wxUSE_DATETIME
#include "wx/datetime.h"
#endif // 0
+// ----------------------------------------------------------------------------
+// Environment
+// ----------------------------------------------------------------------------
+
+#ifdef __WXOSX__
+#if wxOSX_USE_COCOA_OR_CARBON
+ #include <crt_externs.h>
+#endif
+#endif
+
+bool wxGetEnvMap(wxEnvVariableHashMap *map)
+{
+ wxCHECK_MSG( map, false, wxS("output pointer can't be NULL") );
+
+#if defined(__VISUALC__)
+ wxChar **env = _tenviron;
+#elif defined(__VMS)
+ // Now this routine wil give false for OpenVMS
+ // 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
+ char ***penv = _NSGetEnviron();
+ 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.
+#ifdef __BSD__
+ // POSIX, but not in an include file
+ extern char **environ;
+#endif
+ char **env = environ;
+#endif
+
+ if ( env )
+ {
+ wxString name,
+ value;
+ while ( *env )
+ {
+ const wxString var(*env);
+
+ name = var.BeforeFirst(wxS('='), &value);
+
+ (*map)[name] = value;
+
+ env++;
+ }
+
+ return true;
+ }
+
+ return false;
+}
+
// ----------------------------------------------------------------------------
// wxExecute
// ----------------------------------------------------------------------------
static long wxDoExecuteWithCapture(const wxString& command,
wxArrayString& output,
wxArrayString* error,
- int flags)
+ int flags,
+ const wxExecuteEnv *env)
{
// create a wxProcess which will capture the output
wxProcess *process = new wxProcess;
process->Redirect();
- long rc = wxExecute(command, wxEXEC_SYNC | flags, process);
+ long rc = wxExecute(command, wxEXEC_SYNC | flags, process, env);
#if wxUSE_STREAMS
if ( rc != -1 )
return rc;
}
-long wxExecute(const wxString& command, wxArrayString& output, int flags)
+long wxExecute(const wxString& command, wxArrayString& output, int flags,
+ const wxExecuteEnv *env)
{
- return wxDoExecuteWithCapture(command, output, NULL, flags);
+ return wxDoExecuteWithCapture(command, output, NULL, flags, env);
}
long wxExecute(const wxString& command,
wxArrayString& output,
wxArrayString& error,
- int flags)
+ int flags,
+ const wxExecuteEnv *env)
{
- return wxDoExecuteWithCapture(command, output, &error, flags);
+ return wxDoExecuteWithCapture(command, output, &error, flags, env);
}
// ----------------------------------------------------------------------------
return wxNO;
case wxID_CANCEL:
return wxCANCEL;
+ case wxID_HELP:
+ return wxHELP;
}
wxFAIL_MSG( wxT("unexpected return code from wxMessageDialog") );
return wxCANCEL;
}
-void wxInfoMessageBox(wxWindow* parent)
+wxVersionInfo wxGetLibraryVersionInfo()
{
// don't translate these strings, they're for diagnostics purposes only
wxString msg;
GTK_MICRO_VERSION);
#endif // __WXGTK__
- msg += wxS("\nCopyright (c) 1995-2010 wxWidgets team");
+ return wxVersionInfo(wxS("wxWidgets"),
+ wxMAJOR_VERSION,
+ wxMINOR_VERSION,
+ wxRELEASE_NUMBER,
+ msg,
+ wxS("Copyright (c) 1995-2010 wxWidgets team"));
+}
+
+void wxInfoMessageBox(wxWindow* parent)
+{
+ wxVersionInfo info = wxGetLibraryVersionInfo();
+ wxString msg = info.ToString();
+
+ msg << wxS("\n") << info.GetCopyright();
wxMessageBox(msg, wxT("wxWidgets information"),
wxICON_INFORMATION | wxOK,
wxFont wxGetFontFromUser(wxWindow *parent, const wxFont& fontInit, const wxString& caption)
{
wxFontData data;
- if ( fontInit.Ok() )
+ if ( fontInit.IsOk() )
{
data.SetInitialFont(fontInit);
}
node->GetData()->Enable(enable);
}
+#if defined(__WXOSX__) && wxOSX_USE_COCOA
+
+// defined in evtloop.mm
+
+#else
+
wxWindowDisabler::wxWindowDisabler(bool disable)
{
m_disabled = disable;
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)