/////////////////////////////////////////////////////////////////////////////
-// Name: utilscmn.cpp
+// Name: src/common/utilscmn.cpp
// Purpose: Miscellaneous utility functions and classes
// Author: Julian Smart
// Modified by:
// headers
// ----------------------------------------------------------------------------
-#ifdef __GNUG__
- #pragma implementation "utils.h"
-#endif
-
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#endif
#ifndef WX_PRECOMP
- #include "wx/defs.h"
+ #include "wx/app.h"
#include "wx/string.h"
#include "wx/utils.h"
#include "wx/intl.h"
#include "wx/log.h"
#if wxUSE_GUI
- #include "wx/app.h"
#include "wx/window.h"
#include "wx/frame.h"
#include "wx/menu.h"
#endif // wxUSE_GUI
#endif // WX_PRECOMP
-#ifndef __WIN16__
+#include "wx/apptrait.h"
+
#include "wx/process.h"
#include "wx/txtstrm.h"
+#include "wx/uri.h"
+#include "wx/mimetype.h"
+#include "wx/config.h"
+
+#if defined(__WXWINCE__) && wxUSE_DATETIME
+#include "wx/datetime.h"
#endif
#include <ctype.h>
#include <stdlib.h>
#include <string.h>
-#if !defined(__WATCOMC__)
+#if !wxONLY_WATCOM_EARLIER_THAN(1,4)
#if !(defined(_MSC_VER) && (_MSC_VER > 800))
#include <errno.h>
#endif
#include "wx/colordlg.h"
#include "wx/fontdlg.h"
#include "wx/notebook.h"
- #include "wx/frame.h"
#include "wx/statusbr.h"
#endif // wxUSE_GUI
+#ifndef __WXWINCE__
#include <time.h>
+#else
+#include "wx/msw/wince/time.h"
+#endif
-#ifndef __MWERKS__
- #include <sys/types.h>
- #include <sys/stat.h>
+#ifdef __WXMAC__
+#include "wx/mac/private.h"
+#ifndef __DARWIN__
+#include "InternetConfig.h"
+#endif
#endif
-#ifdef __SALFORDC__
- #include <clib.h>
+#if !defined(__MWERKS__) && !defined(__WXWINCE__)
+ #include <sys/types.h>
+ #include <sys/stat.h>
#endif
-#ifdef __WXMSW__
+#if defined(__WXMSW__)
#include "wx/msw/private.h"
+ #include "wx/msw/registry.h"
+ #include <shellapi.h> // needed for SHELLEXECUTEINFO
#endif
+#if wxUSE_BASE
+
// ----------------------------------------------------------------------------
// common data
// ----------------------------------------------------------------------------
-#if WXWIN_COMPATIBILITY_2_2
- const wxChar *wxInternalErrorStr = wxT("wxWindows Internal Error");
- const wxChar *wxFatalErrorStr = wxT("wxWindows Fatal Error");
-#endif // WXWIN_COMPATIBILITY_2_2
-
// ============================================================================
// implementation
// ============================================================================
-wxChar *
-copystring (const wxChar *s)
+// Array used in DecToHex conversion routine.
+static wxChar hexArray[] = wxT("0123456789ABCDEF");
+
+// Convert 2-digit hex number to decimal
+int wxHexToDec(const wxString& buf)
{
- if (s == NULL) s = wxT("");
- size_t len = wxStrlen (s) + 1;
+ int firstDigit, secondDigit;
- wxChar *news = new wxChar[len];
- memcpy (news, s, len * sizeof(wxChar)); // Should be the fastest
+ if (buf.GetChar(0) >= wxT('A'))
+ firstDigit = buf.GetChar(0) - wxT('A') + 10;
+ else
+ firstDigit = buf.GetChar(0) - wxT('0');
- return news;
-}
+ if (buf.GetChar(1) >= wxT('A'))
+ secondDigit = buf.GetChar(1) - wxT('A') + 10;
+ else
+ secondDigit = buf.GetChar(1) - wxT('0');
-// Id generation
-static long wxCurrentId = 100;
+ return (firstDigit & 0xF) * 16 + (secondDigit & 0xF );
+}
-long
-wxNewId (void)
+// Convert decimal integer to 2-character hex string
+void wxDecToHex(int dec, wxChar *buf)
{
- return wxCurrentId++;
+ int firstDigit = (int)(dec/16.0);
+ int secondDigit = (int)(dec - (firstDigit*16.0));
+ buf[0] = hexArray[firstDigit];
+ buf[1] = hexArray[secondDigit];
+ buf[2] = 0;
}
-long
-wxGetCurrentId(void) { return wxCurrentId; }
+// Convert decimal integer to 2 characters
+void wxDecToHex(int dec, char* ch1, char* ch2)
+{
+ int firstDigit = (int)(dec/16.0);
+ int secondDigit = (int)(dec - (firstDigit*16.0));
+ (*ch1) = (char) hexArray[firstDigit];
+ (*ch2) = (char) hexArray[secondDigit];
+}
-void
-wxRegisterId (long id)
+// Convert decimal integer to 2-character hex string
+wxString wxDecToHex(int dec)
{
- if (id >= wxCurrentId)
- wxCurrentId = id + 1;
+ wxChar buf[3];
+ wxDecToHex(dec, buf);
+ return wxString(buf);
}
// ----------------------------------------------------------------------------
-// String <-> Number conversions (deprecated)
+// misc functions
// ----------------------------------------------------------------------------
-#if WXWIN_COMPATIBILITY_2_4
+// Return the current date/time
+wxString wxNow()
+{
+#ifdef __WXWINCE__
+#if wxUSE_DATETIME
+ wxDateTime now = wxDateTime::Now();
+ return now.Format();
+#else
+ return wxEmptyString;
+#endif
+#else
+ time_t now = time((time_t *) NULL);
+ char *date = ctime(&now);
+ date[24] = '\0';
+ return wxString::FromAscii(date);
+#endif
+}
-WXDLLEXPORT_DATA(const wxChar *) wxFloatToStringStr = wxT("%.2f");
-WXDLLEXPORT_DATA(const wxChar *) wxDoubleToStringStr = wxT("%.2f");
+void wxUsleep(unsigned long milliseconds)
+{
+ wxMilliSleep(milliseconds);
+}
-void
-StringToFloat (const wxChar *s, float *number)
+const wxChar *wxGetInstallPrefix()
{
- if (s && *s && number)
- *number = (float) wxStrtod (s, (wxChar **) NULL);
+ wxString prefix;
+
+ if ( wxGetEnv(wxT("WXPREFIX"), &prefix) )
+ return prefix.c_str();
+
+#ifdef wxINSTALL_PREFIX
+ return wxT(wxINSTALL_PREFIX);
+#else
+ return wxEmptyString;
+#endif
}
-void
-StringToDouble (const wxChar *s, double *number)
+wxString wxGetDataDir()
{
- if (s && *s && number)
- *number = wxStrtod (s, (wxChar **) NULL);
+ wxString dir = wxGetInstallPrefix();
+ dir << wxFILE_SEP_PATH << wxT("share") << wxFILE_SEP_PATH << wxT("wx");
+ return dir;
}
-wxChar *
-FloatToString (float number, const wxChar *fmt)
+bool wxIsPlatformLittleEndian()
{
- static wxChar buf[256];
+ // Are we little or big endian? This method is from Harbison & Steele.
+ union
+ {
+ long l;
+ char c[sizeof(long)];
+ } u;
+ u.l = 1;
- wxSprintf (buf, fmt, number);
- return buf;
+ return u.c[0] == 1;
}
-wxChar *
-DoubleToString (double number, const wxChar *fmt)
+
+/*
+ * Class to make it easier to specify platform-dependent values
+ */
+
+wxArrayInt* wxPlatform::sm_customPlatforms = NULL;
+
+void wxPlatform::Copy(const wxPlatform& platform)
{
- static wxChar buf[256];
+ m_longValue = platform.m_longValue;
+ m_doubleValue = platform.m_doubleValue;
+ m_stringValue = platform.m_stringValue;
+}
- wxSprintf (buf, fmt, number);
- return buf;
+wxPlatform wxPlatform::If(int platform, long value)
+{
+ if (Is(platform))
+ return wxPlatform(value);
+ else
+ return wxPlatform();
}
-void
-StringToInt (const wxChar *s, int *number)
+wxPlatform wxPlatform::IfNot(int platform, long value)
{
- if (s && *s && number)
- *number = (int) wxStrtol (s, (wxChar **) NULL, 10);
+ if (!Is(platform))
+ return wxPlatform(value);
+ else
+ return wxPlatform();
}
-void
-StringToLong (const wxChar *s, long *number)
+wxPlatform& wxPlatform::ElseIf(int platform, long value)
{
- if (s && *s && number)
- *number = wxStrtol (s, (wxChar **) NULL, 10);
+ if (Is(platform))
+ m_longValue = value;
+ return *this;
}
-wxChar *
-IntToString (int number)
+wxPlatform& wxPlatform::ElseIfNot(int platform, long value)
{
- static wxChar buf[20];
+ if (!Is(platform))
+ m_longValue = value;
+ return *this;
+}
- wxSprintf (buf, wxT("%d"), number);
- return buf;
+wxPlatform wxPlatform::If(int platform, double value)
+{
+ if (Is(platform))
+ return wxPlatform(value);
+ else
+ return wxPlatform();
}
-wxChar *
-LongToString (long number)
+wxPlatform wxPlatform::IfNot(int platform, double value)
{
- static wxChar buf[20];
+ if (!Is(platform))
+ return wxPlatform(value);
+ else
+ return wxPlatform();
+}
- wxSprintf (buf, wxT("%ld"), number);
- return buf;
+wxPlatform& wxPlatform::ElseIf(int platform, double value)
+{
+ if (Is(platform))
+ m_doubleValue = value;
+ return *this;
}
-#endif // WXWIN_COMPATIBILITY_2_4
+wxPlatform& wxPlatform::ElseIfNot(int platform, double value)
+{
+ if (!Is(platform))
+ m_doubleValue = value;
+ return *this;
+}
-// Array used in DecToHex conversion routine.
-static wxChar hexArray[] = wxT("0123456789ABCDEF");
+wxPlatform wxPlatform::If(int platform, const wxString& value)
+{
+ if (Is(platform))
+ return wxPlatform(value);
+ else
+ return wxPlatform();
+}
-// Convert 2-digit hex number to decimal
-int wxHexToDec(const wxString& buf)
+wxPlatform wxPlatform::IfNot(int platform, const wxString& value)
{
- int firstDigit, secondDigit;
+ if (!Is(platform))
+ return wxPlatform(value);
+ else
+ return wxPlatform();
+}
- if (buf.GetChar(0) >= wxT('A'))
- firstDigit = buf.GetChar(0) - wxT('A') + 10;
- else
- firstDigit = buf.GetChar(0) - wxT('0');
+wxPlatform& wxPlatform::ElseIf(int platform, const wxString& value)
+{
+ if (Is(platform))
+ m_stringValue = value;
+ return *this;
+}
- if (buf.GetChar(1) >= wxT('A'))
- secondDigit = buf.GetChar(1) - wxT('A') + 10;
- else
- secondDigit = buf.GetChar(1) - wxT('0');
+wxPlatform& wxPlatform::ElseIfNot(int platform, const wxString& value)
+{
+ if (!Is(platform))
+ m_stringValue = value;
+ return *this;
+}
- return (firstDigit & 0xF) * 16 + (secondDigit & 0xF );
+wxPlatform& wxPlatform::Else(long value)
+{
+ m_longValue = value;
+ return *this;
}
-// Convert decimal integer to 2-character hex string
-void wxDecToHex(int dec, wxChar *buf)
+wxPlatform& wxPlatform::Else(double value)
{
- int firstDigit = (int)(dec/16.0);
- int secondDigit = (int)(dec - (firstDigit*16.0));
- buf[0] = hexArray[firstDigit];
- buf[1] = hexArray[secondDigit];
- buf[2] = 0;
+ m_doubleValue = value;
+ return *this;
}
-// Convert decimal integer to 2-character hex string
-wxString wxDecToHex(int dec)
+wxPlatform& wxPlatform::Else(const wxString& value)
{
- wxChar buf[3];
- wxDecToHex(dec, buf);
- return wxString(buf);
+ m_stringValue = value;
+ return *this;
}
-#if WXWIN_COMPATIBILITY_2
-bool
-StringMatch (const wxChar *str1, const wxChar *str2, bool subString, bool exact)
+void wxPlatform::AddPlatform(int platform)
{
- if (str1 == NULL || str2 == NULL)
- return FALSE;
- if (str1 == str2)
- return TRUE;
+ if (!sm_customPlatforms)
+ sm_customPlatforms = new wxArrayInt;
+ sm_customPlatforms->Add(platform);
+}
- if (subString)
- {
- int len1 = wxStrlen (str1);
- int len2 = wxStrlen (str2);
- int i;
+void wxPlatform::ClearPlatforms()
+{
+ delete sm_customPlatforms;
+ sm_customPlatforms = NULL;
+}
+
+/// Function for testing current platform
+
+bool wxPlatform::Is(int platform)
+{
+#ifdef __WXMSW__
+ if (platform == wxOS_WINDOWS)
+ return true;
+#endif
+#ifdef __WXWINCE__
+ if (platform == wxOS_WINDOWS_CE)
+ return true;
+#endif
- // Search for str1 in str2
- // Slow .... but acceptable for short strings
- for (i = 0; i <= len2 - len1; i++)
+#if 0
+
+// FIXME: wxWinPocketPC and wxWinSmartPhone are unknown symbols
+
+#if defined(__WXWINCE__) && defined(__POCKETPC__)
+ if (platform == wxWinPocketPC)
+ return true;
+#endif
+#if defined(__WXWINCE__) && defined(__SMARTPHONE__)
+ if (platform == wxWinSmartPhone)
+ return true;
+#endif
+
+#endif
+
+#ifdef __WXGTK__
+ if (platform == wxPORT_GTK)
+ return true;
+#endif
+#ifdef __WXMAC__
+ if (platform == wxPORT_MAC)
+ return true;
+#endif
+#ifdef __WXX11__
+ if (platform == wxPORT_X11)
+ return true;
+#endif
+#ifdef __UNIX__
+ if (platform == wxOS_UNIX)
+ return true;
+#endif
+#ifdef __WXMGL__
+ if (platform == wxPORT_MGL)
+ return true;
+#endif
+#ifdef __OS2__
+ if (platform == wxOS_OS2)
+ return true;
+#endif
+#ifdef __WXPM__
+ if (platform == wxPORT_PM)
+ return true;
+#endif
+#ifdef __WXCOCOA__
+ if (platform == wxPORT_MAC)
+ return true;
+#endif
+
+ if (sm_customPlatforms && sm_customPlatforms->Index(platform) != wxNOT_FOUND)
+ return true;
+
+ return false;
+}
+
+// ----------------------------------------------------------------------------
+// network and user id functions
+// ----------------------------------------------------------------------------
+
+// Get Full RFC822 style email address
+bool wxGetEmailAddress(wxChar *address, int maxSize)
+{
+ wxString email = wxGetEmailAddress();
+ if ( !email )
+ return false;
+
+ wxStrncpy(address, email, maxSize - 1);
+ address[maxSize - 1] = wxT('\0');
+
+ return true;
+}
+
+wxString wxGetEmailAddress()
+{
+ wxString email;
+
+ wxString host = wxGetFullHostName();
+ if ( !host.empty() )
+ {
+ wxString user = wxGetUserId();
+ if ( !user.empty() )
{
- if (wxStrnicmp (str1, str2 + i, len1) == 0)
- return TRUE;
+ email << user << wxT('@') << host;
}
}
- else if (exact)
+
+ return email;
+}
+
+wxString wxGetUserId()
+{
+ static const int maxLoginLen = 256; // FIXME arbitrary number
+
+ wxString buf;
+ bool ok = wxGetUserId(wxStringBuffer(buf, maxLoginLen), maxLoginLen);
+
+ if ( !ok )
+ buf.Empty();
+
+ return buf;
+}
+
+wxString wxGetUserName()
+{
+ static const int maxUserNameLen = 1024; // FIXME arbitrary number
+
+ wxString buf;
+ bool ok = wxGetUserName(wxStringBuffer(buf, maxUserNameLen), maxUserNameLen);
+
+ if ( !ok )
+ buf.Empty();
+
+ return buf;
+}
+
+wxString wxGetHostName()
+{
+ static const size_t hostnameSize = 257;
+
+ wxString buf;
+ bool ok = wxGetHostName(wxStringBuffer(buf, hostnameSize), hostnameSize);
+
+ if ( !ok )
+ buf.Empty();
+
+ return buf;
+}
+
+wxString wxGetFullHostName()
+{
+ static const size_t hostnameSize = 257;
+
+ wxString buf;
+ bool ok = wxGetFullHostName(wxStringBuffer(buf, hostnameSize), hostnameSize);
+
+ if ( !ok )
+ buf.Empty();
+
+ return buf;
+}
+
+wxString wxGetHomeDir()
+{
+ wxString home;
+ wxGetHomeDir(&home);
+
+ return home;
+}
+
+#if 0
+
+wxString wxGetCurrentDir()
+{
+ wxString dir;
+ size_t len = 1024;
+ bool ok;
+ do
+ {
+ ok = getcwd(dir.GetWriteBuf(len + 1), len) != NULL;
+ dir.UngetWriteBuf();
+
+ if ( !ok )
+ {
+ if ( errno != ERANGE )
+ {
+ wxLogSysError(_T("Failed to get current directory"));
+
+ return wxEmptyString;
+ }
+ else
+ {
+ // buffer was too small, retry with a larger one
+ len *= 2;
+ }
+ }
+ //else: ok
+ } while ( !ok );
+
+ return dir;
+}
+
+#endif // 0
+
+// ----------------------------------------------------------------------------
+// wxExecute
+// ----------------------------------------------------------------------------
+
+// wxDoExecuteWithCapture() helper: reads an entire stream into one array
+//
+// returns true if ok, false if error
+#if wxUSE_STREAMS
+static bool ReadAll(wxInputStream *is, wxArrayString& output)
+{
+ wxCHECK_MSG( is, false, _T("NULL stream in wxExecute()?") );
+
+ // the stream could be already at EOF or in wxSTREAM_BROKEN_PIPE state
+ is->Reset();
+
+ wxTextInputStream tis(*is);
+
+ for ( ;; )
{
- if (wxStricmp (str1, str2) == 0)
- return TRUE;
+ wxString line = tis.ReadLine();
+
+ // check for EOF before other errors as it's not really an error
+ if ( is->Eof() )
+ {
+ // add the last, possibly incomplete, line
+ if ( !line.empty() )
+ output.Add(line);
+ break;
+ }
+
+ // any other error is fatal
+ if ( !*is )
+ return false;
+
+ output.Add(line);
}
- else
+
+ return true;
+}
+#endif // wxUSE_STREAMS
+
+// this is a private function because it hasn't a clean interface: the first
+// array is passed by reference, the second by pointer - instead we have 2
+// public versions of wxExecute() below
+static long wxDoExecuteWithCapture(const wxString& command,
+ wxArrayString& output,
+ wxArrayString* error,
+ int flags)
+{
+ // create a wxProcess which will capture the output
+ wxProcess *process = new wxProcess;
+ process->Redirect();
+
+ long rc = wxExecute(command, wxEXEC_SYNC | flags, process);
+
+#if wxUSE_STREAMS
+ if ( rc != -1 )
{
- int len1 = wxStrlen (str1);
- int len2 = wxStrlen (str2);
+ if ( !ReadAll(process->GetInputStream(), output) )
+ rc = -1;
+
+ if ( error )
+ {
+ if ( !ReadAll(process->GetErrorStream(), *error) )
+ rc = -1;
+ }
- if (wxStrnicmp (str1, str2, wxMin (len1, len2)) == 0)
- return TRUE;
}
+#else
+ wxUnusedVar(output);
+ wxUnusedVar(error);
+#endif // wxUSE_STREAMS/!wxUSE_STREAMS
+
+ delete process;
- return FALSE;
+ return rc;
}
-#endif
-// Return the current date/time
-// [volatile]
-wxString wxNow()
+long wxExecute(const wxString& command, wxArrayString& output, int flags)
{
- time_t now = time((time_t *) NULL);
- char *date = ctime(&now);
- date[24] = '\0';
- return wxString::FromAscii(date);
+ return wxDoExecuteWithCapture(command, output, NULL, flags);
+}
+
+long wxExecute(const wxString& command,
+ wxArrayString& output,
+ wxArrayString& error,
+ int flags)
+{
+ return wxDoExecuteWithCapture(command, output, &error, flags);
+}
+
+// ----------------------------------------------------------------------------
+// wxApp::Yield() wrappers for backwards compatibility
+// ----------------------------------------------------------------------------
+
+bool wxYield()
+{
+ return wxTheApp && wxTheApp->Yield();
}
+bool wxYieldIfNeeded()
+{
+ return wxTheApp && wxTheApp->Yield(true);
+}
+
+// Id generation
+static long wxCurrentId = 100;
+
+long wxNewId()
+{
+ // skip the part of IDs space that contains hard-coded values:
+ if (wxCurrentId == wxID_LOWEST)
+ wxCurrentId = wxID_HIGHEST + 1;
+
+ return wxCurrentId++;
+}
+
+long
+wxGetCurrentId(void) { return wxCurrentId; }
+
+void
+wxRegisterId (long id)
+{
+ if (id >= wxCurrentId)
+ wxCurrentId = id + 1;
+}
+
+#endif // wxUSE_BASE
+
+// ============================================================================
+// GUI-only functions from now on
+// ============================================================================
+
#if wxUSE_GUI
-#if wxUSE_MENUS
+// ----------------------------------------------------------------------------
+// Launch default browser
+// ----------------------------------------------------------------------------
+
+#ifdef __WXCOCOA__
+// Private method in Objective-C++ source file.
+bool wxCocoaLaunchDefaultBrowser(const wxString& url, int flags);
+#endif
+
+bool wxLaunchDefaultBrowser(const wxString& urlOrig, int flags)
+{
+ wxUnusedVar(flags);
+
+ // set the scheme of url to http if it does not have one
+ // RR: This doesn't work if the url is just a local path
+ wxString url(urlOrig);
+ wxURI uri(url);
+ if ( !uri.HasScheme() )
+ {
+ if (wxFileExists(urlOrig))
+ url.Prepend( wxT("file://") );
+ else
+ url.Prepend(wxT("http://"));
+ }
+
+
+#if defined(__WXMSW__)
+
+#if wxUSE_IPC
+ if ( flags & wxBROWSER_NEW_WINDOW )
+ {
+ // ShellExecuteEx() opens the URL in an existing window by default so
+ // we can't use it if we need a new window
+ wxRegKey key(wxRegKey::HKCR, uri.GetScheme() + _T("\\shell\\open"));
+ if ( !key.Exists() )
+ {
+ // try default browser, it must be registered at least for http URLs
+ key.SetName(wxRegKey::HKCR, _T("http\\shell\\open"));
+ }
+
+ if ( key.Exists() )
+ {
+ wxRegKey keyDDE(key, wxT("DDEExec"));
+ if ( keyDDE.Exists() )
+ {
+ const wxString ddeTopic = wxRegKey(keyDDE, wxT("topic"));
+
+ // we only know the syntax of WWW_OpenURL DDE request for IE,
+ // optimistically assume that all other browsers are compatible
+ // with it
+ wxString ddeCmd;
+ bool ok = ddeTopic == wxT("WWW_OpenURL");
+ if ( ok )
+ {
+ ddeCmd = keyDDE.QueryDefaultValue();
+ ok = !ddeCmd.empty();
+ }
+
+ if ( ok )
+ {
+ // for WWW_OpenURL, the index of the window to open the URL
+ // in is -1 (meaning "current") by default, replace it with
+ // 0 which means "new" (see KB article 160957)
+ ok = ddeCmd.Replace(wxT("-1"), wxT("0"),
+ false /* only first occurence */) == 1;
+ }
+
+ if ( ok )
+ {
+ // and also replace the parameters: the topic should
+ // contain a placeholder for the URL
+ ok = ddeCmd.Replace(wxT("%1"), url, false) == 1;
+ }
+
+ if ( ok )
+ {
+ // try to send it the DDE request now but ignore the errors
+ wxLogNull noLog;
+
+ const wxString ddeServer = wxRegKey(keyDDE, wxT("application"));
+ if ( wxExecuteDDE(ddeServer, ddeTopic, ddeCmd) )
+ return true;
+
+ // this is not necessarily an error: maybe browser is
+ // simply not running, but no matter, in any case we're
+ // going to launch it using ShellExecuteEx() below now and
+ // we shouldn't try to open a new window if we open a new
+ // browser anyhow
+ }
+ }
+ }
+ }
+#endif // wxUSE_IPC
+
+ WinStruct<SHELLEXECUTEINFO> sei;
+ sei.lpFile = url.c_str();
+ sei.lpVerb = _T("open");
+ sei.nShow = SW_SHOWNORMAL;
+
+ ::ShellExecuteEx(&sei);
+
+ const int nResult = (int) sei.hInstApp;
+
+ // Firefox returns file not found for some reason, so make an exception
+ // for it
+ if ( nResult > 32 || nResult == SE_ERR_FNF )
+ {
+#ifdef __WXDEBUG__
+ // Log something if SE_ERR_FNF happens
+ if ( nResult == SE_ERR_FNF )
+ wxLogDebug(wxT("SE_ERR_FNF from ShellExecute -- maybe FireFox?"));
+#endif // __WXDEBUG__
+ return true;
+ }
+#elif defined(__WXCOCOA__)
+ // NOTE: We need to call the real implementation from src/cocoa/utils.mm
+ // because the code must use Objective-C features.
+ return wxCocoaLaunchDefaultBrowser(url, flags);
+#elif defined(__WXMAC__)
+ OSStatus err;
+ ICInstance inst;
+ long int startSel;
+ long int endSel;
+
+ err = ICStart(&inst, 'STKA'); // put your app creator code here
+ if (err == noErr)
+ {
+#if !TARGET_CARBON
+ err = ICFindConfigFile(inst, 0, NULL);
+#endif
+ if (err == noErr)
+ {
+ ConstStr255Param hint = 0;
+ startSel = 0;
+ endSel = url.length();
+ err = ICLaunchURL(inst, hint, url.fn_str(), endSel, &startSel, &endSel);
+ if (err != noErr)
+ wxLogDebug(wxT("ICLaunchURL error %d"), (int) err);
+ }
+ ICStop(inst);
+ return true;
+ }
+ else
+ {
+ wxLogDebug(wxT("ICStart error %d"), (int) err);
+ return false;
+ }
+#else
+ // (non-Mac, non-MSW)
+
+#ifdef __UNIX__
+
+ wxString desktop = wxTheApp->GetTraits()->GetDesktopEnvironment();
+
+ // GNOME and KDE desktops have some applications which should be always installed
+ // together with their main parts, which give us the
+ if (desktop == wxT("GNOME"))
+ {
+ wxArrayString errors;
+ wxArrayString output;
+
+ // gconf will tell us the path of the application to use as browser
+ long res = wxExecute( wxT("gconftool-2 --get /desktop/gnome/applications/browser/exec"),
+ output, errors, wxEXEC_NODISABLE );
+ if (res >= 0 && errors.GetCount() == 0)
+ {
+ wxString cmd = output[0];
+ cmd << _T(' ') << url;
+ if (wxExecute(cmd))
+ return true;
+ }
+ }
+ else if (desktop == wxT("KDE"))
+ {
+ // kfmclient directly opens the given URL
+ if (wxExecute(wxT("kfmclient openURL ") + url))
+ return true;
+ }
+#endif
+
+ bool ok = false;
+ wxString cmd;
+
+#if wxUSE_MIMETYPE
+ wxFileType *ft = wxTheMimeTypesManager->GetFileTypeFromExtension(_T("html"));
+ if ( ft )
+ {
+ wxString mt;
+ ft->GetMimeType(&mt);
+
+ ok = ft->GetOpenCommand(&cmd, wxFileType::MessageParameters(url));
+ delete ft;
+ }
+#endif // wxUSE_MIMETYPE
+
+ if ( !ok || cmd.empty() )
+ {
+ // fallback to checking for the BROWSER environment variable
+ cmd = wxGetenv(wxT("BROWSER"));
+ if ( !cmd.empty() )
+ cmd << _T(' ') << url;
+ }
+
+ ok = ( !cmd.empty() && wxExecute(cmd) );
+ if (ok)
+ return ok;
+
+ // no file type for HTML extension
+ wxLogError(_T("No default application configured for HTML files."));
+
+#endif // !wxUSE_MIMETYPE && !__WXMSW__
+
+ wxLogSysError(_T("Failed to open URL \"%s\" in default browser."),
+ url.c_str());
+
+ return false;
+}
// ----------------------------------------------------------------------------
// Menu accelerators related functions
wxChar *wxStripMenuCodes(const wxChar *in, wxChar *out)
{
+#if wxUSE_MENUS
wxString s = wxMenuItem::GetLabelFromText(in);
+#else
+ wxString str(in);
+ wxString s = wxStripMenuCodes(str);
+#endif // wxUSE_MENUS
if ( out )
{
// go smash their buffer if it's not big enough - I love char * params
}
else
{
- out = copystring(s);
+ out = new wxChar[s.length() + 1];
+ wxStrcpy(out, s.c_str());
}
return out;
}
-wxString wxStripMenuCodes(const wxString& in)
+wxString wxStripMenuCodes(const wxString& in, int flags)
{
+ wxASSERT_MSG( flags, _T("this is useless to call without any flags") );
+
wxString out;
size_t len = in.length();
for ( size_t n = 0; n < len; n++ )
{
wxChar ch = in[n];
- if ( ch == _T('&') )
+ if ( (flags & wxStrip_Mnemonics) && ch == _T('&') )
{
// skip it, it is used to introduce the accel char (or to quote
// itself in which case it should still be skipped): note that it
ch = in[n];
}
}
- else if ( ch == _T('\t') )
+ else if ( (flags & wxStrip_Accel) && ch == _T('\t') )
{
// everything after TAB is accel string, exit the loop
break;
return out;
}
-#endif // wxUSE_MENUS
-
// ----------------------------------------------------------------------------
// Window search functions
// ----------------------------------------------------------------------------
return wxWindow::FindWindowByName( name, parent );
}
-// Returns menu item id or -1 if none.
+// Returns menu item id or wxNOT_FOUND if none.
int
wxFindMenuItemId (wxFrame * frame, const wxString& menuString, const wxString& itemString)
{
#if wxUSE_MENUS
- wxMenuBar *menuBar = frame->GetMenuBar ();
- if ( menuBar )
- return menuBar->FindMenuItem (menuString, itemString);
+ wxMenuBar *menuBar = frame->GetMenuBar ();
+ if ( menuBar )
+ return menuBar->FindMenuItem (menuString, itemString);
#endif // wxUSE_MENUS
- return -1;
+ return wxNOT_FOUND;
}
// Try to find the deepest child that contains 'pt'.
}
#endif
- /* Doesn't work
- // Frame case
- else if (win->IsKindOf(CLASSINFO(wxFrame)))
- {
- // Pseudo-children that may not be mentioned in the child list
- wxWindowList extraChildren;
- wxFrame* frame = (wxFrame*) win;
- if (frame->GetStatusBar())
- extraChildren.Append(frame->GetStatusBar());
- if (frame->GetToolBar())
- extraChildren.Append(frame->GetToolBar());
-
- wxNode* node = extraChildren.GetFirst();
- while (node)
- {
- wxWindow* child = (wxWindow*) node->GetData();
- wxWindow* foundWin = wxFindWindowAtPoint(child, pt);
- if (foundWin)
- return foundWin;
- node = node->Next();
- }
- }
- */
-
- wxWindowList::Node *node = win->GetChildren().GetLast();
+ wxWindowList::compatibility_iterator node = win->GetChildren().GetLast();
while (node)
{
wxWindow* child = node->GetData();
wxPoint pos = win->GetPosition();
wxSize sz = win->GetSize();
- if (win->GetParent())
+ if ( !win->IsTopLevel() && win->GetParent() )
{
pos = win->GetParent()->ClientToScreen(pos);
}
wxRect rect(pos, sz);
- if (rect.Inside(pt))
+ if (rect.Contains(pt))
return win;
- else
- return NULL;
+
+ return NULL;
}
wxWindow* wxGenericFindWindowAtPoint(const wxPoint& pt)
// Go backwards through the list since windows
// on top are likely to have been appended most
// recently.
- wxWindowList::Node *node = wxTopLevelWindows.GetLast();
+ wxWindowList::compatibility_iterator node = wxTopLevelWindows.GetLast();
while (node)
{
wxWindow* win = node->GetData();
node = node->GetPrevious();
}
return NULL;
-}
-
-#endif // wxUSE_GUI
-
-/*
-On Fri, 21 Jul 1995, Paul Craven wrote:
-
-> Is there a way to find the path of running program's executable? I can get
-> my home directory, and the current directory, but I don't know how to get the
-> executable directory.
->
-
-The code below (warty as it is), does what you want on most Unix,
-DOS, and Mac platforms (it's from the ALS Prolog main).
-
-|| Ken Bowen Applied Logic Systems, Inc. PO Box 180,
-||==== Voice: +1 (617)965-9191 Newton Centre,
-|| FAX: +1 (617)965-1636 MA 02159 USA
- Email: ken@als.com WWW: http://www.als.com
-------------------------------------------------------------------------
-*/
-
-// This code is commented out but it may be integrated with wxWin at
-// a later date, after testing. Thanks Ken!
-#if 0
-
-/*--------------------------------------------------------------------*
- | whereami is given a filename f in the form: whereami(argv[0])
- | It returns the directory in which the executable file (containing
- | this code [main.c] ) may be found. A dot will be returned to indicate
- | the current directory.
- *--------------------------------------------------------------------*/
-
-static void
-whereami(name)
- char *name;
-{
- register char *cutoff = NULL; /* stifle -Wall */
- register char *s;
- register char *t;
- int cc;
- char ebuf[4096];
-
- /*
- * See if the file is accessible either through the current directory
- * or through an absolute path.
- */
-
- if (access(name, R_OK) == 0) {
-
- /*-------------------------------------------------------------*
- * The file was accessible without any other work. But the current
- * working directory might change on us, so if it was accessible
- * through the cwd, then we should get it for later accesses.
- *-------------------------------------------------------------*/
-
- t = imagedir;
- if (!absolute_pathname(name)) {
-#if defined(__DOS__) || defined(__WIN32__)
- int drive;
- char *newrbuf;
-
- newrbuf = imagedir;
-#ifndef __DJGPP__
- if (*(name + 1) == ':') {
- if (*name >= 'a' && *name <= 'z')
- drive = (int) (*name - 'a' + 1);
- else
- drive = (int) (*name - 'A' + 1);
- *newrbuf++ = *name;
- *newrbuf++ = *(name + 1);
- *newrbuf++ = DIR_SEPARATOR;
- }
- else {
- drive = 0;
- *newrbuf++ = DIR_SEPARATOR;
- }
- if (getcwd(newrbuf, drive) == 0) { /* } */
-#else
- if (getcwd(newrbuf, 1024) == 0) { /* } */
-#endif
-#else /* DOS */
-#ifdef HAVE_GETWD
- if (getwd(imagedir) == 0) { /* } */
-#else /* !HAVE_GETWD */
- if (getcwd(imagedir, 1024) == 0) {
-#endif /* !HAVE_GETWD */
-#endif /* DOS */
- fatal_error(FE_GETCWD, 0);
- }
- for (; *t; t++) /* Set t to end of buffer */
- ;
- if (*(t - 1) == DIR_SEPARATOR) /* leave slash if already
- * last char
- */
- cutoff = t - 1;
- else {
- cutoff = t; /* otherwise put one in */
- *t++ = DIR_SEPARATOR;
- }
- }
-#if (!defined(__MAC__) && !defined(__DJGPP__) && !defined(__GO32__) && !defined(__WIN32__))
- else
- (*t++ = DIR_SEPARATOR);
-#endif
-
- /*-------------------------------------------------------------*
- * Copy the rest of the string and set the cutoff if it was not
- * already set. If the first character of name is a slash, cutoff
- * is not presently set but will be on the first iteration of the
- * loop below.
- *-------------------------------------------------------------*/
-
- for ((*name == DIR_SEPARATOR ? (s = name+1) : (s = name));;) {
- if (*s == DIR_SEPARATOR)
- cutoff = t;
- if (!(*t++ = *s++))
- break;
- }
-
- }
- else {
-
- /*-------------------------------------------------------------*
- * Get the path list from the environment. If the path list is
- * inaccessible for any reason, leave with fatal error.
- *-------------------------------------------------------------*/
-
-#ifdef __MAC__
- if ((s = getenv("Commands")) == (char *) 0)
-#else
- if ((s = getenv("PATH")) == (char *) 0)
-#endif
- fatal_error(FE_PATH, 0);
-
- /*
- * Copy path list into ebuf and set the source pointer to the
- * beginning of this buffer.
- */
-
- strcpy(ebuf, s);
- s = ebuf;
-
- for (;;) {
- t = imagedir;
- while (*s && *s != PATH_SEPARATOR)
- *t++ = *s++;
- if (t > imagedir && *(t - 1) == DIR_SEPARATOR)
- ; /* do nothing -- slash already is in place */
- else
- *t++ = DIR_SEPARATOR; /* put in the slash */
- cutoff = t - 1; /* set cutoff */
- strcpy(t, name);
- if (access(imagedir, R_OK) == 0)
- break;
-
- if (*s)
- s++; /* advance source pointer */
- else
- fatal_error(FE_INFND, 0);
- }
-
- }
-
- /*-------------------------------------------------------------*
- | At this point the full pathname should exist in imagedir and
- | cutoff should be set to the final slash. We must now determine
- | whether the file name is a symbolic link or not and chase it down
- | if it is. Note that we reuse ebuf for getting the link.
- *-------------------------------------------------------------*/
-
-#ifdef HAVE_SYMLINK
- while ((cc = readlink(imagedir, ebuf, 512)) != -1) {
- ebuf[cc] = 0;
- s = ebuf;
- if (*s == DIR_SEPARATOR) {
- t = imagedir;
- }
- else {
- t = cutoff + 1;
- }
- for (;;) {
- if (*s == DIR_SEPARATOR)
- cutoff = t; /* mark the last slash seen */
- if (!(*t++ = *s++)) /* copy the character */
- break;
- }
- }
-
-#endif /* HAVE_SYMLINK */
-
- strcpy(imagename, cutoff + 1); /* keep the image name */
- *(cutoff + 1) = 0; /* chop off the filename part */
-}
-
-#endif
-
-#if wxUSE_GUI
+}
// ----------------------------------------------------------------------------
// GUI helpers
int wxMessageBox(const wxString& message, const wxString& caption, long style,
wxWindow *parent, int WXUNUSED(x), int WXUNUSED(y) )
{
- wxMessageDialog dialog(parent, message, caption, style);
+ long decorated_style = style;
+
+ if ( ( style & ( wxICON_EXCLAMATION | wxICON_HAND | wxICON_INFORMATION | wxICON_QUESTION ) ) == 0 )
+ {
+ decorated_style |= ( style & wxYES ) ? wxICON_QUESTION : wxICON_INFORMATION ;
+ }
+
+ wxMessageDialog dialog(parent, message, caption, decorated_style);
int ans = dialog.ShowModal();
switch ( ans )
wxString wxGetTextFromUser(const wxString& message, const wxString& caption,
const wxString& defaultValue, wxWindow *parent,
- int x, int y, bool WXUNUSED(centre) )
+ wxCoord x, wxCoord y, bool centre )
{
wxString str;
- wxTextEntryDialog dialog(parent, message, caption, defaultValue, wxOK|wxCANCEL, wxPoint(x, y));
+ long style = wxTextEntryDialogStyle;
+
+ if (centre)
+ style |= wxCENTRE;
+ else
+ style &= ~wxCENTRE;
+
+ wxTextEntryDialog dialog(parent, message, caption, defaultValue, style, wxPoint(x, y));
+
if (dialog.ShowModal() == wxID_OK)
{
str = dialog.GetValue();
wxString wxGetPasswordFromUser(const wxString& message,
const wxString& caption,
const wxString& defaultValue,
- wxWindow *parent)
+ wxWindow *parent,
+ wxCoord x, wxCoord y, bool centre )
{
wxString str;
- wxTextEntryDialog dialog(parent, message, caption, defaultValue,
- wxOK | wxCANCEL | wxTE_PASSWORD);
+ long style = wxTextEntryDialogStyle;
+
+ if (centre)
+ style |= wxCENTRE;
+ else
+ style &= ~wxCENTRE;
+
+ wxPasswordEntryDialog dialog(parent, message, caption, defaultValue,
+ style, wxPoint(x, y));
if ( dialog.ShowModal() == wxID_OK )
{
str = dialog.GetValue();
#if wxUSE_COLOURDLG
-wxColour wxGetColourFromUser(wxWindow *parent, const wxColour& colInit)
+wxColour wxGetColourFromUser(wxWindow *parent, const wxColour& colInit, const wxString& caption)
{
wxColourData data;
- data.SetChooseFull(TRUE);
+ data.SetChooseFull(true);
if ( colInit.Ok() )
{
data.SetColour((wxColour &)colInit); // const_cast
wxColour colRet;
wxColourDialog dialog(parent, &data);
+ if (!caption.empty())
+ dialog.SetTitle(caption);
if ( dialog.ShowModal() == wxID_OK )
{
colRet = dialog.GetColourData().GetColour();
#if wxUSE_FONTDLG
-wxFont wxGetFontFromUser(wxWindow *parent, const wxFont& fontInit)
+wxFont wxGetFontFromUser(wxWindow *parent, const wxFont& fontInit, const wxString& caption)
{
wxFontData data;
if ( fontInit.Ok() )
wxFont fontRet;
wxFontDialog dialog(parent, data);
+ if (!caption.empty())
+ dialog.SetTitle(caption);
if ( dialog.ShowModal() == wxID_OK )
{
fontRet = dialog.GetFontData().GetChosenFont();
}
#endif // wxUSE_FONTDLG
-// ----------------------------------------------------------------------------
-// missing C RTL functions (FIXME shouldn't be here at all)
-// ----------------------------------------------------------------------------
-
-#if defined( __MWERKS__ ) && !defined(__MACH__)
-char *strdup(const char *s)
-{
- return strcpy( (char*) malloc( strlen( s ) + 1 ) , s ) ;
-}
-int isascii( int c )
-{
- return ( c >= 0 && c < 128 ) ;
-}
-#endif // __MWERKS__
// ----------------------------------------------------------------------------
// wxSafeYield and supporting functions
void wxEnableTopLevelWindows(bool enable)
{
- wxWindowList::Node *node;
+ wxWindowList::compatibility_iterator node;
for ( node = wxTopLevelWindows.GetFirst(); node; node = node->GetNext() )
node->GetData()->Enable(enable);
}
// don't reenable them later
m_winDisabled = NULL;
- wxWindowList::Node *node;
+ wxWindowList::compatibility_iterator node;
for ( node = wxTopLevelWindows.GetFirst(); node; node = node->GetNext() )
{
wxWindow *winTop = node->GetData();
if ( winTop == winToSkip )
continue;
- if ( winTop->IsEnabled() )
+ // we don't need to disable the hidden or already disabled windows
+ if ( winTop->IsEnabled() && winTop->IsShown() )
{
winTop->Disable();
}
wxWindowDisabler::~wxWindowDisabler()
{
- wxWindowList::Node *node;
+ wxWindowList::compatibility_iterator node;
for ( node = wxTopLevelWindows.GetFirst(); node; node = node->GetNext() )
{
wxWindow *winTop = node->GetData();
return rc;
}
-// ----------------------------------------------------------------------------
-// misc functions
-// ----------------------------------------------------------------------------
-
// Don't synthesize KeyUp events holding down a key and producing KeyDown
// events with autorepeat. On by default and always on in wxMSW. wxGTK version
// in utilsgtk.cpp.
#ifndef __WXGTK__
bool wxSetDetectableAutoRepeat( bool WXUNUSED(flag) )
{
- return TRUE; // detectable auto-repeat is the only mode MSW supports
+ return true; // detectable auto-repeat is the only mode MSW supports
}
#endif // !wxGTK
#endif // wxUSE_GUI
-
-const wxChar *wxGetInstallPrefix()
-{
- wxString prefix;
-
- if ( wxGetEnv(wxT("WXPREFIX"), &prefix) )
- return prefix.c_str();
-
-#ifdef wxINSTALL_PREFIX
- return wxT(wxINSTALL_PREFIX);
-#else
- return wxT("");
-#endif
-}
-
-wxString wxGetDataDir()
-{
- wxString format = wxGetInstallPrefix();
- format << wxFILE_SEP_PATH
- << wxT("share") << wxFILE_SEP_PATH
- << wxT("wx") << wxFILE_SEP_PATH
- << wxT("%i.%i");
- wxString dir;
- dir.Printf(format.c_str(), wxMAJOR_VERSION, wxMINOR_VERSION);
- return dir;
-}
-
-
-// ----------------------------------------------------------------------------
-// network and user id functions
-// ----------------------------------------------------------------------------
-
-// Get Full RFC822 style email address
-bool wxGetEmailAddress(wxChar *address, int maxSize)
-{
- wxString email = wxGetEmailAddress();
- if ( !email )
- return FALSE;
-
- wxStrncpy(address, email, maxSize - 1);
- address[maxSize - 1] = wxT('\0');
-
- return TRUE;
-}
-
-wxString wxGetEmailAddress()
-{
- wxString email;
-
- wxString host = wxGetFullHostName();
- if ( !!host )
- {
- wxString user = wxGetUserId();
- if ( !!user )
- {
- email << user << wxT('@') << host;
- }
- }
-
- return email;
-}
-
-wxString wxGetUserId()
-{
- static const int maxLoginLen = 256; // FIXME arbitrary number
-
- wxString buf;
- bool ok = wxGetUserId(buf.GetWriteBuf(maxLoginLen), maxLoginLen);
- buf.UngetWriteBuf();
-
- if ( !ok )
- buf.Empty();
-
- return buf;
-}
-
-wxString wxGetUserName()
-{
- static const int maxUserNameLen = 1024; // FIXME arbitrary number
-
- wxString buf;
- bool ok = wxGetUserName(buf.GetWriteBuf(maxUserNameLen), maxUserNameLen);
- buf.UngetWriteBuf();
-
- if ( !ok )
- buf.Empty();
-
- return buf;
-}
-
-wxString wxGetHostName()
-{
- static const size_t hostnameSize = 257;
-
- wxString buf;
- bool ok = wxGetHostName(buf.GetWriteBuf(hostnameSize), hostnameSize);
-
- buf.UngetWriteBuf();
-
- if ( !ok )
- buf.Empty();
-
- return buf;
-}
-
-wxString wxGetFullHostName()
-{
- static const size_t hostnameSize = 257;
-
- wxString buf;
- bool ok = wxGetFullHostName(buf.GetWriteBuf(hostnameSize), hostnameSize);
-
- buf.UngetWriteBuf();
-
- if ( !ok )
- buf.Empty();
-
- return buf;
-}
-
-wxString wxGetHomeDir()
-{
- wxString home;
- wxGetHomeDir(&home);
-
- return home;
-}
-
-#if 0
-
-wxString wxGetCurrentDir()
-{
- wxString dir;
- size_t len = 1024;
- bool ok;
- do
- {
- ok = getcwd(dir.GetWriteBuf(len + 1), len) != NULL;
- dir.UngetWriteBuf();
-
- if ( !ok )
- {
- if ( errno != ERANGE )
- {
- wxLogSysError(_T("Failed to get current directory"));
-
- return wxEmptyString;
- }
- else
- {
- // buffer was too small, retry with a larger one
- len *= 2;
- }
- }
- //else: ok
- } while ( !ok );
-
- return dir;
-}
-
-#endif // 0
-
-// ----------------------------------------------------------------------------
-// wxExecute
-// ----------------------------------------------------------------------------
-
-// wxDoExecuteWithCapture() helper: reads an entire stream into one array
-//
-// returns TRUE if ok, FALSE if error
-#if wxUSE_STREAMS
-static bool ReadAll(wxInputStream *is, wxArrayString& output)
-{
- wxCHECK_MSG( is, FALSE, _T("NULL stream in wxExecute()?") );
-
- // the stream could be already at EOF or in wxSTREAM_BROKEN_PIPE state
- is->Reset();
-
- wxTextInputStream tis(*is);
-
- bool cont = TRUE;
- while ( cont )
- {
- wxString line = tis.ReadLine();
- if ( is->Eof() )
- break;
-
- if ( !*is )
- {
- cont = FALSE;
- }
- else
- {
- output.Add(line);
- }
- }
-
- return cont;
-}
-#endif // wxUSE_STREAMS
-
-// this is a private function because it hasn't a clean interface: the first
-// array is passed by reference, the second by pointer - instead we have 2
-// public versions of wxExecute() below
-static long wxDoExecuteWithCapture(const wxString& command,
- wxArrayString& output,
- wxArrayString* error)
-{
-#ifdef __WIN16__
- wxFAIL_MSG("Sorry, this version of wxExecute not implemented on WIN16.");
-
- return 0;
-#else // !Win16
- // create a wxProcess which will capture the output
- wxProcess *process = new wxProcess;
- process->Redirect();
-
- long rc = wxExecute(command, wxEXEC_SYNC, process);
-
-#if wxUSE_STREAMS
- if ( rc != -1 )
- {
- if ( !ReadAll(process->GetInputStream(), output) )
- rc = -1;
-
- if ( error )
- {
- if ( !ReadAll(process->GetErrorStream(), *error) )
- rc = -1;
- }
-
- }
-#endif // wxUSE_STREAMS
-
- delete process;
-
- return rc;
-#endif // IO redirection supoprted
-}
-
-long wxExecute(const wxString& command, wxArrayString& output)
-{
- return wxDoExecuteWithCapture(command, output, NULL);
-}
-
-long wxExecute(const wxString& command,
- wxArrayString& output,
- wxArrayString& error)
-{
- return wxDoExecuteWithCapture(command, output, &error);
-}
-
-// ----------------------------------------------------------------------------
-// wxApp::Yield() wrappers for backwards compatibility
-// ----------------------------------------------------------------------------
-
-bool wxYield()
-{
-#if wxUSE_GUI
- return wxTheApp && wxTheApp->Yield();
-#else
- return FALSE;
-#endif
-}
-
-bool wxYieldIfNeeded()
-{
-#if wxUSE_GUI
- return wxTheApp && wxTheApp->Yield(TRUE);
-#else
- return FALSE;
-#endif
-}
-
projects / wxWidgets.git / blobdiff