X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1d156af3247c862e51a7c62f569a3fd302052a42..0646084eb258e28101c2cc3dc0173f665c2dfa2d:/src/common/utilscmn.cpp diff --git a/src/common/utilscmn.cpp b/src/common/utilscmn.cpp index 07a7eebfba..f5ba00045b 100644 --- a/src/common/utilscmn.cpp +++ b/src/common/utilscmn.cpp @@ -70,32 +70,26 @@ #endif #if wxUSE_GUI - #include "wx/colordlg.h" - #include "wx/fontdlg.h" #include "wx/notebook.h" #include "wx/statusbr.h" #endif // wxUSE_GUI -#ifndef __WXPALMOS5__ #ifndef __WXWINCE__ #include #else #include "wx/msw/wince/time.h" #endif -#endif // ! __WXPALMOS5__ #ifdef __WXMAC__ #include "wx/osx/private.h" #endif -#ifndef __WXPALMOS5__ -#if !defined(__MWERKS__) && !defined(__WXWINCE__) +#if !defined(__WXWINCE__) #include #include #endif -#endif // ! __WXPALMOS5__ -#if defined(__WXMSW__) +#if defined(__WINDOWS__) #include "wx/msw/private.h" #include "wx/filesys.h" #endif @@ -354,7 +348,7 @@ void wxPlatform::ClearPlatforms() bool wxPlatform::Is(int platform) { -#ifdef __WXMSW__ +#ifdef __WINDOWS__ if (platform == wxOS_WINDOWS) return true; #endif @@ -394,10 +388,6 @@ bool wxPlatform::Is(int platform) if (platform == wxOS_UNIX) return true; #endif -#ifdef __WXMGL__ - if (platform == wxPORT_MGL) - return true; -#endif #ifdef __OS2__ if (platform == wxOS_OS2) return true; @@ -559,12 +549,17 @@ bool wxGetEnvMap(wxEnvVariableHashMap *map) wxCHECK_MSG( map, false, wxS("output pointer can't be NULL") ); #if defined(__VISUALC__) + // This variable only exists to force the CRT to fill the wide char array, + // it might only have it in narrow char version until now as we use main() + // (and not _wmain()) as our entry point. + static wxChar* s_dummyEnvVar = _tgetenv(wxT("TEMP")); + wxChar **env = _tenviron; #elif defined(__VMS) // Now this routine wil give false for OpenVMS // TODO : should we do something with logicals? char **env=NULL; -#elif defined(__WXOSX__) +#elif defined(__DARWIN__) #if wxOSX_USE_COCOA_OR_CARBON // Under Mac shared libraries don't have access to the global environ // variable so use this Mac-specific function instead as advised by @@ -580,10 +575,21 @@ bool wxGetEnvMap(wxEnvVariableHashMap *map) #else // non-MSVC non-Mac // Not sure if other compilers have _tenviron so use the (more standard) // ANSI version only for them. -#ifdef __BSD__ - // POSIX, but not in an include file + + // Both POSIX and Single UNIX Specification say that this variable must + // exist but not that it must be declared anywhere and, indeed, it's not + // declared in several common systems (some BSDs, Solaris with native CC) + // so we (re)declare it ourselves to deal with these cases. However we do + // not do this under MSW where there can be DLL-related complications, i.e. + // the variable might be DLL-imported or not. Luckily we don't have to + // worry about this as all MSW compilers do seem to define it in their + // standard headers anyhow so we can just rely on already having the + // correct declaration. And if this turns out to be wrong, we can always + // add a configure test checking whether it is declared later. +#ifndef __WINDOWS__ extern char **environ; -#endif +#endif // !__WINDOWS__ + char **env = environ; #endif @@ -612,13 +618,15 @@ bool wxGetEnvMap(wxEnvVariableHashMap *map) // wxExecute // ---------------------------------------------------------------------------- -// wxDoExecuteWithCapture() helper: reads an entire stream into one array +// wxDoExecuteWithCapture() helper: reads an entire stream into one array if +// the stream is non-NULL (it doesn't do anything if it's NULL). // // returns true if ok, false if error #if wxUSE_STREAMS static bool ReadAll(wxInputStream *is, wxArrayString& output) { - wxCHECK_MSG( is, false, wxT("NULL stream in wxExecute()?") ); + if ( !is ) + return true; // the stream could be already at EOF or in wxSTREAM_BROKEN_PIPE state is->Reset(); @@ -665,17 +673,16 @@ static long wxDoExecuteWithCapture(const wxString& command, long rc = wxExecute(command, wxEXEC_SYNC | flags, process, env); #if wxUSE_STREAMS - if ( rc != -1 ) + // Notice that while -1 indicates an error exit code for us, a program + // exiting with this code could still have written something to its stdout + // and, especially, stderr, so we still need to read from them. + if ( !ReadAll(process->GetInputStream(), output) ) + rc = -1; + + if ( error ) { - if ( !ReadAll(process->GetInputStream(), output) ) + if ( !ReadAll(process->GetErrorStream(), *error) ) rc = -1; - - if ( error ) - { - if ( !ReadAll(process->GetErrorStream(), *error) ) - rc = -1; - } - } #else wxUnusedVar(output); @@ -812,8 +819,8 @@ typedef struct smaller partition. This *guarantees* no more than log (n) stack size is needed (actually O(1) in this case)! */ -void wxQsort(void *const pbase, size_t total_elems, - size_t size, CMPFUNCDATA cmp, const void* user_data) +void wxQsort(void* pbase, size_t total_elems, + size_t size, wxSortCallback cmp, const void* user_data) { register char *base_ptr = (char *) pbase; const size_t max_thresh = MAX_THRESH * size; @@ -995,7 +1002,7 @@ bool wxSetDetectableAutoRepeat( bool WXUNUSED(flag) ) // Launch default browser // ---------------------------------------------------------------------------- -#if defined(__WXMSW__) +#if defined(__WINDOWS__) // implemented in a port-specific utils source file: bool wxDoLaunchDefaultBrowser(const wxString& url, const wxString& scheme, int flags); @@ -1061,7 +1068,7 @@ static bool DoLaunchDefaultBrowserHelper(const wxString& urlOrig, int flags) // (e.g. "C:\\test.txt" when parsed by wxURI reports a scheme == "C") bool hasValidScheme = uri.HasScheme() && uri.GetScheme().length() > 1; -#if defined(__WXMSW__) +#if defined(__WINDOWS__) // NOTE: when testing wxMSW's wxLaunchDefaultBrowser all possible forms // of the URL/flags should be tested; e.g.: @@ -1181,22 +1188,22 @@ wxString wxStripMenuCodes(const wxString& in, int flags) size_t len = in.length(); out.reserve(len); - for ( size_t n = 0; n < len; n++ ) + for ( wxString::const_iterator it = in.begin(); it != in.end(); ++it ) { - wxChar ch = in[n]; + wxChar ch = *it; if ( (flags & wxStrip_Mnemonics) && ch == wxT('&') ) { // 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 ) + if ( ++it == in.end() ) { wxLogDebug(wxT("Invalid menu string '%s'"), in.c_str()); } else { // use the next char instead - ch = in[n]; + ch = *it; } } else if ( (flags & wxStrip_Accel) && ch == wxT('\t') ) @@ -1272,7 +1279,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))) + if (wxDynamicCast(win, wxNotebook)) { wxNotebook* nb = (wxNotebook*) win; int sel = nb->GetSelection(); @@ -1475,89 +1482,6 @@ wxString wxGetPasswordFromUser(const wxString& message, #endif // wxUSE_TEXTDLG -#if wxUSE_COLOURDLG - -wxColour wxGetColourFromUser(wxWindow *parent, - const wxColour& colInit, - const wxString& caption, - wxColourData *ptrData) -{ - // contains serialized representation of wxColourData used the last time - // the dialog was shown: we want to reuse it the next time in order to show - // the same custom colours to the user (and we can't just have static - // wxColourData itself because it's a GUI object and so should be destroyed - // before GUI shutdown and doing it during static cleanup is too late) - static wxString s_strColourData; - - wxColourData data; - if ( !ptrData ) - { - ptrData = &data; - if ( !s_strColourData.empty() ) - { - if ( !data.FromString(s_strColourData) ) - { - wxFAIL_MSG( "bug in wxColourData::FromString()?" ); - } - -#ifdef __WXMSW__ - // we don't get back the "choose full" flag value from the native - // dialog and so we can't preserve it between runs, so we decide to - // always use it as it seems better than not using it (user can - // just ignore the extra controls in the dialog but having to click - // a button each time to show them would be very annoying - data.SetChooseFull(true); -#endif // __WXMSW__ - } - } - - if ( colInit.IsOk() ) - { - ptrData->SetColour(colInit); - } - - wxColour colRet; - wxColourDialog dialog(parent, ptrData); - if (!caption.empty()) - dialog.SetTitle(caption); - if ( dialog.ShowModal() == wxID_OK ) - { - *ptrData = dialog.GetColourData(); - colRet = ptrData->GetColour(); - s_strColourData = ptrData->ToString(); - } - //else: leave colRet invalid - - return colRet; -} - -#endif // wxUSE_COLOURDLG - -#if wxUSE_FONTDLG - -wxFont wxGetFontFromUser(wxWindow *parent, const wxFont& fontInit, const wxString& caption) -{ - wxFontData data; - if ( fontInit.IsOk() ) - { - data.SetInitialFont(fontInit); - } - - wxFont fontRet; - wxFontDialog dialog(parent, data); - if (!caption.empty()) - dialog.SetTitle(caption); - if ( dialog.ShowModal() == wxID_OK ) - { - fontRet = dialog.GetFontData().GetChosenFont(); - } - //else: leave it invalid - - return fontRet; -} - -#endif // wxUSE_FONTDLG - // ---------------------------------------------------------------------------- // wxSafeYield and supporting functions // ----------------------------------------------------------------------------