X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5600884ab7b33df1ba37cf488e6035d2228c3e56..4b04699b670b4ab4632229fa0264d154acd3bec1:/src/common/utilscmn.cpp diff --git a/src/common/utilscmn.cpp b/src/common/utilscmn.cpp index 9bc2b497f7..92dabe4d64 100644 --- a/src/common/utilscmn.cpp +++ b/src/common/utilscmn.cpp @@ -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 @@ -113,6 +89,15 @@ #include "wx/msw/private.h" #endif +// ---------------------------------------------------------------------------- +// common data +// ---------------------------------------------------------------------------- + +#if WXWIN_COMPATIBILITY_2_2 + const wxChar *wxInternalErrorStr = wxT("wxWindows Internal Error"); + const wxChar *wxFatalErrorStr = wxT("wxWindows Fatal Error"); +#endif // WXWIN_COMPATIBILITY_2_2 + // ---------------------------------------------------------------------------- // function protoypes // ---------------------------------------------------------------------------- @@ -130,7 +115,7 @@ // string functions // ---------------------------------------------------------------------------- -#ifdef __WXMAC__ +#if defined(__WXMAC__) && !defined(__DARWIN__) int strcasecmp(const char *str_1, const char *str_2) { register char c1, c2; @@ -159,7 +144,7 @@ int strncasecmp(const char *str_1, const char *str_2, size_t maxchar) return 0 ; } -#endif // wxMAC +#endif // __WXMAC__ && !__DARWIN__ #if defined( __VMS__ ) && ( __VMS_VER < 70000000 ) // we have no strI functions under VMS, therefore I have implemented @@ -206,7 +191,7 @@ int strncasecmp(const char *str_1, const char *str_2, size_t maxchar) } #endif // __VMS__ -#ifdef __WINDOWS__ +#if defined(__WINDOWS__) && !defined(__WXMICROWIN__) #ifndef __GNUWIN32__ #ifndef __MWERKS__ @@ -241,6 +226,11 @@ extern "C" #define strncasecmp strnicmp #endif +#ifdef __WATCOMC__ +#define strcasecmp stricmp +#define strncasecmp strnicmp +#endif + wxChar * copystring (const wxChar *s) { @@ -273,14 +263,14 @@ wxRegisterId (long id) } 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 +281,6 @@ FloatToString (float number, const wxChar *fmt) { static wxChar buf[256]; -// sprintf (buf, "%.2f", number); wxSprintf (buf, fmt, number); return buf; } @@ -306,14 +295,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); @@ -378,7 +367,7 @@ wxString wxDecToHex(int dec) // 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; @@ -428,147 +417,66 @@ wxString wxNow() #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 @@ -691,10 +599,13 @@ wxFindWindowByName1 (const wxString& title, wxWindow * parent) 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 +620,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 +633,8 @@ wxWindow* wxFindWindowAtPoint(wxWindow* win, const wxPoint& pt) return foundWin; } } +#endif + /* Doesn't work // Frame case else if (win->IsKindOf(CLASSINFO(wxFrame))) @@ -842,7 +756,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 +906,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 +931,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 +967,63 @@ 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; + 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 fontRet; +} + +#endif // wxUSE_FONTDLG // ---------------------------------------------------------------------------- // missing C RTL functions (FIXME shouldn't be here at all) // ---------------------------------------------------------------------------- #ifdef __MWERKS__ +#if __MSL__ < 0x7000 char *strdup(const char *s) { return strcpy( (char*) malloc( strlen( s ) + 1 ) , s ) ; } - +#endif int isascii( int c ) { return ( c >= 0 && c < 128 ) ; @@ -1167,6 +1113,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 // ---------------------------------------------------------------------------- @@ -1321,7 +1294,7 @@ 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 ) @@ -1391,3 +1364,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 +} +