diff -BrauN springlobby-0.56.orig/src/alsound.cpp springlobby-0.56/src/alsound.cpp --- springlobby-0.56.orig/src/alsound.cpp 2010-01-15 01:47:32.000000000 +0100 +++ springlobby-0.56/src/alsound.cpp 2010-01-17 10:42:57.000000000 +0100 @@ -49,7 +49,7 @@ alGenSources(m_num_sources,m_sources); if(alGetError()!=AL_NO_ERROR) { - wxLogError( TowxString(alureGetErrorString()) ); + wxLogError( TowxString(alureGetErrorString()), NULL ); return; } @@ -58,14 +58,14 @@ if ( alGetError()!=AL_NO_ERROR ) { - wxLogError( TowxString(alureGetErrorString()) ); + wxLogError( TowxString(alureGetErrorString()), NULL ); return; } alSourcei(m_sources[0], AL_BUFFER, m_buffers[0] ); alSourcei(m_sources[1], AL_BUFFER, m_buffers[1] ); if ( alGetError()!=AL_NO_ERROR ) { - wxLogError( TowxString(alureGetErrorString()) ); + wxLogError( TowxString(alureGetErrorString()), NULL ); return; } } @@ -82,14 +82,14 @@ void ALsound::ring() const { if (alurePlaySource(m_sources[1], 0, 0) == AL_FALSE) - wxLogError( TowxString(alureGetErrorString()) ); + wxLogError( TowxString(alureGetErrorString()), NULL ); } void ALsound::pm() const { if (alurePlaySource(m_sources[0], 0, 0) == AL_FALSE) - wxLogError( TowxString(alureGetErrorString()) ); + wxLogError( TowxString(alureGetErrorString()), NULL ); } #endif diff -BrauN springlobby-0.56.orig/src/curl/base.cpp springlobby-0.56/src/curl/base.cpp --- springlobby-0.56.orig/src/curl/base.cpp 2010-01-15 01:47:32.000000000 +0100 +++ springlobby-0.56/src/curl/base.cpp 2010-01-17 10:57:44.000000000 +0100 @@ -849,7 +849,7 @@ for(unsigned int i = 0; i < m_arrHeaders.Count(); i++) { m_pHeaders = curl_slist_append(m_pHeaders, (const char*)(m_arrHeaders[i].c_str())); - wxLogMessage( m_arrHeaders[i] ); + wxLogMessage( m_arrHeaders[i], NULL ); } SetOpt(CURLOPT_HTTPHEADER, m_pHeaders); diff -BrauN springlobby-0.56.orig/src/httpdownloader.cpp springlobby-0.56/src/httpdownloader.cpp --- springlobby-0.56.orig/src/httpdownloader.cpp 2010-01-15 01:47:32.000000000 +0100 +++ springlobby-0.56/src/httpdownloader.cpp 2010-01-17 10:18:46.000000000 +0100 @@ -81,14 +81,14 @@ } if ( m_noticeOk != wxEmptyString ) notice.SetString( m_noticeOk ); notice.SetInt( FileDownloading.GetError() ); - wxLogMessage( notice.GetString() ); + wxLogMessage( notice.GetString(), NULL ); wxPostEvent( &m_parent, notice ); } return NULL; } catch ( ... ) { - wxLogMessage( _T( "exception on download of" ) + m_fileurl ); + wxLogMessage( _T( "exception on download of" ) + m_fileurl, NULL ); } } @@ -102,7 +102,7 @@ notice.SetString( m_noticeErr ); notice.SetString( notice.GetString() + _( "\nError number: " ) + TowxString( FileDownloading.GetError() ) ); notice.SetInt( FileDownloading.GetError() ); - wxLogError( notice.GetString() ); + wxLogError( notice.GetString(), NULL ); wxPostEvent( &m_parent, notice ); } @@ -133,14 +133,14 @@ { if ( !wxDirExists( file ) ) wxFileName::Mkdir( file, 0775, wxPATH_MKDIR_FULL ); - wxLogWarning( path ); + wxLogWarning( path, NULL ); } else { - wxLogMessage( _T("unzipping: ")+ file ); + wxLogMessage( _T("unzipping: ")+ file, NULL ); wxFFileOutputStream out( file ); if( !out.IsOk() ) - wxLogError( _T("unzipping failed on: ")+ file ); + wxLogError( _T("unzipping failed on: ")+ file, NULL ); else { out.Write( zip ); out.Close(); @@ -150,7 +150,7 @@ } catch ( std::exception& e ) { - wxLogError( TowxString( e.what() ) ); + wxLogError( TowxString( e.what() ), NULL ); return false; } diff -BrauN springlobby-0.56.orig/src/ibattle.cpp springlobby-0.56/src/ibattle.cpp --- springlobby-0.56.orig/src/ibattle.cpp 2010-01-15 01:47:32.000000000 +0100 +++ springlobby-0.56/src/ibattle.cpp 2010-01-17 10:18:46.000000000 +0100 @@ -915,7 +915,7 @@ { for ( std::map<wxString,wxString>::iterator itor = options.begin(); itor != options.end(); itor++ ) { - wxLogWarning( itor->first + _T(" ::: ") + itor->second ); + wxLogWarning( itor->first + _T(" ::: ") + itor->second, NULL ); CustomBattleOptions().setSingleOption( itor->first, itor->second, (OptionsWrapper::GameOption)i ); } } diff -BrauN springlobby-0.56.orig/src/mapgridctrl.cpp springlobby-0.56/src/mapgridctrl.cpp --- springlobby-0.56.orig/src/mapgridctrl.cpp 2010-01-15 01:47:32.000000000 +0100 +++ springlobby-0.56/src/mapgridctrl.cpp 2010-01-17 10:18:46.000000000 +0100 @@ -484,7 +484,7 @@ m_selected_map = map; if ( m_selected_map != NULL ) { - wxLogMessage( _T("MapGridCtrl: Selected map: ") + m_selected_map->name ); + wxLogMessage( _T("MapGridCtrl: Selected map: ") + m_selected_map->name, NULL ); wxCommandEvent evt( MapSelectedEvt, GetId() ); evt.SetEventObject( this ); diff -BrauN springlobby-0.56.orig/src/mmoptionwindows.cpp springlobby-0.56/src/mmoptionwindows.cpp --- springlobby-0.56.orig/src/mmoptionwindows.cpp 2010-01-15 01:47:32.000000000 +0100 +++ springlobby-0.56/src/mmoptionwindows.cpp 2010-01-17 10:37:52.000000000 +0100 @@ -134,7 +134,7 @@ { double d = m_spinctrl->GetValue() ; value = wxString::Format( _T("%f"),d ); - wxLogMessage( wxString::Format( _T("Got VALUE: %s -- %f") , value.c_str(), d ) ); + wxLogMessage( wxString::Format( _T("Got VALUE: %s -- %f") , value.c_str(), d ), NULL ); } else if ( m_checkbox ) value = TowxString( m_checkbox->GetValue() ); m_battle.CustomBattleOptions().setSingleOption( key, value, optFlag ); diff -BrauN springlobby-0.56.orig/src/serverevents.cpp springlobby-0.56/src/serverevents.cpp --- springlobby-0.56.orig/src/serverevents.cpp 2010-01-15 01:47:32.000000000 +0100 +++ springlobby-0.56/src/serverevents.cpp 2010-01-17 10:18:46.000000000 +0100 @@ -182,7 +182,7 @@ } catch (...) { - wxLogWarning( _("OnUserStatus() failed ! (exception)") ); + wxLogWarning( _("OnUserStatus() failed ! (exception)"), NULL ); } } @@ -956,7 +956,7 @@ void ServerEvents::OnSpringDownloadEvent( wxCommandEvent& event ) { int code = event.GetInt(); - wxLogMessage(event.GetString()); + wxLogMessage(event.GetString(), NULL ); if ( code != 0) { customMessageBox(SL_MAIN_ICON, _("There was an error downloading for the latest version.\n"), _("Error")); diff -BrauN springlobby-0.56.orig/src/settings++/se_utils.cpp springlobby-0.56/src/settings++/se_utils.cpp --- springlobby-0.56.orig/src/settings++/se_utils.cpp 2010-01-15 01:47:32.000000000 +0100 +++ springlobby-0.56/src/settings++/se_utils.cpp 2010-01-17 10:18:46.000000000 +0100 @@ -38,7 +38,7 @@ { if ( !wxLaunchDefaultBrowser( url ) ) { - wxLogWarning( _( "can't launch default browser" ) ); + wxLogWarning( _( "can't launch default browser" ), NULL ); customMessageBox( SL_MAIN_ICON, _( "Couldn't launch browser. URL is: " ) + url, _( "Couldn't launch browser." ) ); } } diff -BrauN springlobby-0.56.orig/src/spring.cpp springlobby-0.56/src/spring.cpp --- springlobby-0.56.orig/src/spring.cpp 2010-01-15 01:47:32.000000000 +0100 +++ springlobby-0.56/src/spring.cpp 2010-01-17 10:18:46.000000000 +0100 @@ -78,7 +78,7 @@ bool Spring::RunReplay ( const wxString& filename ) { - wxLogMessage( _T("launching spring with replay: ") + filename ); + wxLogMessage( _T("launching spring with replay: ") + filename, NULL ); return LaunchSpring( _T("\"") + filename + _T("\"") ); } diff -BrauN springlobby-0.56.orig/src/springunitsync.cpp springlobby-0.56/src/springunitsync.cpp --- springlobby-0.56.orig/src/springunitsync.cpp 2010-01-15 01:47:32.000000000 +0100 +++ springlobby-0.56/src/springunitsync.cpp 2010-01-17 10:18:46.000000000 +0100 @@ -114,7 +114,7 @@ m_map_array.Add( name ); } catch (...) { - wxLogError( _T("Found map with hash collision: ") + name + _T(" hash: ") + hash ); + wxLogError( _T("Found map with hash collision: ") + name + _T(" hash: ") + hash, NULL ); } } int numMods = susynclib().GetPrimaryModCount(); @@ -140,7 +140,7 @@ m_mod_array.Add( name ); } catch (...) { - wxLogError( _T("Found mod with hash collision: ") + name + _T(" hash: ") + hash ); + wxLogError( _T("Found mod with hash collision: ") + name + _T(" hash: ") + hash, NULL ); } } } diff -BrauN springlobby-0.56.orig/src/tasserver.cpp springlobby-0.56/src/tasserver.cpp --- springlobby-0.56.orig/src/tasserver.cpp 2010-01-15 01:47:32.000000000 +0100 +++ springlobby-0.56/src/tasserver.cpp 2010-01-17 10:18:46.000000000 +0100 @@ -936,7 +936,7 @@ bstatus.colour = wxColour( color.color.red, color.color.green, color.color.blue ); ai = GetSentenceParam( params ); if ( ai.IsEmpty() ) { - wxLogWarning( wxString::Format( _T("Recieved illegal ADDBOT (empty dll field) from %s for battle %d"), nick.c_str(), id ) ); + wxLogWarning( wxString::Format( _T("Recieved illegal ADDBOT (empty dll field) from %s for battle %d"), nick.c_str(), id ), NULL ); ai = _T("INVALID|INVALID"); } if( usync().VersionSupports( IUnitSync::USYNC_GetSkirmishAI ) ) diff -BrauN springlobby-0.56.orig/src/torrentwrapper.cpp springlobby-0.56/src/torrentwrapper.cpp --- springlobby-0.56.orig/src/torrentwrapper.cpp 2010-01-15 01:47:32.000000000 +0100 +++ springlobby-0.56/src/torrentwrapper.cpp 2010-01-17 10:22:34.000000000 +0100 @@ -157,7 +157,7 @@ } catch (std::exception& e) { - wxLogError( TowxString( e.what() ) ); + wxLogError( TowxString( e.what() ), NULL ); } try { @@ -165,7 +165,7 @@ } catch (std::exception& e) { - wxLogError( TowxString( e.what() ) ); + wxLogError( TowxString( e.what() ), NULL ); } //these extensions proved o be too problematic on win so i flat out disable them #ifndef __WXMSW__ @@ -175,7 +175,7 @@ } catch (std::exception& e) { - wxLogError( TowxString( e.what() ) ); + wxLogError( TowxString( e.what() ), NULL ); } try { @@ -183,7 +183,7 @@ } catch (std::exception& e) { - wxLogError( TowxString( e.what() ) ); + wxLogError( TowxString( e.what() ), NULL ); } try { @@ -191,7 +191,7 @@ } catch (std::exception& e) { - wxLogError( TowxString( e.what() ) ); + wxLogError( TowxString( e.what() ), NULL ); } #endif UpdateSettings(); @@ -237,7 +237,7 @@ } catch (std::exception& e) { - wxLogError( TowxString( e.what() ) ); + wxLogError( TowxString( e.what() ), NULL ); } try { @@ -245,7 +245,7 @@ } catch (std::exception& e) { - wxLogError( TowxString( e.what() ) ); + wxLogError( TowxString( e.what() ), NULL ); } try { @@ -253,7 +253,7 @@ } catch (std::exception& e) { - wxLogError( TowxString( e.what() ) ); + wxLogError( TowxString( e.what() ), NULL ); } #endif delete m_torr; @@ -293,7 +293,7 @@ } catch (std::exception& e) { - wxLogError( TowxString( e.what() ) ); // TODO (BrainDamage#1#): add message to user on failure + wxLogError( TowxString( e.what() ), NULL ); // TODO (BrainDamage#1#): add message to user on failure } } @@ -424,7 +424,7 @@ } catch (std::exception& e) { - wxLogError( TowxString( e.what() ) ); // TODO (BrainDamage#1#): add message to user on failure + wxLogError( TowxString( e.what() ), NULL ); // TODO (BrainDamage#1#): add message to user on failure } } diff -BrauN springlobby-0.56.orig/src/updater/updater.cpp springlobby-0.56/src/updater/updater.cpp --- springlobby-0.56.orig/src/updater/updater.cpp 2010-01-15 01:47:32.000000000 +0100 +++ springlobby-0.56/src/updater/updater.cpp 2010-01-17 10:18:46.000000000 +0100 @@ -127,7 +127,7 @@ wxString current = GetSpringLobbyVersion(false); long minor = std::numeric_limits<long>::max(); bool convert_ok = current.AfterLast( '.' ).ToLong( &minor ); - wxLogMessage( wxString::Format( _T("Got minor rev %d"), minor ) ); + wxLogMessage( wxString::Format( _T("Got minor rev %d"), minor ), NULL ); if ( minor > 43 || !convert_ok ) //0.43 was the last build on old mingw return true; //all is well, we're already on a mingw4.4 build wxString base = wxPathOnly( wxStandardPaths::Get().GetExecutablePath() ) + wxFileName::GetPathSeparator() ; diff -BrauN springlobby-0.56.orig/src/utils/downloader.cpp springlobby-0.56/src/utils/downloader.cpp --- springlobby-0.56.orig/src/utils/downloader.cpp 2010-01-15 01:47:32.000000000 +0100 +++ springlobby-0.56/src/utils/downloader.cpp 2010-01-17 10:47:52.000000000 +0100 @@ -230,7 +230,7 @@ info.m_local_torrent_filepath = dl_target; } catch ( std::exception& e ) { - wxLogError( _T("downloading file failed: :") + dl_target ); + wxLogError( _T("downloading file failed: :") + dl_target, NULL ); return false; } return true; diff -BrauN springlobby-0.56.orig/src/utils/platform.cpp springlobby-0.56/src/utils/platform.cpp --- springlobby-0.56.orig/src/utils/platform.cpp 2010-01-15 01:47:32.000000000 +0100 +++ springlobby-0.56/src/utils/platform.cpp 2010-01-17 10:42:04.000000000 +0100 @@ -166,7 +166,7 @@ // first make sure that the source dir exists if(!wxDir::Exists(from)) { - wxLogError(from + _T(" does not exist. Can not copy directory.") ); + wxLogError(from + _T(" does not exist. Can not copy directory."), NULL ); return false; } @@ -210,7 +210,7 @@ // first make sure that the source dir exists if(!wxDir::Exists(from)) { - wxLogError(from + _T(" does not exist. Can not copy directory.") ); + wxLogError(from + _T(" does not exist. Can not copy directory."), NULL ); return false; } @@ -238,13 +238,13 @@ } //make backup if ( !wxRenameFile( to + filename, to + filename + _T(".old") ) ) { - wxLogError( wxString::Format( _T("could not rename %s, copydir aborted"), (to + filename).c_str() ) ); + wxLogError( wxString::Format( _T("could not rename %s, copydir aborted"), (to + filename).c_str() ), NULL ); return false; } } //do the actual copy if ( !wxCopyFile(from + filename, to + filename, overwrite) ) { - wxLogError( wxString::Format( _T("could not copy %s to %s, copydir aborted"), (from + filename).c_str(), (to + filename).c_str() ) ); + wxLogError( wxString::Format( _T("could not copy %s to %s, copydir aborted"), (from + filename).c_str(), (to + filename).c_str() ), NULL ); return false; } } diff -BrauN springlobby-0.56.orig/src/widgets/widget.cpp springlobby-0.56/src/widgets/widget.cpp --- springlobby-0.56.orig/src/widgets/widget.cpp 2010-01-15 01:47:32.000000000 +0100 +++ springlobby-0.56/src/widgets/widget.cpp 2010-01-17 10:18:46.000000000 +0100 @@ -129,7 +129,7 @@ } catch (...) { - wxLogMessage(_T("exception on download of") + fileurl); + wxLogMessage(_T("exception on download of") + fileurl, NULL ); return false; } } @@ -236,7 +236,7 @@ } catch (...) { - wxLogMessage(_T("exception on download of") + fileurl); + wxLogMessage(_T("exception on download of") + fileurl, NULL ); return false; } }