X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f03fc89fff2d6e823e7d4d14fbe14822ad6777b1..6842d18650b487249b4ae29d0d7e17231b24cde8:/src/common/utilscmn.cpp diff --git a/src/common/utilscmn.cpp b/src/common/utilscmn.cpp index 3fe071d7b3..5aef920b31 100644 --- a/src/common/utilscmn.cpp +++ b/src/common/utilscmn.cpp @@ -9,55 +9,68 @@ // Licence: wxWindows license ///////////////////////////////////////////////////////////////////////////// +// ============================================================================ +// declarations +// ============================================================================ + +// ---------------------------------------------------------------------------- +// headers +// ---------------------------------------------------------------------------- + #ifdef __GNUG__ -#pragma implementation "utils.h" + #pragma implementation "utils.h" #endif // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" #ifdef __BORLANDC__ -#pragma hdrstop + #pragma hdrstop #endif #ifndef WX_PRECOMP -#include "wx/defs.h" -#include "wx/utils.h" -#include "wx/window.h" -#include "wx/menu.h" -#include "wx/frame.h" -#include "wx/msgdlg.h" -#include "wx/textdlg.h" -#endif - -#include "wx/ioswrap.h" - -#if wxUSE_IOSTREAMH - #include -#else - #include -#endif + #include "wx/defs.h" + #include "wx/string.h" + #include "wx/utils.h" + #include "wx/intl.h" + #include "wx/log.h" + + #if wxUSE_GUI + #include "wx/window.h" + #include "wx/menu.h" + #include "wx/frame.h" + #include "wx/msgdlg.h" + #include "wx/textdlg.h" + #if wxUSE_ACCEL + #include "wx/menuitem.h" + #include "wx/accel.h" + #endif // wxUSE_ACCEL + #endif // wxUSE_GUI +#endif // WX_PRECOMP #include #include #include #include + #if !defined(__WATCOMC__) #if !(defined(_MSC_VER) && (_MSC_VER > 800)) #include #endif #endif + #include + #ifndef __MWERKS__ -#include -#include + #include + #include #endif #ifdef __SALFORDC__ -#include + #include #endif -// Pattern matching code. +// Pattern matching code. (FIXME) // Yes, this path is deliberate (for Borland compilation) #ifdef wx_mac /* MATTHEW: [5] Mac doesn't like paths with "/" */ #include "glob.inc" @@ -66,20 +79,26 @@ #endif #ifdef __WXMSW__ -#include "windows.h" + #include "windows.h" #endif -#define _MAXPATHLEN 500 +// ---------------------------------------------------------------------------- +// function protoypes +// ---------------------------------------------------------------------------- + +#if wxUSE_GUI + static wxWindow *wxFindWindowByLabel1(const wxString& title, wxWindow *parent); + static wxWindow *wxFindWindowByName1 (const wxString& title, wxWindow *parent); +#endif // wxUSE_GUI -extern wxChar *wxBuffer; +// ============================================================================ +// implementation +// ============================================================================ // ---------------------------------------------------------------------------- -// private functions +// string functions // ---------------------------------------------------------------------------- -static wxWindow *wxFindWindowByLabel1(const wxString& title, wxWindow * parent); -static wxWindow *wxFindWindowByName1 (const wxString& title, wxWindow * parent); - #ifdef __WXMAC__ int strcasecmp(const char *str_1, const char *str_2) { @@ -109,7 +128,8 @@ int strncasecmp(const char *str_1, const char *str_2, size_t maxchar) return 0 ; } -#endif +#endif // wxMAC + #ifdef __VMS__ // we have no strI functions under VMS, therefore I have implemented // an inefficient but portable version: convert copies of strings to lowercase @@ -131,7 +151,7 @@ int strcasecmp(const char *str_1, const char *str_2) myLowerString(temp1); myLowerString(temp2); - int result = strcmp(temp1,temp2); + int result = wxStrcmp(temp1,temp2); delete[] temp1; delete[] temp2; @@ -153,7 +173,7 @@ int strncasecmp(const char *str_1, const char *str_2, size_t maxchar) return(result); } -#endif +#endif // __VMS__ #ifdef __WINDOWS__ @@ -168,6 +188,12 @@ int strncasecmp(const char *str_1, const char *str_2, size_t maxchar) #endif #else + +#ifdef __EMX__ +#define strcasecmp stricmp +#define strncasecmp strnicmp +#endif + // This declaration is missing in SunOS! // (Yes, I know it is NOT ANSI-C but its in BSD libc) #if defined(__xlC) || defined(__AIX__) || defined(__GNUG__) @@ -179,11 +205,15 @@ extern "C" #endif #endif /* __WXMSW__ */ +#ifdef __WXPM__ +#define strcasecmp stricmp +#define strncasecmp strnicmp +#endif wxChar * copystring (const wxChar *s) { - if (s == NULL) s = _T(""); + if (s == NULL) s = wxT(""); size_t len = wxStrlen (s) + 1; wxChar *news = new wxChar[len]; @@ -263,7 +293,7 @@ IntToString (int number) { static wxChar buf[20]; - wxSprintf (buf, _T("%d"), number); + wxSprintf (buf, wxT("%d"), number); return buf; } @@ -272,27 +302,27 @@ LongToString (long number) { static wxChar buf[20]; - wxSprintf (buf, _T("%ld"), number); + wxSprintf (buf, wxT("%ld"), number); return buf; } // Array used in DecToHex conversion routine. -static wxChar hexArray[] = _T("0123456789ABCDEF"); +static wxChar hexArray[] = wxT("0123456789ABCDEF"); // Convert 2-digit hex number to decimal int wxHexToDec(const wxString& buf) { int firstDigit, secondDigit; - if (buf.GetChar(0) >= _T('A')) - firstDigit = buf.GetChar(0) - _T('A') + 10; + if (buf.GetChar(0) >= wxT('A')) + firstDigit = buf.GetChar(0) - wxT('A') + 10; else - firstDigit = buf.GetChar(0) - _T('0'); + firstDigit = buf.GetChar(0) - wxT('0'); - if (buf.GetChar(1) >= _T('A')) - secondDigit = buf.GetChar(1) - _T('A') + 10; + if (buf.GetChar(1) >= wxT('A')) + secondDigit = buf.GetChar(1) - wxT('A') + 10; else - secondDigit = buf.GetChar(1) - _T('0'); + secondDigit = buf.GetChar(1) - wxT('0'); return firstDigit * 16 + secondDigit; } @@ -357,7 +387,7 @@ StringMatch (char *str1, char *str2, bool subString, bool exact) // Return the current date/time // [volatile] -wxString wxNow( void ) +wxString wxNow() { time_t now = time((time_t *) NULL); char *date = ctime(&now); @@ -365,9 +395,11 @@ wxString wxNow( void ) return wxString(date); } -/* - * Strip out any menu codes - */ +#if wxUSE_GUI + +// ---------------------------------------------------------------------------- +// Menu accelerators related functions +// ---------------------------------------------------------------------------- wxChar *wxStripMenuCodes (wxChar *in, wxChar *out) { @@ -381,13 +413,13 @@ wxChar *wxStripMenuCodes (wxChar *in, wxChar *out) while (*in) { - if (*in == _T('&')) + if (*in == wxT('&')) { // Check && -> &, &x -> x - if (*++in == _T('&')) + if (*++in == wxT('&')) *out++ = *in++; } - else if (*in == _T('\t')) + else if (*in == wxT('\t')) { // Remove all stuff after \t in X mode, and let the stuff as is // in Windows mode. @@ -399,7 +431,7 @@ wxChar *wxStripMenuCodes (wxChar *in, wxChar *out) *out++ = *in++; } // while - *out = _T('\0'); + *out = wxT('\0'); return tmpOut; } @@ -413,10 +445,94 @@ wxString wxStripMenuCodes(const wxString& str) return str1; } -/* - * Window search functions - * - */ +#if wxUSE_ACCEL + +// 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(); + } + else { + current += wxTolower(label[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 { +#if 0 // this is not supported by GTK+, apparently + // several special cases + current.MakeUpper(); + if ( current == wxT("DEL") ) { + keyCode = VK_DELETE; + } + else if ( current == wxT("PGUP") ) { + keyCode = VK_PRIOR; + } + else if ( current == wxT("PGDN") ) { + keyCode = VK_NEXT; + } + else +#endif // 0 + { + wxLogDebug(wxT("Unrecognized accel key '%s', accel " + "string ignored."), current.c_str()); + } + } + } + } + + if ( keyCode ) { + // we do have something + return new wxAcceleratorEntry(accelFlags, keyCode); + } + } + + return (wxAcceleratorEntry *)NULL; +} + +#endif // wxUSE_ACCEL + +// ---------------------------------------------------------------------------- +// Window search functions +// ---------------------------------------------------------------------------- /* * If parent is non-NULL, look through children for a label or title @@ -541,6 +657,8 @@ wxFindMenuItemId (wxFrame * frame, const wxString& menuString, const wxString& i return menuBar->FindMenuItem (menuString, itemString); } +#endif // wxUSE_GUI + /* On Fri, 21 Jul 1995, Paul Craven wrote: @@ -733,24 +851,12 @@ whereami(name) } #endif -void wxEnableTopLevelWindows(bool enable) -{ - wxWindowList::Node *node; - for ( node = wxTopLevelWindows.GetFirst(); node; node = node->GetNext() ) - node->GetData()->Enable(enable); -} -// Yield to other apps/messages and disable user input -bool wxSafeYield(wxWindow *win) -{ - wxEnableTopLevelWindows(FALSE); - // always enable ourselves - if ( win ) - win->Enable(TRUE); - bool rc = wxYield(); - wxEnableTopLevelWindows(TRUE); - return rc; -} +#if wxUSE_GUI + +// ---------------------------------------------------------------------------- +// GUI helpers +// ---------------------------------------------------------------------------- /* * N.B. these convenience functions must be separate from msgdlgg.cpp, textdlgg.cpp @@ -782,6 +888,7 @@ int wxMessageBox(const wxString& message, const wxString& caption, long style, return ans; } +#if wxUSE_TEXTDLG wxString wxGetTextFromUser(const wxString& message, const wxString& caption, const wxString& defaultValue, wxWindow *parent, int x, int y, bool WXUNUSED(centre) ) @@ -792,6 +899,7 @@ wxString wxGetTextFromUser(const wxString& message, const wxString& caption, else return wxString(""); } +#endif // wxUSE_TEXTDLG #ifdef __MWERKS__ char *strdup(const char *s) @@ -803,7 +911,42 @@ int isascii( int c ) { return ( c >= 0 && c < 128 ) ; } -#endif +#endif // __MWERKS__ + +// ---------------------------------------------------------------------------- +// misc functions +// ---------------------------------------------------------------------------- + +void wxEnableTopLevelWindows(bool enable) +{ + wxWindowList::Node *node; + for ( node = wxTopLevelWindows.GetFirst(); node; node = node->GetNext() ) + node->GetData()->Enable(enable); +} + +// Yield to other apps/messages and disable user input +bool wxSafeYield(wxWindow *win) +{ + wxEnableTopLevelWindows(FALSE); + // always enable ourselves + if ( win ) + win->Enable(TRUE); + bool rc = wxYield(); + wxEnableTopLevelWindows(TRUE); + return rc; +} + +// Don't synthesize KeyUp events holding down a key and producing KeyDown +// events with autorepeat. On by default and always on in wxMSW. wxGTK version +// in utilsgtk.cpp. +#ifndef __WXGTK__ +bool wxSetDetectableAutoRepeat( bool WXUNUSED(flag) ) +{ + return TRUE; // detectable auto-repeat is the only mode MSW supports +} +#endif // !wxGTK + +#endif // wxUSE_GUI // ---------------------------------------------------------------------------- // network and user id functions @@ -817,7 +960,7 @@ bool wxGetEmailAddress(wxChar *address, int maxSize) return FALSE; wxStrncpy(address, email, maxSize - 1); - address[maxSize - 1] = _T('\0'); + address[maxSize - 1] = wxT('\0'); return TRUE; } @@ -833,7 +976,7 @@ wxString wxGetEmailAddress() if ( !!user ) { wxString email(user); - email << _T('@') << host; + email << wxT('@') << host; } } @@ -883,3 +1026,18 @@ wxString wxGetHostName() return buf; } +wxString wxGetFullHostName() +{ + static const size_t hostnameSize = 257; + + wxString buf; + bool ok = wxGetFullHostName(buf.GetWriteBuf(hostnameSize), hostnameSize); + + buf.UngetWriteBuf(); + + if ( !ok ) + buf.Empty(); + + return buf; +} +