X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ec67cff1f6e63b3b27613a085f0492958e66a28e..60104cbafa4502c7592801ccb8507f779c5601cf:/src/common/utilscmn.cpp diff --git a/src/common/utilscmn.cpp b/src/common/utilscmn.cpp index 5d53b623fc..b048ccd3c6 100644 --- a/src/common/utilscmn.cpp +++ b/src/common/utilscmn.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: utilscmn.cpp +// Name: src/common/utilscmn.cpp // Purpose: Miscellaneous utility functions and classes // Author: Julian Smart // Modified by: @@ -17,10 +17,6 @@ // headers // ---------------------------------------------------------------------------- -#ifdef __GNUG__ - #pragma implementation "utils.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -36,7 +32,6 @@ #include "wx/log.h" #if wxUSE_GUI - #include "wx/app.h" #include "wx/window.h" #include "wx/frame.h" #include "wx/menu.h" @@ -50,9 +45,16 @@ #endif // wxUSE_GUI #endif // WX_PRECOMP -#ifndef __WIN16__ +#include "wx/apptrait.h" + #include "wx/process.h" #include "wx/txtstrm.h" +#include "wx/uri.h" +#include "wx/mimetype.h" +#include "wx/config.h" + +#if defined(__WXWINCE__) && wxUSE_DATETIME +#include "wx/datetime.h" #endif #include @@ -74,19 +76,20 @@ #include "wx/statusbr.h" #endif // wxUSE_GUI +#ifndef __WXWINCE__ #include +#else +#include "wx/msw/wince/time.h" +#endif -#ifndef __MWERKS__ +#if !defined(__MWERKS__) && !defined(__WXWINCE__) #include #include #endif -#ifdef __SALFORDC__ - #include -#endif - -#ifdef __WXMSW__ +#if defined(__WXMSW__) #include "wx/msw/private.h" + #include "wx/msw/registry.h" #endif #if wxUSE_BASE @@ -95,11 +98,6 @@ // 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 - // ============================================================================ // implementation // ============================================================================ @@ -109,107 +107,88 @@ wxChar * copystring (const wxChar *s) { - if (s == NULL) s = wxT(""); - size_t len = wxStrlen (s) + 1; + if (s == NULL) s = wxEmptyString; + size_t len = wxStrlen (s) + 1; - wxChar *news = new wxChar[len]; - memcpy (news, s, len * sizeof(wxChar)); // Should be the fastest + wxChar *news = new wxChar[len]; + memcpy (news, s, len * sizeof(wxChar)); // Should be the fastest - return news; + return news; } #endif // WXWIN_COMPATIBILITY_2_4 -// Id generation -static long wxCurrentId = 100; - -long -wxNewId (void) -{ - return wxCurrentId++; -} - -long -wxGetCurrentId(void) { return wxCurrentId; } - -void -wxRegisterId (long id) -{ - if (id >= wxCurrentId) - wxCurrentId = id + 1; -} - // ---------------------------------------------------------------------------- // String <-> Number conversions (deprecated) // ---------------------------------------------------------------------------- #if WXWIN_COMPATIBILITY_2_4 -WXDLLEXPORT_DATA(const wxChar *) wxFloatToStringStr = wxT("%.2f"); -WXDLLEXPORT_DATA(const wxChar *) wxDoubleToStringStr = wxT("%.2f"); +WXDLLIMPEXP_DATA_BASE(const wxChar *) wxFloatToStringStr = wxT("%.2f"); +WXDLLIMPEXP_DATA_BASE(const wxChar *) wxDoubleToStringStr = wxT("%.2f"); void StringToFloat (const wxChar *s, float *number) { - if (s && *s && number) - *number = (float) wxStrtod (s, (wxChar **) NULL); + if (s && *s && number) + *number = (float) wxStrtod (s, (wxChar **) NULL); } void StringToDouble (const wxChar *s, double *number) { - if (s && *s && number) - *number = wxStrtod (s, (wxChar **) NULL); + if (s && *s && number) + *number = wxStrtod (s, (wxChar **) NULL); } wxChar * FloatToString (float number, const wxChar *fmt) { - static wxChar buf[256]; + static wxChar buf[256]; - wxSprintf (buf, fmt, number); - return buf; + wxSprintf (buf, fmt, number); + return buf; } wxChar * DoubleToString (double number, const wxChar *fmt) { - static wxChar buf[256]; + static wxChar buf[256]; - wxSprintf (buf, fmt, number); - return buf; + wxSprintf (buf, fmt, number); + return buf; } void StringToInt (const wxChar *s, int *number) { - if (s && *s && number) - *number = (int) wxStrtol (s, (wxChar **) NULL, 10); + if (s && *s && number) + *number = (int) wxStrtol (s, (wxChar **) NULL, 10); } void StringToLong (const wxChar *s, long *number) { - if (s && *s && number) - *number = wxStrtol (s, (wxChar **) NULL, 10); + if (s && *s && number) + *number = wxStrtol (s, (wxChar **) NULL, 10); } wxChar * IntToString (int number) { - static wxChar buf[20]; + static wxChar buf[20]; - wxSprintf (buf, wxT("%d"), number); - return buf; + wxSprintf (buf, wxT("%d"), number); + return buf; } wxChar * LongToString (long number) { - static wxChar buf[20]; + static wxChar buf[20]; - wxSprintf (buf, wxT("%ld"), number); - return buf; + wxSprintf (buf, wxT("%ld"), number); + return buf; } #endif // WXWIN_COMPATIBILITY_2_4 @@ -220,29 +199,29 @@ static wxChar hexArray[] = wxT("0123456789ABCDEF"); // Convert 2-digit hex number to decimal int wxHexToDec(const wxString& buf) { - int firstDigit, secondDigit; + int firstDigit, secondDigit; - if (buf.GetChar(0) >= wxT('A')) - firstDigit = buf.GetChar(0) - wxT('A') + 10; - else - firstDigit = buf.GetChar(0) - wxT('0'); + if (buf.GetChar(0) >= wxT('A')) + firstDigit = buf.GetChar(0) - wxT('A') + 10; + else + firstDigit = buf.GetChar(0) - wxT('0'); - if (buf.GetChar(1) >= wxT('A')) - secondDigit = buf.GetChar(1) - wxT('A') + 10; - else - secondDigit = buf.GetChar(1) - wxT('0'); + if (buf.GetChar(1) >= wxT('A')) + secondDigit = buf.GetChar(1) - wxT('A') + 10; + else + secondDigit = buf.GetChar(1) - wxT('0'); - return (firstDigit & 0xF) * 16 + (secondDigit & 0xF ); + return (firstDigit & 0xF) * 16 + (secondDigit & 0xF ); } // Convert decimal integer to 2-character hex string void wxDecToHex(int dec, wxChar *buf) { - int firstDigit = (int)(dec/16.0); - int secondDigit = (int)(dec - (firstDigit*16.0)); - buf[0] = hexArray[firstDigit]; - buf[1] = hexArray[secondDigit]; - buf[2] = 0; + int firstDigit = (int)(dec/16.0); + int secondDigit = (int)(dec - (firstDigit*16.0)); + buf[0] = hexArray[firstDigit]; + buf[1] = hexArray[secondDigit]; + buf[2] = 0; } // Convert decimal integer to 2-character hex string @@ -260,10 +239,24 @@ wxString wxDecToHex(int dec) // Return the current date/time wxString wxNow() { +#ifdef __WXWINCE__ +#if wxUSE_DATETIME + wxDateTime now = wxDateTime::Now(); + return now.Format(); +#else + return wxEmptyString; +#endif +#else time_t now = time((time_t *) NULL); char *date = ctime(&now); date[24] = '\0'; return wxString::FromAscii(date); +#endif +} + +void wxUsleep(unsigned long milliseconds) +{ + wxMilliSleep(milliseconds); } const wxChar *wxGetInstallPrefix() @@ -276,22 +269,32 @@ const wxChar *wxGetInstallPrefix() #ifdef wxINSTALL_PREFIX return wxT(wxINSTALL_PREFIX); #else - return wxT(""); + return wxEmptyString; #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); + wxString dir = wxGetInstallPrefix(); + dir << wxFILE_SEP_PATH << wxT("share") << wxFILE_SEP_PATH << wxT("wx"); return dir; } +int wxGetOsVersion(int *verMaj, int *verMin) +{ + // we want this function to work even if there is no wxApp + wxConsoleAppTraits traitsConsole; + wxAppTraits *traits = wxTheApp ? wxTheApp->GetTraits() : NULL; + if ( ! traits ) + traits = &traitsConsole; + + wxToolkitInfo& info = traits->GetToolkitInfo(); + if ( verMaj ) + *verMaj = info.versionMajor; + if ( verMin ) + *verMin = info.versionMinor; + return info.os; +} // ---------------------------------------------------------------------------- // network and user id functions @@ -302,12 +305,12 @@ bool wxGetEmailAddress(wxChar *address, int maxSize) { wxString email = wxGetEmailAddress(); if ( !email ) - return FALSE; + return false; wxStrncpy(address, email, maxSize - 1); address[maxSize - 1] = wxT('\0'); - return TRUE; + return true; } wxString wxGetEmailAddress() @@ -315,10 +318,10 @@ wxString wxGetEmailAddress() wxString email; wxString host = wxGetFullHostName(); - if ( !!host ) + if ( !host.empty() ) { wxString user = wxGetUserId(); - if ( !!user ) + if ( !user.empty() ) { email << user << wxT('@') << host; } @@ -332,8 +335,7 @@ wxString wxGetUserId() static const int maxLoginLen = 256; // FIXME arbitrary number wxString buf; - bool ok = wxGetUserId(buf.GetWriteBuf(maxLoginLen), maxLoginLen); - buf.UngetWriteBuf(); + bool ok = wxGetUserId(wxStringBuffer(buf, maxLoginLen), maxLoginLen); if ( !ok ) buf.Empty(); @@ -346,8 +348,7 @@ wxString wxGetUserName() static const int maxUserNameLen = 1024; // FIXME arbitrary number wxString buf; - bool ok = wxGetUserName(buf.GetWriteBuf(maxUserNameLen), maxUserNameLen); - buf.UngetWriteBuf(); + bool ok = wxGetUserName(wxStringBuffer(buf, maxUserNameLen), maxUserNameLen); if ( !ok ) buf.Empty(); @@ -360,9 +361,7 @@ wxString wxGetHostName() static const size_t hostnameSize = 257; wxString buf; - bool ok = wxGetHostName(buf.GetWriteBuf(hostnameSize), hostnameSize); - - buf.UngetWriteBuf(); + bool ok = wxGetHostName(wxStringBuffer(buf, hostnameSize), hostnameSize); if ( !ok ) buf.Empty(); @@ -375,9 +374,7 @@ wxString wxGetFullHostName() static const size_t hostnameSize = 257; wxString buf; - bool ok = wxGetFullHostName(buf.GetWriteBuf(hostnameSize), hostnameSize); - - buf.UngetWriteBuf(); + bool ok = wxGetFullHostName(wxStringBuffer(buf, hostnameSize), hostnameSize); if ( !ok ) buf.Empty(); @@ -433,18 +430,18 @@ wxString wxGetCurrentDir() // wxDoExecuteWithCapture() helper: reads an entire stream into one array // -// returns TRUE if ok, FALSE if error +// returns true if ok, false if error #if wxUSE_STREAMS static bool ReadAll(wxInputStream *is, wxArrayString& output) { - wxCHECK_MSG( is, FALSE, _T("NULL stream in wxExecute()?") ); + wxCHECK_MSG( is, false, _T("NULL stream in wxExecute()?") ); // the stream could be already at EOF or in wxSTREAM_BROKEN_PIPE state is->Reset(); wxTextInputStream tis(*is); - bool cont = TRUE; + bool cont = true; while ( cont ) { wxString line = tis.ReadLine(); @@ -453,7 +450,7 @@ static bool ReadAll(wxInputStream *is, wxArrayString& output) if ( !*is ) { - cont = FALSE; + cont = false; } else { @@ -470,18 +467,14 @@ static bool ReadAll(wxInputStream *is, wxArrayString& output) // public versions of wxExecute() below static long wxDoExecuteWithCapture(const wxString& command, wxArrayString& output, - wxArrayString* error) + wxArrayString* error, + int flags) { -#ifdef __WIN16__ - wxFAIL_MSG("Sorry, this version of wxExecute not implemented on WIN16."); - - return 0; -#else // !Win16 // create a wxProcess which will capture the output wxProcess *process = new wxProcess; process->Redirect(); - long rc = wxExecute(command, wxEXEC_SYNC, process); + long rc = wxExecute(command, wxEXEC_SYNC | flags, process); #if wxUSE_STREAMS if ( rc != -1 ) @@ -496,24 +489,157 @@ static long wxDoExecuteWithCapture(const wxString& command, } } -#endif // wxUSE_STREAMS +#else + wxUnusedVar(output); + wxUnusedVar(error); +#endif // wxUSE_STREAMS/!wxUSE_STREAMS delete process; return rc; -#endif // IO redirection supported } -long wxExecute(const wxString& command, wxArrayString& output) +long wxExecute(const wxString& command, wxArrayString& output, int flags) { - return wxDoExecuteWithCapture(command, output, NULL); + return wxDoExecuteWithCapture(command, output, NULL, flags); } long wxExecute(const wxString& command, wxArrayString& output, - wxArrayString& error) + wxArrayString& error, + int flags) { - return wxDoExecuteWithCapture(command, output, &error); + return wxDoExecuteWithCapture(command, output, &error, flags); +} + +// ---------------------------------------------------------------------------- +// Launch default browser +// ---------------------------------------------------------------------------- + +bool wxLaunchDefaultBrowser(const wxString& urlOrig, int flags) +{ + wxUnusedVar(flags); + + // set the scheme of url to http if it does not have one + wxString url(urlOrig); + if ( !wxURI(url).HasScheme() ) + url.Prepend(wxT("http://")); + +#if defined(__WXMSW__) + +#if wxUSE_IPC + if ( flags & wxBROWSER_NEW_WINDOW ) + { + // ShellExecuteEx() opens the URL in an existing window by default so + // we can't use it if we need a new window + wxRegKey key(wxRegKey::HKCR, url.BeforeFirst(':') + _T("\\shell\\open")); + if ( key.Exists() ) + { + wxRegKey keyDDE(key, wxT("DDEExec")); + if ( keyDDE.Exists() ) + { + const wxString ddeTopic = wxRegKey(keyDDE, wxT("topic")); + + // we only know the syntax of WWW_OpenURL DDE request for IE, + // optimistically assume that all other browsers are compatible + // with it + wxString ddeCmd; + bool ok = ddeTopic == wxT("WWW_OpenURL"); + if ( ok ) + { + ddeCmd = keyDDE.QueryDefaultValue(); + ok = !ddeCmd.empty(); + } + + if ( ok ) + { + // for WWW_OpenURL, the index of the window to open the URL + // in is -1 (meaning "current") by default, replace it with + // 0 which means "new" (see KB article 160957) + ok = ddeCmd.Replace(wxT("-1"), wxT("0"), + false /* only first occurence */) == 1; + } + + if ( ok ) + { + // and also replace the parameters: the topic should + // contain a placeholder for the URL + ok = ddeCmd.Replace(wxT("%1"), url, false) == 1; + } + + if ( ok ) + { + // try to send it the DDE request now but ignore the errors + wxLogNull noLog; + + const wxString ddeServer = wxRegKey(keyDDE, wxT("application")); + if ( wxExecuteDDE(ddeServer, ddeTopic, ddeCmd) ) + return true; + + // this is not necessarily an error: maybe browser is + // simply not running, but no matter, in any case we're + // going to launch it using ShellExecuteEx() below now and + // we shouldn't try to open a new window if we open a new + // browser anyhow + } + } + } + } +#endif // wxUSE_IPC + + WinStruct sei; + sei.lpFile = url.c_str(); + sei.lpVerb = _T("open"); + sei.nShow = SW_SHOWNORMAL; + + ::ShellExecuteEx(&sei); + + const int nResult = (int) sei.hInstApp; + + // Firefox returns file not found for some reason, so make an exception + // for it + if ( nResult > 32 || nResult == SE_ERR_FNF ) + { +#ifdef __WXDEBUG__ + // Log something if SE_ERR_FNF happens + if ( nResult == SE_ERR_FNF ) + wxLogDebug(wxT("SE_ERR_FNF from ShellExecute -- maybe FireFox?")); +#endif // __WXDEBUG__ + return true; + } +#elif wxUSE_MIMETYPE + // Non-windows way + wxFileType *ft = wxTheMimeTypesManager->GetFileTypeFromExtension (_T("html")); + if ( ft ) + { + wxString mt; + ft->GetMimeType(&mt); + + wxString cmd; + bool ok = ft->GetOpenCommand(&cmd, wxFileType::MessageParameters(url)); + delete ft; + + if ( !ok || cmd.empty() ) + { + // fallback to checking for the BROWSER environment variable + cmd = wxGetenv(wxT("BROWSER")); + if ( !cmd.empty() ) + cmd << _T(' ') << url; + } + + if ( !cmd.empty() && wxExecute(cmd) ) + return true; + } + else // no file type for html extension + { + wxLogError(_T("No default application configured for HTML files.")); + } +#endif // !wxUSE_MIMETYPE && !__WXMSW__ + + wxLogSysError(_T("Failed to open URL \"%s\" in default browser."), + url.c_str()); + + return false; } // ---------------------------------------------------------------------------- @@ -527,7 +653,7 @@ bool wxYield() bool wxYieldIfNeeded() { - return wxTheApp && wxTheApp->Yield(TRUE); + return wxTheApp && wxTheApp->Yield(true); } #endif // wxUSE_BASE @@ -538,6 +664,28 @@ bool wxYieldIfNeeded() #if wxUSE_GUI +// Id generation +static long wxCurrentId = 100; + +long wxNewId() +{ + // skip the part of IDs space that contains hard-coded values: + if (wxCurrentId == wxID_LOWEST) + wxCurrentId = wxID_HIGHEST + 1; + + return wxCurrentId++; +} + +long +wxGetCurrentId(void) { return wxCurrentId; } + +void +wxRegisterId (long id) +{ + if (id >= wxCurrentId) + wxCurrentId = id + 1; +} + #if wxUSE_MENUS // ---------------------------------------------------------------------------- @@ -554,7 +702,9 @@ wxChar *wxStripMenuCodes(const wxChar *in, wxChar *out) } else { - out = copystring(s); + // MYcopystring - for easier search... + out = new wxChar[s.length() + 1]; + wxStrcpy(out, s.c_str()); } return out; @@ -628,7 +778,7 @@ wxFindWindowByName (const wxString& name, wxWindow * parent) return wxWindow::FindWindowByName( name, parent ); } -// Returns menu item id or -1 if none. +// Returns menu item id or wxNOT_FOUND if none. int wxFindMenuItemId (wxFrame * frame, const wxString& menuString, const wxString& itemString) { @@ -638,7 +788,7 @@ wxFindMenuItemId (wxFrame * frame, const wxString& menuString, const wxString& i return menuBar->FindMenuItem (menuString, itemString); #endif // wxUSE_MENUS - return -1; + return wxNOT_FOUND; } // Try to find the deepest child that contains 'pt'. @@ -668,7 +818,7 @@ wxWindow* wxFindWindowAtPoint(wxWindow* win, const wxPoint& pt) } #endif - wxWindowList::Node *node = win->GetChildren().GetLast(); + wxWindowList::compatibility_iterator node = win->GetChildren().GetLast(); while (node) { wxWindow* child = node->GetData(); @@ -697,7 +847,7 @@ wxWindow* wxGenericFindWindowAtPoint(const wxPoint& pt) // Go backwards through the list since windows // on top are likely to have been appended most // recently. - wxWindowList::Node *node = wxTopLevelWindows.GetLast(); + wxWindowList::compatibility_iterator node = wxTopLevelWindows.GetLast(); while (node) { wxWindow* win = node->GetData(); @@ -723,7 +873,14 @@ wxWindow* wxGenericFindWindowAtPoint(const wxPoint& pt) int wxMessageBox(const wxString& message, const wxString& caption, long style, wxWindow *parent, int WXUNUSED(x), int WXUNUSED(y) ) { - wxMessageDialog dialog(parent, message, caption, style); + long decorated_style = style; + + if ( ( style & ( wxICON_EXCLAMATION | wxICON_HAND | wxICON_INFORMATION | wxICON_QUESTION ) ) == 0 ) + { + decorated_style |= ( style & wxYES ) ? wxICON_QUESTION : wxICON_INFORMATION ; + } + + wxMessageDialog dialog(parent, message, caption, decorated_style); int ans = dialog.ShowModal(); switch ( ans ) @@ -749,10 +906,18 @@ int wxMessageBox(const wxString& message, const wxString& caption, long style, wxString wxGetTextFromUser(const wxString& message, const wxString& caption, const wxString& defaultValue, wxWindow *parent, - int x, int y, bool WXUNUSED(centre) ) + wxCoord x, wxCoord y, bool centre ) { wxString str; - wxTextEntryDialog dialog(parent, message, caption, defaultValue, wxOK|wxCANCEL, wxPoint(x, y)); + long style = wxTextEntryDialogStyle; + + if (centre) + style |= wxCENTRE; + else + style &= ~wxCENTRE; + + wxTextEntryDialog dialog(parent, message, caption, defaultValue, style, wxPoint(x, y)); + if (dialog.ShowModal() == wxID_OK) { str = dialog.GetValue(); @@ -764,11 +929,19 @@ wxString wxGetTextFromUser(const wxString& message, const wxString& caption, wxString wxGetPasswordFromUser(const wxString& message, const wxString& caption, const wxString& defaultValue, - wxWindow *parent) + wxWindow *parent, + wxCoord x, wxCoord y, bool centre ) { wxString str; - wxTextEntryDialog dialog(parent, message, caption, defaultValue, - wxOK | wxCANCEL | wxTE_PASSWORD); + long style = wxTextEntryDialogStyle; + + if (centre) + style |= wxCENTRE; + else + style &= ~wxCENTRE; + + wxPasswordEntryDialog dialog(parent, message, caption, defaultValue, + style, wxPoint(x, y)); if ( dialog.ShowModal() == wxID_OK ) { str = dialog.GetValue(); @@ -784,7 +957,7 @@ wxString wxGetPasswordFromUser(const wxString& message, wxColour wxGetColourFromUser(wxWindow *parent, const wxColour& colInit) { wxColourData data; - data.SetChooseFull(TRUE); + data.SetChooseFull(true); if ( colInit.Ok() ) { data.SetColour((wxColour &)colInit); // const_cast @@ -825,20 +998,6 @@ wxFont wxGetFontFromUser(wxWindow *parent, const wxFont& fontInit) } #endif // wxUSE_FONTDLG -// ---------------------------------------------------------------------------- -// missing C RTL functions (FIXME shouldn't be here at all) -// ---------------------------------------------------------------------------- - -#if defined( __MWERKS__ ) && !defined(__MACH__) -char *strdup(const char *s) -{ - return strcpy( (char*) malloc( strlen( s ) + 1 ) , s ) ; -} -int isascii( int c ) -{ - return ( c >= 0 && c < 128 ) ; -} -#endif // __MWERKS__ // ---------------------------------------------------------------------------- // wxSafeYield and supporting functions @@ -846,7 +1005,7 @@ int isascii( int c ) void wxEnableTopLevelWindows(bool enable) { - wxWindowList::Node *node; + wxWindowList::compatibility_iterator node; for ( node = wxTopLevelWindows.GetFirst(); node; node = node->GetNext() ) node->GetData()->Enable(enable); } @@ -857,7 +1016,7 @@ wxWindowDisabler::wxWindowDisabler(wxWindow *winToSkip) // don't reenable them later m_winDisabled = NULL; - wxWindowList::Node *node; + wxWindowList::compatibility_iterator node; for ( node = wxTopLevelWindows.GetFirst(); node; node = node->GetNext() ) { wxWindow *winTop = node->GetData(); @@ -883,7 +1042,7 @@ wxWindowDisabler::wxWindowDisabler(wxWindow *winToSkip) wxWindowDisabler::~wxWindowDisabler() { - wxWindowList::Node *node; + wxWindowList::compatibility_iterator node; for ( node = wxTopLevelWindows.GetFirst(); node; node = node->GetNext() ) { wxWindow *winTop = node->GetData(); @@ -918,9 +1077,8 @@ bool wxSafeYield(wxWindow *win, bool onlyIfNeeded) #ifndef __WXGTK__ bool wxSetDetectableAutoRepeat( bool WXUNUSED(flag) ) { - return TRUE; // detectable auto-repeat is the only mode MSW supports + return true; // detectable auto-repeat is the only mode MSW supports } #endif // !wxGTK #endif // wxUSE_GUI -