X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ccec90930cfc38bd4347a97f46481242d9fd23cd..4164a04a98be1066038317c2d16438cce3f59c81:/src/common/utilscmn.cpp diff --git a/src/common/utilscmn.cpp b/src/common/utilscmn.cpp index 837e2c2239..a451976b17 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; @@ -549,20 +539,28 @@ wxString wxGetCurrentDir() // ---------------------------------------------------------------------------- #ifdef __WXOSX__ +#if wxOSX_USE_COCOA_OR_CARBON #include #endif +#endif 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 // environ(7) under Darwin @@ -570,9 +568,28 @@ bool wxGetEnvMap(wxEnvVariableHashMap *map) if ( !penv ) return false; char **env = *penv; +#else + char **env=NULL; + // todo translate NSProcessInfo environment into map +#endif #else // non-MSVC non-Mac // Not sure if other compilers have _tenviron so use the (more standard) // ANSI version only for them. + + // 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 // !__WINDOWS__ + char **env = environ; #endif @@ -801,8 +818,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; @@ -984,7 +1001,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); @@ -1050,7 +1067,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.: @@ -1170,22 +1187,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') ) @@ -1261,7 +1278,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(); @@ -1350,6 +1367,8 @@ int wxMessageBox(const wxString& message, const wxString& caption, long style, return wxNO; case wxID_CANCEL: return wxCANCEL; + case wxID_HELP: + return wxHELP; } wxFAIL_MSG( wxT("unexpected return code from wxMessageDialog") ); @@ -1395,7 +1414,7 @@ wxVersionInfo wxGetLibraryVersionInfo() wxMINOR_VERSION, wxRELEASE_NUMBER, msg, - wxS("Copyright (c) 1995-2010 wxWidgets team")); + wxS("Copyright (c) 1995-2011 wxWidgets team")); } void wxInfoMessageBox(wxWindow* parent) @@ -1462,89 +1481,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.Ok() ) - { - 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 // ---------------------------------------------------------------------------- @@ -1556,6 +1492,12 @@ void wxEnableTopLevelWindows(bool enable) node->GetData()->Enable(enable); } +#if defined(__WXOSX__) && wxOSX_USE_COCOA + +// defined in evtloop.mm + +#else + wxWindowDisabler::wxWindowDisabler(bool disable) { m_disabled = disable; @@ -1618,6 +1560,8 @@ wxWindowDisabler::~wxWindowDisabler() delete m_winDisabled; } +#endif + // Yield to other apps/messages and disable user input to all windows except // the given one bool wxSafeYield(wxWindow *win, bool onlyIfNeeded)