X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5600884ab7b33df1ba37cf488e6035d2228c3e56..8adb5d455797d5b656ef677c74359e5a578b539f:/src/common/utilscmn.cpp diff --git a/src/common/utilscmn.cpp b/src/common/utilscmn.cpp index 9bc2b497f7..93aa19f675 100644 --- a/src/common/utilscmn.cpp +++ b/src/common/utilscmn.cpp @@ -6,7 +6,7 @@ // Created: 29/01/98 // RCS-ID: $Id$ // Copyright: (c) 1998 Julian Smart -// Licence: wxWindows license +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// // ============================================================================ @@ -36,11 +36,13 @@ #include "wx/log.h" #if wxUSE_GUI + #include "wx/app.h" #include "wx/window.h" - #include "wx/menu.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" @@ -60,42 +62,16 @@ #if !defined(__WATCOMC__) #if !(defined(_MSC_VER) && (_MSC_VER > 800)) - // - // OS/2's App.h is being included first which includes nerrno.h - // so these are already defined. Undef them if defined before - // including errno.h - // - #ifdef EEXIST - #undef EEXIST - #endif - #ifdef ENOENT - #undef ENOENT - #endif - #ifdef EMFILE - #undef EMFILE - #endif - #ifdef EINTR - #undef EINTR - #endif - #ifdef EINVAL - #undef EINVAL - #endif - #ifdef ENOMEM - #undef ENOMEM - #endif - #ifdef EACCES - #undef EACCES - #endif #include #endif #endif #if wxUSE_GUI #include "wx/colordlg.h" + #include "wx/fontdlg.h" #include "wx/notebook.h" #include "wx/frame.h" #include "wx/statusbr.h" - #include "wx/toolbar.h" #endif // wxUSE_GUI #include @@ -114,133 +90,18 @@ #endif // ---------------------------------------------------------------------------- -// function protoypes +// common data // ---------------------------------------------------------------------------- -#if wxUSE_GUI - static wxWindow *wxFindWindowByLabel1(const wxString& title, wxWindow *parent); - static wxWindow *wxFindWindowByName1 (const wxString& title, wxWindow *parent); -#endif // wxUSE_GUI +#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 // ============================================================================ -// ---------------------------------------------------------------------------- -// string functions -// ---------------------------------------------------------------------------- - -#ifdef __WXMAC__ -int strcasecmp(const char *str_1, const char *str_2) -{ - register char c1, c2; - do { - c1 = tolower(*str_1++); - c2 = tolower(*str_2++); - } while ( c1 && (c1 == c2) ); - - return c1 - c2; -} - -int strncasecmp(const char *str_1, const char *str_2, size_t maxchar) -{ - - register char c1, c2; - while( maxchar--) - { - c1 = tolower(*str_1++); - c2 = tolower(*str_2++); - - if ( !c1 || c1!=c2 ) - return c1 - c2; - - } ; - - return 0 ; - -} -#endif // wxMAC - -#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 -static void myLowerString(char *s) -{ - while(*s){ - if(isalpha(*s)) *s = (char)tolower(*s); - s++; - } -} - -int strcasecmp(const char *str_1, const char *str_2) -{ - char *temp1 = new char[strlen(str_1)+1]; - char *temp2 = new char[strlen(str_2)+1]; - strcpy(temp1,str_1); - strcpy(temp2,str_2); - myLowerString(temp1); - myLowerString(temp2); - - int result = wxStrcmp(temp1,temp2); - delete[] temp1; - delete[] temp2; - - return(result); -} - -int strncasecmp(const char *str_1, const char *str_2, size_t maxchar) -{ - char *temp1 = new char[strlen(str_1)+1]; - char *temp2 = new char[strlen(str_2)+1]; - strcpy(temp1,str_1); - strcpy(temp2,str_2); - myLowerString(temp1); - myLowerString(temp2); - - int result = strncmp(temp1,temp2,maxchar); - delete[] temp1; - delete[] temp2; - - return(result); -} -#endif // __VMS__ - -#ifdef __WINDOWS__ - -#ifndef __GNUWIN32__ -#ifndef __MWERKS__ -#define strcasecmp stricmp -#define strncasecmp strnicmp -#else -#define strcasecmp _stricmp -#define strncasecmp _strnicmp -#endif -#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__) -extern "C" -{ - int strcasecmp (const char *, const char *); - int strncasecmp (const char *, const char *, size_t); -} -#endif -#endif /* __WXMSW__ */ - -#ifdef __WXPM__ -#define strcasecmp stricmp -#define strncasecmp strnicmp -#endif - wxChar * copystring (const wxChar *s) { @@ -272,15 +133,24 @@ wxRegisterId (long id) wxCurrentId = id + 1; } +// ---------------------------------------------------------------------------- +// String <-> Number conversions (deprecated) +// ---------------------------------------------------------------------------- + +#if WXWIN_COMPATIBILITY_2_4 + +WXDLLEXPORT_DATA(const wxChar *) wxFloatToStringStr = wxT("%.2f"); +WXDLLEXPORT_DATA(const wxChar *) wxDoubleToStringStr = wxT("%.2f"); + 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); @@ -291,7 +161,6 @@ FloatToString (float number, const wxChar *fmt) { static wxChar buf[256]; -// sprintf (buf, "%.2f", number); wxSprintf (buf, fmt, number); return buf; } @@ -306,14 +175,14 @@ DoubleToString (double number, const wxChar *fmt) } 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); @@ -337,6 +206,8 @@ LongToString (long number) return buf; } +#endif // WXWIN_COMPATIBILITY_2_4 + // Array used in DecToHex conversion routine. static wxChar hexArray[] = wxT("0123456789ABCDEF"); @@ -376,9 +247,9 @@ wxString wxDecToHex(int dec) return wxString(buf); } -// Match a string INDEPENDENT OF CASE +#if WXWIN_COMPATIBILITY_2 bool -StringMatch (char *str1, char *str2, bool subString, bool exact) +StringMatch (const wxChar *str1, const wxChar *str2, bool subString, bool exact) { if (str1 == NULL || str2 == NULL) return FALSE; @@ -387,188 +258,108 @@ StringMatch (char *str1, char *str2, bool subString, bool exact) if (subString) { - int len1 = strlen (str1); - int len2 = strlen (str2); + int len1 = wxStrlen (str1); + int len2 = wxStrlen (str2); int i; // Search for str1 in str2 // Slow .... but acceptable for short strings for (i = 0; i <= len2 - len1; i++) { - if (strncasecmp (str1, str2 + i, len1) == 0) + if (wxStrnicmp (str1, str2 + i, len1) == 0) return TRUE; } } else if (exact) { - if (strcasecmp (str1, str2) == 0) + if (wxStricmp (str1, str2) == 0) return TRUE; } else { - int len1 = strlen (str1); - int len2 = strlen (str2); + int len1 = wxStrlen (str1); + int len2 = wxStrlen (str2); - if (strncasecmp (str1, str2, wxMin (len1, len2)) == 0) + if (wxStrnicmp (str1, str2, wxMin (len1, len2)) == 0) return TRUE; } return FALSE; } +#endif // Return the current date/time // [volatile] wxString wxNow() { - time_t now = time((time_t *) NULL); - char *date = ctime(&now); - date[24] = '\0'; - return wxString(date); + time_t now = time((time_t *) NULL); + char *date = ctime(&now); + date[24] = '\0'; + return wxString::FromAscii(date); } #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; - - if (!out) - out = copystring(in); - - wxChar *tmpOut = out; - - while (*in) + wxString s = wxMenuItem::GetLabelFromText(in); + if ( out ) { - if (*in == wxT('&')) - { - // Check && -> &, &x -> x - if (*++in == wxT('&')) - *out++ = *in++; - } - else if (*in == wxT('\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; - } - else - *out++ = *in++; - } // while - - *out = wxT('\0'); + // 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 tmpOut; + return out; } -wxString wxStripMenuCodes(const wxString& str) +wxString wxStripMenuCodes(const wxString& in) { - wxChar *buf = new wxChar[str.Length() + 1]; - wxStripMenuCodes(WXSTRINGCAST str, buf); - wxString str1(buf); - delete[] buf; - return str1; -} + wxString out; -#if wxUSE_ACCEL + size_t len = in.length(); + out.reserve(len); -// return wxAcceleratorEntry for the given menu string or NULL if none -// specified -wxAcceleratorEntry *wxGetAccelFromString(const wxString& label) -{ - // check for accelerators: they are given after '\t' - int posTab = label.Find(wxT('\t')); - if ( posTab != wxNOT_FOUND ) { - // parse the accelerator string - int keyCode = 0; - int accelFlags = wxACCEL_NORMAL; - wxString current; - for ( size_t n = (size_t)posTab + 1; n < label.Len(); n++ ) { - if ( (label[n] == '+') || (label[n] == '-') ) { - if ( current == _("ctrl") ) - accelFlags |= wxACCEL_CTRL; - else if ( current == _("alt") ) - accelFlags |= wxACCEL_ALT; - else if ( current == _("shift") ) - accelFlags |= wxACCEL_SHIFT; - else { - wxLogDebug(wxT("Unknown accel modifier: '%s'"), - current.c_str()); - } - - current.Empty(); + for ( size_t n = 0; n < len; n++ ) + { + wxChar ch = in[n]; + if ( 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 + // can't be the last character of the string + if ( ++n == len ) + { + wxLogDebug(_T("Invalid menu string '%s'"), in.c_str()); } - else { - current += wxTolower(label[n]); + else + { + // use the next char instead + ch = in[n]; } } - - if ( current.IsEmpty() ) { - wxLogDebug(wxT("No accel key found, accel string ignored.")); - } - else { - if ( current.Len() == 1 ) { - // it's a letter - keyCode = wxToupper(current[0U]); - } - else { - // is it a function key? - if ( current[0U] == 'f' && isdigit(current[1U]) && - (current.Len() == 2 || - (current.Len() == 3 && isdigit(current[2U]))) ) { - int n; - wxSscanf(current.c_str() + 1, wxT("%d"), &n); - - keyCode = WXK_F1 + n - 1; - } - else { - // several special cases - current.MakeUpper(); - if ( current == _("DEL") ) { - keyCode = WXK_DELETE; - } - else if ( current == _("DELETE") ) { - keyCode = WXK_DELETE; - } - else if ( current == _("INS") ) { - keyCode = WXK_INSERT; - } - else if ( current == _("INSERT") ) { - keyCode = WXK_INSERT; - } -#if 0 - else if ( current == _("PGUP") ) { - keyCode = VK_PRIOR; - } - else if ( current == _("PGDN") ) { - keyCode = VK_NEXT; - } -#endif - else - { - wxLogDebug(wxT("Unrecognized accel key '%s', accel string ignored."), - current.c_str()); - } - } - } + else if ( ch == _T('\t') ) + { + // everything after TAB is accel string, exit the loop + break; } - if ( keyCode ) { - // we do have something - return new wxAcceleratorEntry(accelFlags, keyCode); - } + out += ch; } - return (wxAcceleratorEntry *)NULL; + return out; } -#endif // wxUSE_ACCEL +#endif // wxUSE_MENUS // ---------------------------------------------------------------------------- // Window search functions @@ -583,52 +374,9 @@ wxAcceleratorEntry *wxGetAccelFromString(const wxString& label) wxWindow * wxFindWindowByLabel (const wxString& title, wxWindow * parent) { - if (parent) - { - return wxFindWindowByLabel1(title, parent); - } - else - { - for ( wxWindowList::Node * node = wxTopLevelWindows.GetFirst(); - node; - node = node->GetNext() ) - { - wxWindow *win = node->GetData(); - wxWindow *retwin = wxFindWindowByLabel1 (title, win); - if (retwin) - return retwin; - } // for() - - } - return (wxWindow *) NULL; + return wxWindow::FindWindowByLabel( title, parent ); } -// Recursive -static wxWindow * -wxFindWindowByLabel1 (const wxString& title, wxWindow * parent) -{ - if (parent) - { - if (parent->GetLabel() == title) - return parent; - } - - if (parent) - { - for ( wxWindowList::Node * node = parent->GetChildren().GetFirst(); - node; - node = node->GetNext() ) - { - wxWindow *win = (wxWindow *)node->GetData(); - wxWindow *retwin = wxFindWindowByLabel1 (title, win); - if (retwin) - return retwin; - } - - } - - return (wxWindow *) NULL; // Not found -} /* * If parent is non-NULL, look through children for a name @@ -637,64 +385,22 @@ wxFindWindowByLabel1 (const wxString& title, wxWindow * parent) */ wxWindow * -wxFindWindowByName (const wxString& title, wxWindow * parent) -{ - if (parent) - { - return wxFindWindowByName1 (title, parent); - } - else - { - for ( wxWindowList::Node * node = wxTopLevelWindows.GetFirst(); - node; - node = node->GetNext() ) - { - wxWindow *win = node->GetData(); - wxWindow *retwin = wxFindWindowByName1 (title, win); - if (retwin) - return retwin; - } - - } - - // Failed? Try by label instead. - return wxFindWindowByLabel(title, parent); -} - -// Recursive -static wxWindow * -wxFindWindowByName1 (const wxString& title, wxWindow * parent) +wxFindWindowByName (const wxString& name, wxWindow * parent) { - if (parent) - { - if ( parent->GetName() == title ) - return parent; - } - - if (parent) - { - for (wxNode * node = parent->GetChildren().First (); node; node = node->Next ()) - { - wxWindow *win = (wxWindow *) node->Data (); - wxWindow *retwin = wxFindWindowByName1 (title, win); - if (retwin) - return retwin; - } // for() - - } - - return (wxWindow *) NULL; // Not found - + return wxWindow::FindWindowByName( name, parent ); } // Returns menu item id or -1 if none. 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'. @@ -709,6 +415,7 @@ wxWindow* wxFindWindowAtPoint(wxWindow* win, const wxPoint& pt) // 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; @@ -721,6 +428,8 @@ wxWindow* wxFindWindowAtPoint(wxWindow* win, const wxPoint& pt) return foundWin; } } +#endif + /* Doesn't work // Frame case else if (win->IsKindOf(CLASSINFO(wxFrame))) @@ -733,10 +442,10 @@ wxWindow* wxFindWindowAtPoint(wxWindow* win, const wxPoint& pt) if (frame->GetToolBar()) extraChildren.Append(frame->GetToolBar()); - wxNode* node = extraChildren.First(); + wxNode* node = extraChildren.GetFirst(); while (node) { - wxWindow* child = (wxWindow*) node->Data(); + wxWindow* child = (wxWindow*) node->GetData(); wxWindow* foundWin = wxFindWindowAtPoint(child, pt); if (foundWin) return foundWin; @@ -745,14 +454,14 @@ wxWindow* wxFindWindowAtPoint(wxWindow* win, const wxPoint& pt) } */ - wxNode* node = win->GetChildren().Last(); + wxWindowList::Node *node = win->GetChildren().GetLast(); while (node) { - wxWindow* child = (wxWindow*) node->Data(); + wxWindow* child = node->GetData(); wxWindow* foundWin = wxFindWindowAtPoint(child, pt); if (foundWin) return foundWin; - node = node->Previous(); + node = node->GetPrevious(); } wxPoint pos = win->GetPosition(); @@ -774,14 +483,14 @@ 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(); + wxWindowList::Node *node = wxTopLevelWindows.GetLast(); while (node) { - wxWindow* win = (wxWindow*) node->Data(); + wxWindow* win = node->GetData(); wxWindow* found = wxFindWindowAtPoint(win, pt); if (found) return found; - node = node->Previous(); + node = node->GetPrevious(); } return NULL; } @@ -842,7 +551,7 @@ whereami(name) t = imagedir; if (!absolute_pathname(name)) { -#if defined(DOS) || defined(__WIN32__) +#if defined(__DOS__) || defined(__WIN32__) int drive; char *newrbuf; @@ -992,6 +701,8 @@ whereami(name) * 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) ) { @@ -1015,7 +726,10 @@ int wxMessageBox(const wxString& message, const wxString& caption, long style, 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) ) @@ -1048,36 +762,61 @@ wxString wxGetPasswordFromUser(const wxString& message, #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 - } + 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 + wxColour colRet; + wxColourDialog dialog(parent, &data); + if ( dialog.ShowModal() == wxID_OK ) + { + colRet = dialog.GetColourData().GetColour(); + } + //else: leave it invalid + + return colRet; +} + +#endif // wxUSE_COLOURDLG + +#if wxUSE_FONTDLG + +wxFont wxGetFontFromUser(wxWindow *parent, const wxFont& fontInit) +{ + wxFontData data; + if ( fontInit.Ok() ) + { + data.SetInitialFont(fontInit); + } + + wxFont fontRet; + wxFontDialog dialog(parent, data); + if ( dialog.ShowModal() == wxID_OK ) + { + fontRet = dialog.GetFontData().GetChosenFont(); + } + //else: leave it invalid - return colRet; + return fontRet; } +#endif // wxUSE_FONTDLG // ---------------------------------------------------------------------------- // missing C RTL functions (FIXME shouldn't be here at all) // ---------------------------------------------------------------------------- -#ifdef __MWERKS__ +#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 ) ; @@ -1142,11 +881,15 @@ wxWindowDisabler::~wxWindowDisabler() // Yield to other apps/messages and disable user input to all windows except // the given one -bool wxSafeYield(wxWindow *win) +bool wxSafeYield(wxWindow *win, bool onlyIfNeeded) { wxWindowDisabler wd(win); - bool rc = wxYield(); + bool rc; + if (onlyIfNeeded) + rc = wxYieldIfNeeded(); + else + rc = wxYield(); return rc; } @@ -1167,6 +910,33 @@ bool wxSetDetectableAutoRepeat( bool WXUNUSED(flag) ) #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 // ---------------------------------------------------------------------------- @@ -1305,6 +1075,40 @@ wxString wxGetCurrentDir() // 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 @@ -1321,56 +1125,20 @@ static long wxDoExecuteWithCapture(const wxString& command, wxProcess *process = new wxProcess; process->Redirect(); - long rc = wxExecute(command, TRUE /* sync */, process); + long rc = wxExecute(command, wxEXEC_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); + if ( !ReadAll(process->GetInputStream(), output) ) + rc = -1; - 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); - } + if ( !ReadAll(process->GetErrorStream(), *error) ) + rc = -1; } - while ( cont ); - delete tes; } #endif // wxUSE_STREAMS @@ -1391,3 +1159,26 @@ long wxExecute(const wxString& command, { 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 +} +