X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/cbc66a27047635e86fbba08043da831666d74f4a..748a3af8e74ce74fe143650af0b2da2534c70d45:/src/common/utilscmn.cpp diff --git a/src/common/utilscmn.cpp b/src/common/utilscmn.cpp index 13270f231b..49c15f3284 100644 --- a/src/common/utilscmn.cpp +++ b/src/common/utilscmn.cpp @@ -48,8 +48,10 @@ #endif // wxUSE_GUI #endif // WX_PRECOMP +#ifndef __WIN16__ #include "wx/process.h" #include "wx/txtstrm.h" +#endif #include #include @@ -496,23 +498,32 @@ wxAcceleratorEntry *wxGetAccelFromString(const wxString& label) keyCode = WXK_F1 + n - 1; } else { -#if 0 // this is not supported by GTK+, apparently // several special cases current.MakeUpper(); if ( current == wxT("DEL") ) { - keyCode = VK_DELETE; + keyCode = WXK_DELETE; + } + else if ( current == wxT("DELETE") ) { + keyCode = WXK_DELETE; + } + else if ( current == wxT("INS") ) { + keyCode = WXK_INSERT; + } + else if ( current == wxT("INSERT") ) { + keyCode = WXK_INSERT; } +#if 0 else if ( current == wxT("PGUP") ) { keyCode = VK_PRIOR; } else if ( current == wxT("PGDN") ) { keyCode = VK_NEXT; } +#endif else -#endif // 0 { - wxLogDebug(wxT("Unrecognized accel key '%s', accel " - "string ignored."), current.c_str()); + wxLogDebug(wxT("Unrecognized accel key '%s', accel string ignored."), + current.c_str()); } } } @@ -876,10 +887,13 @@ int wxMessageBox(const wxString& message, const wxString& caption, long style, return wxYES; case wxID_NO: return wxNO; - default: case wxID_CANCEL: return wxCANCEL; } + + wxFAIL_MSG( _T("unexpected return code from wxMessageDialog") ); + + return wxCANCEL; } #if wxUSE_TEXTDLG @@ -962,53 +976,42 @@ void wxEnableTopLevelWindows(bool enable) node->GetData()->Enable(enable); } -static void wxFindDisabledWindows(wxWindowList& winDisabled, - wxWindow *win, - wxWindow *winToSkip) -{ - wxWindowList::Node *node; - for ( node = win->GetChildren().GetFirst(); node; node = node->GetNext() ) - { - wxWindow *child = node->GetData(); - if ( child == winToSkip ) - continue; - - wxFindDisabledWindows(winDisabled, child, winToSkip); - - if ( child->IsEnabled() ) - { - winDisabled.Append(child); - child->Disable(); - } - } -} - wxWindowDisabler::wxWindowDisabler(wxWindow *winToSkip) { - // remember all windows we're going to (temporarily) disable - m_winDisabled = new wxWindowList; - #ifdef __WXMSW__ #ifdef __WIN32__ // and the top level window too HWND hwndFG = ::GetForegroundWindow(); m_winTop = hwndFG ? wxFindWinFromHandle((WXHWND)hwndFG) : (wxWindow *)NULL; #else - HWND hwndFG = ::GetTopWindow(); + HWND hwndFG = ::GetTopWindow(0); m_winTop = hwndFG ? wxFindWinFromHandle((WXHWND)hwndFG) : (wxWindow *)NULL; #endif #endif // MSW + // 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 && winTop->IsEnabled() ) + if ( winTop == winToSkip ) + continue; + + if ( winTop->IsEnabled() ) { - wxFindDisabledWindows(*m_winDisabled, winTop, winToSkip); + winTop->Disable(); + } + else + { + if ( !m_winDisabled ) + { + m_winDisabled = new wxWindowList; + } m_winDisabled->Append(winTop); - winTop->Disable(); } } } @@ -1016,9 +1019,14 @@ wxWindowDisabler::wxWindowDisabler(wxWindow *winToSkip) wxWindowDisabler::~wxWindowDisabler() { wxWindowList::Node *node; - for ( node = m_winDisabled->GetFirst(); node; node = node->GetNext() ) + for ( node = wxTopLevelWindows.GetFirst(); node; node = node->GetNext() ) { - node->GetData()->Enable(); + wxWindow *winTop = node->GetData(); + if ( !m_winDisabled || !m_winDisabled->Find(winTop) ) + { + winTop->Enable(); + } + //else: had been already disabled, don't reenable } delete m_winDisabled; @@ -1029,7 +1037,7 @@ wxWindowDisabler::~wxWindowDisabler() { if ( !::SetForegroundWindow(GetHwndOf(m_winTop)) ) { - wxLogLastError("SetForegroundWindow"); + wxLogLastError(wxT("SetForegroundWindow")); } } #else @@ -1037,8 +1045,8 @@ wxWindowDisabler::~wxWindowDisabler() { // 16-bit SetForegroundWindow() replacement RECT reWin; - GetWindowRect(m_winTop, &reWin); - SetWindowPos (m_winTop, HWND_TOP, + GetWindowRect((HWND) m_winTop, &reWin); + SetWindowPos ((HWND) m_winTop, HWND_TOP, reWin.left, reWin.top, reWin.right - reWin.left, reWin.bottom, SWP_SHOWWINDOW); @@ -1051,7 +1059,7 @@ wxWindowDisabler::~wxWindowDisabler() // the given one bool wxSafeYield(wxWindow *win) { - wxWindowDisabler wd; + wxWindowDisabler wd(win); bool rc = wxYield(); @@ -1095,14 +1103,13 @@ wxString wxGetEmailAddress() { wxString email; - wxString host = wxGetHostName(); + wxString host = wxGetFullHostName(); if ( !!host ) { wxString user = wxGetUserId(); if ( !!user ) { - wxString email(user); - email << wxT('@') << host; + email << user << wxT('@') << host; } } @@ -1213,26 +1220,89 @@ wxString wxGetCurrentDir() // wxExecute // ---------------------------------------------------------------------------- -long wxExecute(const wxString& command, wxArrayString& output) +// 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(); - wxTextInputStream tis(is); - while ( !is.Eof() && is.IsOk() ) + 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 ) { - wxString line = tis.ReadLine(); - if ( is.LastError() ) - break; + es = process->GetErrorStream(); - output.Add(line); + 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); }