// Licence: wxWindows license
/////////////////////////////////////////////////////////////////////////////
+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+
#ifdef __GNUG__
-#pragma implementation "utils.h"
+ #pragma implementation "utils.h"
#endif
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#ifdef __BORLANDC__
-#pragma hdrstop
+ #pragma hdrstop
#endif
#ifndef WX_PRECOMP
-#include "wx/defs.h"
-#include "wx/utils.h"
-#include "wx/window.h"
-#include "wx/menu.h"
-#include "wx/frame.h"
-#include "wx/msgdlg.h"
-#include "wx/textdlg.h"
-#endif
-
-#include "wx/ioswrap.h"
-
-#if wxUSE_IOSTREAMH
- #include <fstream.h>
-#else
- #include <fstream>
+ #include "wx/defs.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"
+ #include "wx/msgdlg.h"
+ #include "wx/textdlg.h"
+ #include "wx/textctrl.h" // for wxTE_PASSWORD
+ #if wxUSE_ACCEL
+ #include "wx/menuitem.h"
+ #include "wx/accel.h"
+ #endif // wxUSE_ACCEL
+ #endif // wxUSE_GUI
+#endif // WX_PRECOMP
+
+#ifndef __WIN16__
+#include "wx/process.h"
+#include "wx/txtstrm.h"
#endif
#include <ctype.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
+
#if !defined(__WATCOMC__)
#if !(defined(_MSC_VER) && (_MSC_VER > 800))
#include <errno.h>
#endif
#endif
+
+#if wxUSE_GUI
+ #include "wx/colordlg.h"
+ #include "wx/notebook.h"
+ #include "wx/frame.h"
+ #include "wx/statusbr.h"
+ #include "wx/toolbar.h"
+#endif // wxUSE_GUI
+
#include <time.h>
+
#ifndef __MWERKS__
-#include <sys/types.h>
-#include <sys/stat.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
#endif
#ifdef __SALFORDC__
-#include <clib.h>
-#endif
-
-// Pattern matching code.
-// Yes, this path is deliberate (for Borland compilation)
-#ifdef wx_mac /* MATTHEW: [5] Mac doesn't like paths with "/" */
-#include "glob.inc"
-#else
-#include "../common/glob.inc"
+ #include <clib.h>
#endif
#ifdef __WXMSW__
-#include "windows.h"
+ #include "wx/msw/private.h"
#endif
-#define _MAXPATHLEN 500
+// ----------------------------------------------------------------------------
+// function protoypes
+// ----------------------------------------------------------------------------
+
+#if wxUSE_GUI
+ static wxWindow *wxFindWindowByLabel1(const wxString& title, wxWindow *parent);
+ static wxWindow *wxFindWindowByName1 (const wxString& title, wxWindow *parent);
+#endif // wxUSE_GUI
-extern wxChar *wxBuffer;
+// ============================================================================
+// implementation
+// ============================================================================
// ----------------------------------------------------------------------------
-// private functions
+// string functions
// ----------------------------------------------------------------------------
-static wxWindow *wxFindWindowByLabel1(const wxString& title, wxWindow * parent);
-static wxWindow *wxFindWindowByName1 (const wxString& title, wxWindow * parent);
-
-#ifdef __WXMAC__
+#if defined(__WXMAC__) && !defined(__DARWIN__)
int strcasecmp(const char *str_1, const char *str_2)
{
register char c1, c2;
return 0 ;
}
-#endif
-#ifdef __VMS__
+#endif // __WXMAC__ && !__DARWIN__
+
+#if defined( __VMS__ ) && ( __VMS_VER < 70000000 )
// we have no strI functions under VMS, therefore I have implemented
// an inefficient but portable version: convert copies of strings to lowercase
// and then use the normal comparison
myLowerString(temp1);
myLowerString(temp2);
- int result = strcmp(temp1,temp2);
+ int result = wxStrcmp(temp1,temp2);
delete[] temp1;
delete[] temp2;
return(result);
}
-#endif
+#endif // __VMS__
-#ifdef __WINDOWS__
+#if defined(__WINDOWS__) && !defined(__WXMICROWIN__)
#ifndef __GNUWIN32__
#ifndef __MWERKS__
#endif
#else
+
+#ifdef __EMX__
+#define strcasecmp stricmp
+#define strncasecmp strnicmp
+#endif
+
// This declaration is missing in SunOS!
// (Yes, I know it is NOT ANSI-C but its in BSD libc)
#if defined(__xlC) || defined(__AIX__) || defined(__GNUG__)
#endif
#endif /* __WXMSW__ */
+#ifdef __WXPM__
+#define strcasecmp stricmp
+#define strncasecmp strnicmp
+#endif
+
+#ifdef __WATCOMC__
+#define strcasecmp stricmp
+#define strncasecmp strnicmp
+#endif
wxChar *
copystring (const wxChar *s)
{
- if (s == NULL) s = _T("");
+ if (s == NULL) s = wxT("");
size_t len = wxStrlen (s) + 1;
wxChar *news = new wxChar[len];
}
void
-StringToFloat (wxChar *s, float *number)
+StringToFloat (const wxChar *s, float *number)
{
if (s && *s && number)
*number = (float) wxStrtod (s, (wxChar **) NULL);
}
void
-StringToDouble (wxChar *s, double *number)
+StringToDouble (const wxChar *s, double *number)
{
if (s && *s && number)
*number = wxStrtod (s, (wxChar **) NULL);
{
static wxChar buf[256];
-// sprintf (buf, "%.2f", number);
wxSprintf (buf, fmt, number);
return buf;
}
}
void
-StringToInt (wxChar *s, int *number)
+StringToInt (const wxChar *s, int *number)
{
if (s && *s && number)
*number = (int) wxStrtol (s, (wxChar **) NULL, 10);
}
void
-StringToLong (wxChar *s, long *number)
+StringToLong (const wxChar *s, long *number)
{
if (s && *s && number)
*number = wxStrtol (s, (wxChar **) NULL, 10);
{
static wxChar buf[20];
- wxSprintf (buf, _T("%d"), number);
+ wxSprintf (buf, wxT("%d"), number);
return buf;
}
{
static wxChar buf[20];
- wxSprintf (buf, _T("%ld"), number);
+ wxSprintf (buf, wxT("%ld"), number);
return buf;
}
// Array used in DecToHex conversion routine.
-static wxChar hexArray[] = _T("0123456789ABCDEF");
+static wxChar hexArray[] = wxT("0123456789ABCDEF");
// Convert 2-digit hex number to decimal
int wxHexToDec(const wxString& buf)
{
int firstDigit, secondDigit;
- if (buf.GetChar(0) >= _T('A'))
- firstDigit = buf.GetChar(0) - _T('A') + 10;
+ if (buf.GetChar(0) >= wxT('A'))
+ firstDigit = buf.GetChar(0) - wxT('A') + 10;
else
- firstDigit = buf.GetChar(0) - _T('0');
+ firstDigit = buf.GetChar(0) - wxT('0');
- if (buf.GetChar(1) >= _T('A'))
- secondDigit = buf.GetChar(1) - _T('A') + 10;
+ if (buf.GetChar(1) >= wxT('A'))
+ secondDigit = buf.GetChar(1) - wxT('A') + 10;
else
- secondDigit = buf.GetChar(1) - _T('0');
+ secondDigit = buf.GetChar(1) - wxT('0');
- return firstDigit * 16 + secondDigit;
+ return (firstDigit & 0xF) * 16 + (secondDigit & 0xF );
}
// Convert decimal integer to 2-character hex string
// Match a string INDEPENDENT OF CASE
bool
-StringMatch (char *str1, char *str2, bool subString, bool exact)
+StringMatch (const char *str1, const char *str2, bool subString, bool exact)
{
if (str1 == NULL || str2 == NULL)
return FALSE;
// Return the current date/time
// [volatile]
-wxString wxNow( void )
+wxString wxNow()
{
time_t now = time((time_t *) NULL);
char *date = ctime(&now);
return wxString(date);
}
-/*
- * Strip out any menu codes
- */
+#if wxUSE_GUI
+
+#if wxUSE_MENUS
+
+// ----------------------------------------------------------------------------
+// Menu accelerators related functions
+// ----------------------------------------------------------------------------
-wxChar *wxStripMenuCodes (wxChar *in, wxChar *out)
+wxChar *wxStripMenuCodes(const wxChar *in, wxChar *out)
{
- if (!in)
- return (wxChar *) NULL;
+ wxString s = wxMenuItem::GetLabelFromText(in);
+ if ( out )
+ {
+ // go smash their buffer if it's not big enough - I love char * params
+ memcpy(out, s.c_str(), s.length() * sizeof(wxChar));
+ }
+ else
+ {
+ out = copystring(s);
+ }
+
+ return out;
+}
- if (!out)
- out = copystring(in);
+wxString wxStripMenuCodes(const wxString& in)
+{
+ wxString out;
- wxChar *tmpOut = out;
+ size_t len = in.length();
+ out.reserve(len);
- while (*in)
+ for ( size_t n = 0; n < len; n++ )
{
- if (*in == _T('&'))
+ wxChar ch = in[n];
+ if ( ch == _T('&') )
{
- // Check && -> &, &x -> x
- if (*++in == _T('&'))
- *out++ = *in++;
+ // 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
+ // can't be the last character of the string
+ if ( ++n == len )
+ {
+ wxLogDebug(_T("Invalid menu string '%s'"), in.c_str());
+ }
+ else
+ {
+ // use the next char instead
+ ch = in[n];
+ }
}
- else if (*in == _T('\t'))
+ else if ( ch == _T('\t') )
{
- // Remove all stuff after \t in X mode, and let the stuff as is
- // in Windows mode.
- // Accelerators are handled in wx_item.cc for Motif, and are not
- // YET supported in XView
- break;
+ // everything after TAB is accel string, exit the loop
+ break;
}
- else
- *out++ = *in++;
- } // while
- *out = _T('\0');
+ out += ch;
+ }
- return tmpOut;
+ return out;
}
-wxString wxStripMenuCodes(const wxString& str)
-{
- wxChar *buf = new wxChar[str.Length() + 1];
- wxStripMenuCodes(WXSTRINGCAST str, buf);
- wxString str1(buf);
- delete[] buf;
- return str1;
-}
+#endif // wxUSE_MENUS
-/*
- * Window search functions
- *
- */
+// ----------------------------------------------------------------------------
+// Window search functions
+// ----------------------------------------------------------------------------
/*
* If parent is non-NULL, look through children for a label or title
int
wxFindMenuItemId (wxFrame * frame, const wxString& menuString, const wxString& itemString)
{
+#if wxUSE_MENUS
wxMenuBar *menuBar = frame->GetMenuBar ();
- if (!menuBar)
- return -1;
- return menuBar->FindMenuItem (menuString, itemString);
+ if ( menuBar )
+ return menuBar->FindMenuItem (menuString, itemString);
+#endif // wxUSE_MENUS
+
+ return -1;
}
+// Try to find the deepest child that contains 'pt'.
+// We go backwards, to try to allow for controls that are spacially
+// within other controls, but are still siblings (e.g. buttons within
+// static boxes). Static boxes are likely to be created _before_ controls
+// that sit inside them.
+wxWindow* wxFindWindowAtPoint(wxWindow* win, const wxPoint& pt)
+{
+ if (!win->IsShown())
+ return NULL;
+
+ // Hack for wxNotebook case: at least in wxGTK, all pages
+ // claim to be shown, so we must only deal with the selected one.
+#if wxUSE_NOTEBOOK
+ if (win->IsKindOf(CLASSINFO(wxNotebook)))
+ {
+ wxNotebook* nb = (wxNotebook*) win;
+ int sel = nb->GetSelection();
+ if (sel >= 0)
+ {
+ wxWindow* child = nb->GetPage(sel);
+ wxWindow* foundWin = wxFindWindowAtPoint(child, pt);
+ if (foundWin)
+ return foundWin;
+ }
+ }
+#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.First();
+ while (node)
+ {
+ wxWindow* child = (wxWindow*) node->Data();
+ wxWindow* foundWin = wxFindWindowAtPoint(child, pt);
+ if (foundWin)
+ return foundWin;
+ node = node->Next();
+ }
+ }
+ */
+
+ wxNode* node = win->GetChildren().Last();
+ while (node)
+ {
+ wxWindow* child = (wxWindow*) node->Data();
+ wxWindow* foundWin = wxFindWindowAtPoint(child, pt);
+ if (foundWin)
+ return foundWin;
+ node = node->Previous();
+ }
+
+ wxPoint pos = win->GetPosition();
+ wxSize sz = win->GetSize();
+ if (win->GetParent())
+ {
+ pos = win->GetParent()->ClientToScreen(pos);
+ }
+
+ wxRect rect(pos, sz);
+ if (rect.Inside(pt))
+ return win;
+ else
+ return NULL;
+}
+
+wxWindow* wxGenericFindWindowAtPoint(const wxPoint& pt)
+{
+ // Go backwards through the list since windows
+ // on top are likely to have been appended most
+ // recently.
+ wxNode* node = wxTopLevelWindows.Last();
+ while (node)
+ {
+ wxWindow* win = (wxWindow*) node->Data();
+ wxWindow* found = wxFindWindowAtPoint(win, pt);
+ if (found)
+ return found;
+ node = node->Previous();
+ }
+ return NULL;
+}
+
+#endif // wxUSE_GUI
+
/*
On Fri, 21 Jul 1995, Paul Craven wrote:
t = imagedir;
if (!absolute_pathname(name)) {
-#if defined(DOS) || defined(__WIN32__)
+#if defined(__DOS__) || defined(__WIN32__)
int drive;
char *newrbuf;
}
#endif
-void wxEnableTopLevelWindows(bool enable)
-{
- wxWindowList::Node *node;
- for ( node = wxTopLevelWindows.GetFirst(); node; node = node->GetNext() )
- node->GetData()->Enable(enable);
-}
-// Yield to other apps/messages and disable user input
-bool wxSafeYield(wxWindow *win)
-{
- wxEnableTopLevelWindows(FALSE);
- // always enable ourselves
- if ( win )
- win->Enable(TRUE);
- bool rc = wxYield();
- wxEnableTopLevelWindows(TRUE);
- return rc;
-}
+#if wxUSE_GUI
+
+// ----------------------------------------------------------------------------
+// GUI helpers
+// ----------------------------------------------------------------------------
/*
* N.B. these convenience functions must be separate from msgdlgg.cpp, textdlgg.cpp
* since otherwise the generic code may be pulled in unnecessarily.
*/
+#if wxUSE_MSGDLG
+
int wxMessageBox(const wxString& message, const wxString& caption, long style,
wxWindow *parent, int WXUNUSED(x), int WXUNUSED(y) )
{
{
case wxID_OK:
return wxOK;
- break;
case wxID_YES:
return wxYES;
- break;
case wxID_NO:
return wxNO;
- break;
- default:
case wxID_CANCEL:
return wxCANCEL;
- break;
}
- return ans;
+
+ wxFAIL_MSG( _T("unexpected return code from wxMessageDialog") );
+
+ return wxCANCEL;
}
+#endif // wxUSE_MSGDLG
+
+#if wxUSE_TEXTDLG
+
wxString wxGetTextFromUser(const wxString& message, const wxString& caption,
const wxString& defaultValue, wxWindow *parent,
int x, int y, bool WXUNUSED(centre) )
{
+ wxString str;
wxTextEntryDialog dialog(parent, message, caption, defaultValue, wxOK|wxCANCEL, wxPoint(x, y));
if (dialog.ShowModal() == wxID_OK)
- return dialog.GetValue();
- else
- return wxString("");
+ {
+ str = dialog.GetValue();
+ }
+
+ return str;
}
+wxString wxGetPasswordFromUser(const wxString& message,
+ const wxString& caption,
+ const wxString& defaultValue,
+ wxWindow *parent)
+{
+ wxString str;
+ wxTextEntryDialog dialog(parent, message, caption, defaultValue,
+ wxOK | wxCANCEL | wxTE_PASSWORD);
+ if ( dialog.ShowModal() == wxID_OK )
+ {
+ str = dialog.GetValue();
+ }
+
+ return str;
+}
+
+#endif // wxUSE_TEXTDLG
+
+#if wxUSE_COLOURDLG
+
+wxColour wxGetColourFromUser(wxWindow *parent, const wxColour& colInit)
+{
+ wxColourData data;
+ data.SetChooseFull(TRUE);
+ if ( colInit.Ok() )
+ {
+ data.SetColour((wxColour &)colInit); // const_cast
+ }
+
+ wxColour colRet;
+ wxColourDialog dialog(parent, &data);
+ if ( dialog.ShowModal() == wxID_OK )
+ {
+ colRet = dialog.GetColourData().GetColour();
+ }
+ //else: leave it invalid
+
+ return colRet;
+}
+
+#endif // wxUSE_COLOURDLG
+
+// ----------------------------------------------------------------------------
+// missing C RTL functions (FIXME shouldn't be here at all)
+// ----------------------------------------------------------------------------
+
#ifdef __MWERKS__
char *strdup(const char *s)
{
{
return ( c >= 0 && c < 128 ) ;
}
+#endif // __MWERKS__
+
+// ----------------------------------------------------------------------------
+// wxSafeYield and supporting functions
+// ----------------------------------------------------------------------------
+
+void wxEnableTopLevelWindows(bool enable)
+{
+ wxWindowList::Node *node;
+ for ( node = wxTopLevelWindows.GetFirst(); node; node = node->GetNext() )
+ node->GetData()->Enable(enable);
+}
+
+wxWindowDisabler::wxWindowDisabler(wxWindow *winToSkip)
+{
+ // remember the top level windows which were already disabled, so that we
+ // don't reenable them later
+ m_winDisabled = NULL;
+
+ wxWindowList::Node *node;
+ for ( node = wxTopLevelWindows.GetFirst(); node; node = node->GetNext() )
+ {
+ wxWindow *winTop = node->GetData();
+ if ( winTop == winToSkip )
+ continue;
+
+ if ( winTop->IsEnabled() )
+ {
+ winTop->Disable();
+ }
+ else
+ {
+ if ( !m_winDisabled )
+ {
+ m_winDisabled = new wxWindowList;
+ }
+
+ m_winDisabled->Append(winTop);
+ }
+ }
+}
+
+wxWindowDisabler::~wxWindowDisabler()
+{
+ wxWindowList::Node *node;
+ for ( node = wxTopLevelWindows.GetFirst(); node; node = node->GetNext() )
+ {
+ wxWindow *winTop = node->GetData();
+ if ( !m_winDisabled || !m_winDisabled->Find(winTop) )
+ {
+ winTop->Enable();
+ }
+ //else: had been already disabled, don't reenable
+ }
+
+ delete m_winDisabled;
+}
+
+// Yield to other apps/messages and disable user input to all windows except
+// the given one
+bool wxSafeYield(wxWindow *win)
+{
+ wxWindowDisabler wd(win);
+
+ bool rc = wxYield();
+
+ 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
+}
+#endif // !wxGTK
+
+#endif // wxUSE_GUI
+
+const wxChar *wxGetInstallPrefix()
+{
+ wxString prefix;
+
+ if ( wxGetEnv(wxT("WX_PREFIX"), &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
return FALSE;
wxStrncpy(address, email, maxSize - 1);
- address[maxSize - 1] = _T('\0');
+ address[maxSize - 1] = wxT('\0');
return TRUE;
}
{
wxString email;
- wxString host = wxGetHostName();
+ wxString host = wxGetFullHostName();
if ( !!host )
{
wxString user = wxGetUserId();
if ( !!user )
{
- wxString email(user);
- email << _T('@') << host;
+ email << user << wxT('@') << host;
}
}
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
+// ----------------------------------------------------------------------------
+
+// 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, TRUE /* sync */, process);
+
+#if wxUSE_STREAMS
+ if ( rc != -1 )
+ {
+ wxInputStream* is = process->GetInputStream();
+ wxCHECK_MSG( is, -1, _T("if wxExecute() succeded, stream can't be NULL") );
+ wxTextInputStream tis(*is);
+
+ wxTextInputStream *tes = NULL;
+ wxInputStream *es = NULL;
+ if ( error )
+ {
+ es = process->GetErrorStream();
+
+ wxCHECK_MSG( es, -1, _T("stderr can't be NULL") );
+
+ tes = new wxTextInputStream(*es);
+ }
+
+ bool cont;
+ do
+ {
+ cont = FALSE;
+
+ if ( !is->Eof() && is->IsOk() )
+ {
+ wxString line = tis.ReadLine();
+ if ( is->LastError() )
+ break;
+
+ cont = TRUE;
+
+ output.Add(line);
+ }
+
+ if ( error && !es->Eof() && es->IsOk() )
+ {
+ wxString line = tes->ReadLine();
+ if ( es->LastError() )
+ break;
+
+ cont = TRUE;
+
+ error->Add(line);
+ }
+ }
+ while ( cont );
+
+ delete tes;
+ }
+#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