diff --git a/checkin_notes b/checkin_notes index b0bceff99c..f03bea00b8 100644 --- a/checkin_notes +++ b/checkin_notes @@ -6167,3 +6167,20 @@ Charlie 15 Oct 2012 clientgui/ BOINCGUIApp.cpp + +Rom 19 Oct 2012 + - MGR: Fix references to the taskbar events which are now included + in the stock wxWidget library + - MGR: Fix the logging class which changed for the new wxWidgets. + - MGR: Add missing references winspool.lib in the linker. + + clientgui\ + BOINCClientManager.cpp + BOINCTaskBar.cpp + LogBOINC.cpp, .h + clientgui\gtk\ + taskbarex.cpp, .h + clientgui\msw\ + taskbarex.cpp, .h + win_build\ + boincmgr.vcproj diff --git a/clientgui/BOINCClientManager.cpp b/clientgui/BOINCClientManager.cpp index 9d0de9e817..a531acea6f 100644 --- a/clientgui/BOINCClientManager.cpp +++ b/clientgui/BOINCClientManager.cpp @@ -223,8 +223,8 @@ bool CBOINCClientManager::StartupBOINCCore() { if (IsBOINCCoreRunning()) return true; #if defined(__WXMSW__) - LPTSTR szExecute = NULL; - LPTSTR szDataDirectory = NULL; + const char* pszExecute = NULL; + const char* pszDataDirectory = NULL; if (IsBOINCConfiguredAsDaemon()) { start_daemon_via_daemonctrl(); @@ -241,7 +241,7 @@ bool CBOINCClientManager::StartupBOINCCore() { ); PROCESS_INFORMATION pi; - STARTUPINFO si; + STARTUPINFOA si; BOOL bProcessStarted; memset(&pi, 0, sizeof(pi)); @@ -251,25 +251,25 @@ bool CBOINCClientManager::StartupBOINCCore() { si.dwFlags = STARTF_USESHOWWINDOW; si.wShowWindow = SW_HIDE; - szExecute = (LPTSTR)strExecute.c_str(); + pszExecute = (const char*)strExecute.mb_str(); if (wxGetApp().GetDataDirectory().empty()) { - szDataDirectory = NULL; + pszDataDirectory = NULL; } else { - szDataDirectory = (LPTSTR)wxGetApp().GetDataDirectory().c_str(); + pszDataDirectory = (const char*)wxGetApp().GetDataDirectory().mb_str(); } - wxLogTrace(wxT("Function Status"), wxT("CMainDocument::StartupBOINCCore - szExecute '%s'\n"), szExecute); - wxLogTrace(wxT("Function Status"), wxT("CMainDocument::StartupBOINCCore - szDataDirectory '%s'\n"), szDataDirectory); + wxLogTrace(wxT("Function Status"), wxT("CMainDocument::StartupBOINCCore - pszExecute '%s'\n"), pszExecute); + wxLogTrace(wxT("Function Status"), wxT("CMainDocument::StartupBOINCCore - pszDataDirectory '%s'\n"), pszDataDirectory); - bProcessStarted = CreateProcess( + bProcessStarted = CreateProcessA( NULL, - szExecute, + (LPSTR)pszExecute, NULL, NULL, FALSE, CREATE_NEW_PROCESS_GROUP|CREATE_NO_WINDOW, NULL, - szDataDirectory, + (LPSTR)pszDataDirectory, &si, &pi ); diff --git a/clientgui/BOINCTaskBar.cpp b/clientgui/BOINCTaskBar.cpp index 10634865b7..7fcba490bd 100644 --- a/clientgui/BOINCTaskBar.cpp +++ b/clientgui/BOINCTaskBar.cpp @@ -59,7 +59,7 @@ BEGIN_EVENT_TABLE(CTaskBarIcon, wxTaskBarIconEx) EVT_TASKBAR_RIGHT_DOWN(CTaskBarIcon::OnRButtonDown) EVT_TASKBAR_RIGHT_UP(CTaskBarIcon::OnRButtonUp) EVT_TASKBAR_CONTEXT_USERCLICK(CTaskBarIcon::OnNotificationClick) - EVT_TASKBAR_BALLOON_TIMEOUT(CTaskBarIcon::OnNotificationTimeout) + EVT_TASKBAR_BALLOON_USERTIMEOUT(CTaskBarIcon::OnNotificationTimeout) #endif EVT_MENU(ID_OPENBOINCMANAGER, CTaskBarIcon::OnOpen) EVT_MENU(ID_OPENWEBSITE, CTaskBarIcon::OnOpenWebsite) diff --git a/clientgui/LogBOINC.cpp b/clientgui/LogBOINC.cpp index e6310f52e4..1045ce34c8 100644 --- a/clientgui/LogBOINC.cpp +++ b/clientgui/LogBOINC.cpp @@ -29,13 +29,13 @@ wxLogBOINC::wxLogBOINC() { m_fp = stdout; } -void wxLogBOINC::DoLogString(const wxChar *szString, time_t t) { +void wxLogBOINC::DoLogText(const wxString& msg) { diagnostics_cycle_logs(); #ifdef __WXMSW__ - wxString strDebug = szString; + wxString strDebug = msg; strDebug += wxT("\r\n"); ::OutputDebugString(strDebug.c_str()); #endif - wxLogStderr::DoLogString(szString, t); + wxLogStderr::DoLogText(msg); } diff --git a/clientgui/LogBOINC.h b/clientgui/LogBOINC.h index 4068bcf1d8..74f0d89e8f 100644 --- a/clientgui/LogBOINC.h +++ b/clientgui/LogBOINC.h @@ -31,7 +31,7 @@ public: wxLogBOINC(); protected: - virtual void DoLogString(const wxChar *szString, time_t t); + virtual void DoLogText(const wxString& msg); }; diff --git a/clientgui/gtk/taskbarex.cpp b/clientgui/gtk/taskbarex.cpp index 4259c1020f..fb2930d612 100644 --- a/clientgui/gtk/taskbarex.cpp +++ b/clientgui/gtk/taskbarex.cpp @@ -88,7 +88,7 @@ extern "C" { wxTaskBarIconExEvent eventUserClicked(wxEVT_TASKBAR_BALLOON_USERCLICK, taskBarIcon); taskBarIcon->AddPendingEvent(eventUserClicked); } else { - wxTaskBarIconExEvent eventTimeout(wxEVT_TASKBAR_BALLOON_TIMEOUT, taskBarIcon); + wxTaskBarIconExEvent eventTimeout(wxEVT_TASKBAR_BALLOON_USERTIMEOUT, taskBarIcon); taskBarIcon->AddPendingEvent(eventTimeout); } @@ -109,7 +109,7 @@ DEFINE_EVENT_TYPE( wxEVT_TASKBAR_SELECT ) DEFINE_EVENT_TYPE( wxEVT_TASKBAR_KEY_SELECT ) DEFINE_EVENT_TYPE( wxEVT_TASKBAR_BALLOON_SHOW ) DEFINE_EVENT_TYPE( wxEVT_TASKBAR_BALLOON_HIDE ) -DEFINE_EVENT_TYPE( wxEVT_TASKBAR_BALLOON_TIMEOUT ) +DEFINE_EVENT_TYPE( wxEVT_TASKBAR_BALLOON_USERTIMEOUT ) DEFINE_EVENT_TYPE( wxEVT_TASKBAR_BALLOON_USERCLICK ) DEFINE_EVENT_TYPE( wxEVT_TASKBAR_SHUTDOWN ) diff --git a/clientgui/gtk/taskbarex.h b/clientgui/gtk/taskbarex.h index 379147abf3..dc8189db70 100644 --- a/clientgui/gtk/taskbarex.h +++ b/clientgui/gtk/taskbarex.h @@ -109,7 +109,7 @@ BEGIN_DECLARE_EVENT_TYPES() DECLARE_EVENT_TYPE( wxEVT_TASKBAR_KEY_SELECT, 1560 ) DECLARE_EVENT_TYPE( wxEVT_TASKBAR_BALLOON_SHOW, 1561 ) DECLARE_EVENT_TYPE( wxEVT_TASKBAR_BALLOON_HIDE, 1562 ) - DECLARE_EVENT_TYPE( wxEVT_TASKBAR_BALLOON_TIMEOUT, 1563 ) + DECLARE_EVENT_TYPE( wxEVT_TASKBAR_BALLOON_USERTIMEOUT, 1563 ) DECLARE_EVENT_TYPE( wxEVT_TASKBAR_BALLOON_USERCLICK, 1564 ) DECLARE_EVENT_TYPE( wxEVT_TASKBAR_SHUTDOWN, 1565 ) END_DECLARE_EVENT_TYPES() @@ -128,7 +128,7 @@ typedef void (wxEvtHandler::*wxTaskBarIconExEventFunction)(wxTaskBarIconExEvent& #define EVT_TASKBAR_KEY_SELECT(fn) wx__DECLARE_TASKBAREXEVT(KEY_SELECT, fn) #define EVT_TASKBAR_BALLOON_SHOW(fn) wx__DECLARE_TASKBAREXEVT(BALLOON_SHOW, fn) #define EVT_TASKBAR_BALLOON_HIDE(fn) wx__DECLARE_TASKBAREXEVT(BALLOON_HIDE, fn) -#define EVT_TASKBAR_BALLOON_TIMEOUT(fn) wx__DECLARE_TASKBAREXEVT(BALLOON_TIMEOUT, fn) +#define EVT_TASKBAR_BALLOON_USERTIMEOUT(fn) wx__DECLARE_TASKBAREXEVT(BALLOON_USERTIMEOUT, fn) #define EVT_TASKBAR_CONTEXT_USERCLICK(fn) wx__DECLARE_TASKBAREXEVT(BALLOON_USERCLICK, fn) #define EVT_TASKBAR_SHUTDOWN(fn) wx__DECLARE_TASKBAREXEVT(SHUTDOWN, fn) diff --git a/clientgui/msw/taskbarex.cpp b/clientgui/msw/taskbarex.cpp index 86c9fce7f7..7f20aa6167 100644 --- a/clientgui/msw/taskbarex.cpp +++ b/clientgui/msw/taskbarex.cpp @@ -55,7 +55,7 @@ DEFINE_EVENT_TYPE( wxEVT_TASKBAR_SELECT ) DEFINE_EVENT_TYPE( wxEVT_TASKBAR_KEY_SELECT ) DEFINE_EVENT_TYPE( wxEVT_TASKBAR_BALLOON_SHOW ) DEFINE_EVENT_TYPE( wxEVT_TASKBAR_BALLOON_HIDE ) -DEFINE_EVENT_TYPE( wxEVT_TASKBAR_BALLOON_TIMEOUT ) +DEFINE_EVENT_TYPE( wxEVT_TASKBAR_BALLOON_USERTIMEOUT ) DEFINE_EVENT_TYPE( wxEVT_TASKBAR_BALLOON_USERCLICK ) DEFINE_EVENT_TYPE( wxEVT_TASKBAR_SHUTDOWN ) DEFINE_EVENT_TYPE( wxEVT_TASKBAR_APPRESTORE ) @@ -304,13 +304,7 @@ WXHWND wxTaskBarIconEx::CreateTaskBarWindow( wxChar* szWindowTitle ) bool wxTaskBarIconEx::IsBalloonsSupported() { - wxInt32 iMajor = 0, iMinor = 0; - if ( wxWINDOWS_NT == wxGetOsVersion( &iMajor, &iMinor ) ) - { - if ( (6 >= iMajor) || ((5 >= iMajor) && (0 <= iMinor)) ) - return true; - } - return false; + return true; } long wxTaskBarIconEx::WindowProc( WXHWND hWnd, unsigned int msg, unsigned int wParam, long lParam ) @@ -394,7 +388,7 @@ long wxTaskBarIconEx::WindowProc( WXHWND hWnd, unsigned int msg, unsigned int wP break; case NIN_BALLOONTIMEOUT: - eventType = wxEVT_TASKBAR_BALLOON_TIMEOUT; + eventType = wxEVT_TASKBAR_BALLOON_USERTIMEOUT; break; case NIN_BALLOONUSERCLICK: diff --git a/clientgui/msw/taskbarex.h b/clientgui/msw/taskbarex.h index 267ba6551b..b382209980 100644 --- a/clientgui/msw/taskbarex.h +++ b/clientgui/msw/taskbarex.h @@ -116,7 +116,7 @@ BEGIN_DECLARE_EVENT_TYPES() DECLARE_EVENT_TYPE( wxEVT_TASKBAR_KEY_SELECT, 1560 ) DECLARE_EVENT_TYPE( wxEVT_TASKBAR_BALLOON_SHOW, 1561 ) DECLARE_EVENT_TYPE( wxEVT_TASKBAR_BALLOON_HIDE, 1562 ) - DECLARE_EVENT_TYPE( wxEVT_TASKBAR_BALLOON_TIMEOUT, 1563 ) + DECLARE_EVENT_TYPE( wxEVT_TASKBAR_BALLOON_USERTIMEOUT, 1563 ) DECLARE_EVENT_TYPE( wxEVT_TASKBAR_BALLOON_USERCLICK, 1564 ) DECLARE_EVENT_TYPE( wxEVT_TASKBAR_SHUTDOWN, 1565 ) DECLARE_EVENT_TYPE( wxEVT_TASKBAR_APPRESTORE, 1566 ) @@ -136,7 +136,7 @@ typedef void (wxEvtHandler::*wxTaskBarIconExEventFunction)(wxTaskBarIconExEvent& #define EVT_TASKBAR_KEY_SELECT(fn) wx__DECLARE_TASKBAREXEVT(KEY_SELECT, fn) #define EVT_TASKBAR_BALLOON_SHOW(fn) wx__DECLARE_TASKBAREXEVT(BALLOON_SHOW, fn) #define EVT_TASKBAR_BALLOON_HIDE(fn) wx__DECLARE_TASKBAREXEVT(BALLOON_HIDE, fn) -#define EVT_TASKBAR_BALLOON_TIMEOUT(fn) wx__DECLARE_TASKBAREXEVT(BALLOON_TIMEOUT, fn) +#define EVT_TASKBAR_BALLOON_USERTIMEOUT(fn) wx__DECLARE_TASKBAREXEVT(BALLOON_USERTIMEOUT, fn) #define EVT_TASKBAR_CONTEXT_USERCLICK(fn) wx__DECLARE_TASKBAREXEVT(BALLOON_USERCLICK, fn) #define EVT_TASKBAR_SHUTDOWN(fn) wx__DECLARE_TASKBAREXEVT(SHUTDOWN, fn) #define EVT_TASKBAR_APPRESTORE(fn) wx__DECLARE_TASKBAREXEVT(APPRESTORE, fn) diff --git a/win_build/boincmgr.vcproj b/win_build/boincmgr.vcproj index 2c8d1f7c23..78ef0c6e95 100644 --- a/win_build/boincmgr.vcproj +++ b/win_build/boincmgr.vcproj @@ -75,7 +75,7 @@ />