X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4b1f6faaa2c062d0797ae85c66ebe2c927946992..f2616db56739e4962f683f59ac9e207756efe23c:/src/common/utilscmn.cpp diff --git a/src/common/utilscmn.cpp b/src/common/utilscmn.cpp index f563515d18..f9f3116ca3 100644 --- a/src/common/utilscmn.cpp +++ b/src/common/utilscmn.cpp @@ -37,10 +37,11 @@ #if wxUSE_GUI #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" @@ -180,7 +181,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__ @@ -265,7 +266,6 @@ FloatToString (float number, const wxChar *fmt) { static wxChar buf[256]; -// sprintf (buf, "%.2f", number); wxSprintf (buf, fmt, number); return buf; } @@ -402,147 +402,66 @@ wxString wxNow() #if wxUSE_GUI +#if wxUSE_MENUS + // ---------------------------------------------------------------------------- // Menu accelerators related functions // ---------------------------------------------------------------------------- -wxChar *wxStripMenuCodes (wxChar *in, wxChar *out) +wxChar *wxStripMenuCodes(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 == wxT("DEL") ) { - 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 - { - 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 @@ -665,10 +584,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'. @@ -966,6 +888,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) ) { @@ -989,7 +913,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) ) @@ -1022,6 +949,8 @@ wxString wxGetPasswordFromUser(const wxString& message, #endif // wxUSE_TEXTDLG +#if wxUSE_COLOURDLG + wxColour wxGetColourFromUser(wxWindow *parent, const wxColour& colInit) { wxColourData data; @@ -1042,6 +971,8 @@ wxColour wxGetColourFromUser(wxWindow *parent, const wxColour& colInit) return colRet; } +#endif // wxUSE_COLOURDLG + // ---------------------------------------------------------------------------- // missing C RTL functions (FIXME shouldn't be here at all) // ---------------------------------------------------------------------------- @@ -1365,3 +1296,5 @@ long wxExecute(const wxString& command, { return wxDoExecuteWithCapture(command, output, &error); } + +