From 490f098fd0fe28cafd4eaaec9ea5cebb6eff2cf4 Mon Sep 17 00:00:00 2001 From: Rom Walton Date: Fri, 3 Dec 2004 22:06:39 +0000 Subject: [PATCH] *** empty log message *** svn path=/trunk/boinc/; revision=4737 --- clientgui/BOINCGUIApp.rc | 2 +- clientgui/DlgAbout.cpp | 2 +- clientgui/MainFrame.cpp | 130 +++++++++++++++++++-------------------- lib/gui_rpc_client.C | 1 + 4 files changed, 68 insertions(+), 67 deletions(-) diff --git a/clientgui/BOINCGUIApp.rc b/clientgui/BOINCGUIApp.rc index f656049010..eb6e7e4cc1 100644 --- a/clientgui/BOINCGUIApp.rc +++ b/clientgui/BOINCGUIApp.rc @@ -8,7 +8,7 @@ // Generated from the TEXTINCLUDE 2 resource. // #include -#include "win_config.h" +#include "version.h" ///////////////////////////////////////////////////////////////////////////// #undef APSTUDIO_READONLY_SYMBOLS diff --git a/clientgui/DlgAbout.cpp b/clientgui/DlgAbout.cpp index 8e3d8613d5..cd42fae2b1 100644 --- a/clientgui/DlgAbout.cpp +++ b/clientgui/DlgAbout.cpp @@ -32,7 +32,7 @@ static volatile const char *BOINCrcsid="$Id$"; #include "DlgAbout.h" #ifdef __WXMSW__ -#include "win_config.h" +#include "version.h" #else #include "config.h" #endif diff --git a/clientgui/MainFrame.cpp b/clientgui/MainFrame.cpp index 4a5a7f8fd4..cc28212354 100644 --- a/clientgui/MainFrame.cpp +++ b/clientgui/MainFrame.cpp @@ -79,8 +79,8 @@ END_EVENT_TABLE () CMainFrame::CMainFrame() { - wxLogTrace(wxT("Function Start/End"), wxT("CMainFrame::CMainFrame - Default Constructor Function Begin")); - wxLogTrace(wxT("Function Start/End"), wxT("CMainFrame::CMainFrame - Default Constructor Function End")); + fprintf(stderr, wxT("CMainFrame::CMainFrame - Default Constructor Function Begin")); + fprintf(stderr, wxT("CMainFrame::CMainFrame - Default Constructor Function End")); } @@ -88,8 +88,8 @@ CMainFrame::CMainFrame(wxString strTitle) : wxFrame ((wxFrame *)NULL, -1, strTitle, wxDefaultPosition, wxDefaultSize, wxDEFAULT_FRAME_STYLE | wxNO_FULL_REPAINT_ON_RESIZE) { - wxLogTrace(wxT("Function Start/End"), wxT("CMainFrame::CMainFrame - Function Begin")); - + fprintf(stderr, wxT("CMainFrame::CMainFrame - Function Begin")); + m_pMenubar = NULL; m_pNotebook = NULL; m_pStatusbar = NULL; @@ -124,13 +124,13 @@ CMainFrame::CMainFrame(wxString strTitle) : RestoreState(); - wxLogTrace(wxT("Function Start/End"), wxT("CMainFrame::CMainFrame - Function End")); + fprintf(stderr, wxT("CMainFrame::CMainFrame - Function End")); } CMainFrame::~CMainFrame() { - wxLogTrace(wxT("Function Start/End"), wxT("CMainFrame::~CMainFrame - Function Begin")); + fprintf(stderr, wxT("CMainFrame::~CMainFrame - Function Begin")); wxASSERT(NULL != m_pFrameRenderTimer); wxASSERT(NULL != m_pFrameTaskPanelRenderTimer); @@ -167,13 +167,13 @@ CMainFrame::~CMainFrame() if (m_pMenubar) wxCHECK_RET(DeleteMenu(), _T("Failed to delete menu bar.")); - wxLogTrace(wxT("Function Start/End"), wxT("CMainFrame::~CMainFrame - Function End")); + fprintf(stderr, wxT("CMainFrame::~CMainFrame - Function End")); } bool CMainFrame::CreateMenu() { - wxLogTrace(wxT("Function Start/End"), wxT("CMainFrame::CreateMenu - Function Begin")); + fprintf(stderr, wxT("CMainFrame::CreateMenu - Function Begin")); // File menu wxMenu *menuFile = new wxMenu; @@ -266,14 +266,14 @@ bool CMainFrame::CreateMenu() ); SetMenuBar(m_pMenubar); - wxLogTrace(wxT("Function Start/End"), wxT("CMainFrame::CreateMenu - Function End")); + fprintf(stderr, wxT("CMainFrame::CreateMenu - Function End")); return true; } bool CMainFrame::CreateNotebook() { - wxLogTrace(wxT("Function Start/End"), wxT("CMainFrame::CreateNotebook - Function Begin")); + fprintf(stderr, wxT("CMainFrame::CreateNotebook - Function Begin")); // create frame panel wxPanel *pPanel = new wxPanel(this, -1, wxDefaultPosition, wxDefaultSize, @@ -301,7 +301,7 @@ bool CMainFrame::CreateNotebook() CreateNotebookPage( new CViewMessages( m_pNotebook ) ); CreateNotebookPage( new CViewResources( m_pNotebook ) ); - wxLogTrace(wxT("Function Start/End"), wxT("CMainFrame::CreateNotebook - Function End")); + fprintf(stderr, wxT("CMainFrame::CreateNotebook - Function End")); return true; } @@ -309,7 +309,7 @@ bool CMainFrame::CreateNotebook() template < class T > bool CMainFrame::CreateNotebookPage(T pwndNewNotebookPage) { - wxLogTrace(wxT("Function Start/End"), wxT("CMainFrame::CreateNotebookPage - Function Begin")); + fprintf(stderr, wxT("CMainFrame::CreateNotebookPage - Function Begin")); wxImageList* pImageList; wxInt32 iImageIndex = 0; @@ -329,14 +329,14 @@ bool CMainFrame::CreateNotebookPage(T pwndNewNotebookPage) iImageIndex = pImageList->Add(wxBitmap(pwndNewNotebookPage->GetViewIcon()), wxColour(255, 0, 255)); m_pNotebook->AddPage(pwndNewNotebookPage, pwndNewNotebookPage->GetViewName(), TRUE, iImageIndex); - wxLogTrace(wxT("Function Start/End"), wxT("CMainFrame::CreateNotebookPage - Function End")); + fprintf(stderr, wxT("CMainFrame::CreateNotebookPage - Function End")); return true; } bool CMainFrame::CreateStatusbar() { - wxLogTrace(wxT("Function Start/End"), wxT("CMainFrame::CreateStatusbar - Function Begin")); + fprintf(stderr, wxT("CMainFrame::CreateStatusbar - Function Begin")); if (m_pStatusbar) return true; @@ -358,23 +358,23 @@ bool CMainFrame::CreateStatusbar() SendSizeEvent(); - wxLogTrace(wxT("Function Start/End"), wxT("CMainFrame::CreateStatusbar - Function End")); + fprintf(stderr, wxT("CMainFrame::CreateStatusbar - Function End")); return true; } bool CMainFrame::DeleteMenu() { - wxLogTrace(wxT("Function Start/End"), wxT("CMainFrame::DeleteMenu - Function Begin")); + fprintf(stderr, wxT("CMainFrame::DeleteMenu - Function Begin")); - wxLogTrace(wxT("Function Start/End"), wxT("CMainFrame::DeleteMenu - Function End")); + fprintf(stderr, wxT("CMainFrame::DeleteMenu - Function End")); return true; } bool CMainFrame::DeleteNotebook() { - wxLogTrace(wxT("Function Start/End"), wxT("CMainFrame::DeleteNotebook - Function Begin")); + fprintf(stderr, wxT("CMainFrame::DeleteNotebook - Function Begin")); wxImageList* pImageList; @@ -387,14 +387,14 @@ bool CMainFrame::DeleteNotebook() if (pImageList) delete pImageList; - wxLogTrace(wxT("Function Start/End"), wxT("CMainFrame::DeleteNotebook - Function End")); + fprintf(stderr, wxT("CMainFrame::DeleteNotebook - Function End")); return true; } bool CMainFrame::DeleteStatusbar() { - wxLogTrace(wxT("Function Start/End"), wxT("CMainFrame::DeleteStatusbar - Function Begin")); + fprintf(stderr, wxT("CMainFrame::DeleteStatusbar - Function Begin")); if (!m_pStatusbar) return true; @@ -406,14 +406,14 @@ bool CMainFrame::DeleteStatusbar() SendSizeEvent(); - wxLogTrace(wxT("Function Start/End"), wxT("CMainFrame::DeleteStatusbar - Function End")); + fprintf(stderr, wxT("CMainFrame::DeleteStatusbar - Function End")); return true; } bool CMainFrame::SaveState() { - wxLogTrace(wxT("Function Start/End"), wxT("CMainFrame::SaveState - Function Begin")); + fprintf(stderr, wxT("CMainFrame::SaveState - Function Begin")); wxString strBaseConfigLocation = wxString(wxT("/")); wxConfigBase* pConfig = wxConfigBase::Get(FALSE); @@ -461,14 +461,14 @@ bool CMainFrame::SaveState() pConfig->SetPath(strPreviousLocation); } - wxLogTrace(wxT("Function Start/End"), wxT("CMainFrame::SaveState - Function End")); + fprintf(stderr, wxT("CMainFrame::SaveState - Function End")); return true; } bool CMainFrame::RestoreState() { - wxLogTrace(wxT("Function Start/End"), wxT("CMainFrame::RestoreState - Function Begin")); + fprintf(stderr, wxT("CMainFrame::RestoreState - Function Begin")); wxString strBaseConfigLocation = wxString(wxT("/")); wxConfigBase* pConfig = wxConfigBase::Get(FALSE); @@ -526,24 +526,24 @@ bool CMainFrame::RestoreState() } - wxLogTrace(wxT("Function Start/End"), wxT("CMainFrame::RestoreState - Function End")); + fprintf(stderr, wxT("CMainFrame::RestoreState - Function End")); return true; } void CMainFrame::OnHide( wxCommandEvent& WXUNUSED(event) ) { - wxLogTrace(wxT("Function Start/End"), wxT("CMainFrame::OnHide - Function Begin")); + fprintf(stderr, wxT("CMainFrame::OnHide - Function Begin")); Hide(); - wxLogTrace(wxT("Function Start/End"), wxT("CMainFrame::OnHide - Function End")); + fprintf(stderr, wxT("CMainFrame::OnHide - Function End")); } void CMainFrame::OnActivitySelection( wxCommandEvent& event ) { - wxLogTrace(wxT("Function Start/End"), wxT("CMainFrame::OnActivitySelection - Function Begin")); + fprintf(stderr, wxT("CMainFrame::OnActivitySelection - Function Begin")); CMainDocument* pDoc = wxGetApp().GetDocument(); @@ -563,13 +563,13 @@ void CMainFrame::OnActivitySelection( wxCommandEvent& event ) break; } - wxLogTrace(wxT("Function Start/End"), wxT("CMainFrame::OnActivitySelection - Function End")); + fprintf(stderr, wxT("CMainFrame::OnActivitySelection - Function End")); } void CMainFrame::OnNetworkSelection( wxCommandEvent& event ) { - wxLogTrace(wxT("Function Start/End"), wxT("CMainFrame::OnNetworkSelection - Function Begin")); + fprintf(stderr, wxT("CMainFrame::OnNetworkSelection - Function Begin")); CMainDocument* pDoc = wxGetApp().GetDocument(); @@ -591,13 +591,13 @@ void CMainFrame::OnNetworkSelection( wxCommandEvent& event ) break; } - wxLogTrace(wxT("Function Start/End"), wxT("CMainFrame::OnNetworkSelection - Function End")); + fprintf(stderr, wxT("CMainFrame::OnNetworkSelection - Function End")); } void CMainFrame::OnRunBenchmarks( wxCommandEvent& WXUNUSED(event) ) { - wxLogTrace(wxT("Function Start/End"), wxT("CMainFrame::OnRunBenchmarks - Function Begin")); + fprintf(stderr, wxT("CMainFrame::OnRunBenchmarks - Function Begin")); CMainDocument* pDoc = wxGetApp().GetDocument(); wxASSERT(NULL != m_pNotebook); @@ -607,13 +607,13 @@ void CMainFrame::OnRunBenchmarks( wxCommandEvent& WXUNUSED(event) ) m_pNotebook->SetSelection( ID_LIST_MESSAGESVIEW - ID_LIST_BASE ); pDoc->RunBenchmarks(); - wxLogTrace(wxT("Function Start/End"), wxT("CMainFrame::OnRunBenchmarks - Function End")); + fprintf(stderr, wxT("CMainFrame::OnRunBenchmarks - Function End")); } void CMainFrame::OnSelectComputer( wxCommandEvent& WXUNUSED(event) ) { - wxLogTrace(wxT("Function Start/End"), wxT("CMainFrame::OnSelectComputer - Function Begin")); + fprintf(stderr, wxT("CMainFrame::OnSelectComputer - Function Begin")); wxInt32 iRetVal = -1; wxString strMachine = wxEmptyString; @@ -635,23 +635,23 @@ void CMainFrame::OnSelectComputer( wxCommandEvent& WXUNUSED(event) ) wxICON_ERROR ); - wxLogTrace(wxT("Function Start/End"), wxT("CMainFrame::OnSelectComputer - Function End")); + fprintf(stderr, wxT("CMainFrame::OnSelectComputer - Function End")); } void CMainFrame::OnExit( wxCommandEvent& WXUNUSED(event) ) { - wxLogTrace(wxT("Function Start/End"), wxT("CMainFrame::OnExit - Function Begin")); + fprintf(stderr, wxT("CMainFrame::OnExit - Function Begin")); Close(true); - wxLogTrace(wxT("Function Start/End"), wxT("CMainFrame::OnExit - Function End")); + fprintf(stderr, wxT("CMainFrame::OnExit - Function End")); } void CMainFrame::OnToolsOptions( wxCommandEvent& WXUNUSED(event) ) { - wxLogTrace(wxT("Function Start/End"), wxT("CMainFrame::OnToolsOptions - Function Begin")); + fprintf(stderr, wxT("CMainFrame::OnToolsOptions - Function Begin")); CMainDocument* pDoc = wxGetApp().GetDocument(); CDlgOptions* pDlg = new CDlgOptions(this); @@ -732,13 +732,13 @@ void CMainFrame::OnToolsOptions( wxCommandEvent& WXUNUSED(event) ) if (pDlg) pDlg->Destroy(); - wxLogTrace(wxT("Function Start/End"), wxT("CMainFrame::OnToolsOptions - Function End")); + fprintf(stderr, wxT("CMainFrame::OnToolsOptions - Function End")); } void CMainFrame::OnAbout( wxCommandEvent& WXUNUSED(event) ) { - wxLogTrace(wxT("Function Start/End"), wxT("CMainFrame::OnAbout - Function Begin")); + fprintf(stderr, wxT("CMainFrame::OnAbout - Function Begin")); CDlgAbout* pDlg = new CDlgAbout(this); wxASSERT(NULL != pDlg); @@ -748,13 +748,13 @@ void CMainFrame::OnAbout( wxCommandEvent& WXUNUSED(event) ) if (pDlg) pDlg->Destroy(); - wxLogTrace(wxT("Function Start/End"), wxT("CMainFrame::OnAbout - Function End")); + fprintf(stderr, wxT("CMainFrame::OnAbout - Function End")); } void CMainFrame::OnUpdateActivitySelection( wxUpdateUIEvent& event ) { - wxLogTrace(wxT("Function Start/End"), wxT("CMainFrame::OnUpdateActivitySelection - Function Begin")); + fprintf(stderr, wxT("CMainFrame::OnUpdateActivitySelection - Function Begin")); CMainDocument* pDoc = wxGetApp().GetDocument(); wxMenuBar* pMenuBar = GetMenuBar(); @@ -785,13 +785,13 @@ void CMainFrame::OnUpdateActivitySelection( wxUpdateUIEvent& event ) break; } - wxLogTrace(wxT("Function Start/End"), wxT("CMainFrame::OnUpdateActivitySelection - Function End")); + fprintf(stderr, wxT("CMainFrame::OnUpdateActivitySelection - Function End")); } void CMainFrame::OnUpdateNetworkSelection( wxUpdateUIEvent& event ) { - wxLogTrace(wxT("Function Start/End"), wxT("CMainFrame::OnUpdateNetworkSelection - Function Begin")); + fprintf(stderr, wxT("CMainFrame::OnUpdateNetworkSelection - Function Begin")); CMainDocument* pDoc = wxGetApp().GetDocument(); wxMenuBar* pMenuBar = GetMenuBar(); @@ -822,13 +822,13 @@ void CMainFrame::OnUpdateNetworkSelection( wxUpdateUIEvent& event ) break; } - wxLogTrace(wxT("Function Start/End"), wxT("CMainFrame::OnUpdateNetworkSelection - Function End")); + fprintf(stderr, wxT("CMainFrame::OnUpdateNetworkSelection - Function End")); } void CMainFrame::OnIdle( wxIdleEvent& event ) { - wxLogTrace(wxT("Function Start/End"), wxT("CMainFrame::OnIdle - Function Begin")); + fprintf(stderr, wxT("CMainFrame::OnIdle - Function Begin")); CMainDocument* pDoc = wxGetApp().GetDocument(); @@ -840,26 +840,26 @@ void CMainFrame::OnIdle( wxIdleEvent& event ) event.Skip(); - wxLogTrace(wxT("Function Start/End"), wxT("CMainFrame::OnIdle - Function End")); + fprintf(stderr, wxT("CMainFrame::OnIdle - Function End")); } void CMainFrame::OnClose( wxCloseEvent& event ) { - wxLogTrace(wxT("Function Start/End"), wxT("CMainFrame::OnClose - Function Begin")); + fprintf(stderr, wxT("CMainFrame::OnClose - Function Begin")); if ( !event.CanVeto() ) Destroy(); else Hide(); - wxLogTrace(wxT("Function Start/End"), wxT("CMainFrame::OnClose - Function End")); + fprintf(stderr, wxT("CMainFrame::OnClose - Function End")); } void CMainFrame::OnSize( wxSizeEvent& event ) { - wxLogTrace(wxT("Function Start/End"), wxT("CMainFrame::OnSize - Function Begin")); + fprintf(stderr, wxT("CMainFrame::OnSize - Function Begin")); if ( IsShown() ) { @@ -886,13 +886,13 @@ void CMainFrame::OnSize( wxSizeEvent& event ) event.Skip(); - wxLogTrace(wxT("Function Start/End"), wxT("CMainFrame::OnSize - Function End")); + fprintf(stderr, wxT("CMainFrame::OnSize - Function End")); } void CMainFrame::OnChar( wxKeyEvent& event ) { - wxLogTrace(wxT("Function Start/End"), wxT("CMainFrame::OnChar - Function Begin")); + fprintf(stderr, wxT("CMainFrame::OnChar - Function Begin")); if ( IsShown() ) { @@ -912,13 +912,13 @@ void CMainFrame::OnChar( wxKeyEvent& event ) event.Skip(); - wxLogTrace(wxT("Function Start/End"), wxT("CMainFrame::OnChar - Function End")); + fprintf(stderr, wxT("CMainFrame::OnChar - Function End")); } void CMainFrame::OnNotebookSelectionChanged( wxNotebookEvent& event ) { - wxLogTrace(wxT("Function Start/End"), wxT("CMainFrame::OnNotebookSelectionChanged - Function Begin")); + fprintf(stderr, wxT("CMainFrame::OnNotebookSelectionChanged - Function Begin")); if ( (-1 != event.GetSelection()) && IsShown() ) { @@ -940,13 +940,13 @@ void CMainFrame::OnNotebookSelectionChanged( wxNotebookEvent& event ) event.Skip(); - wxLogTrace(wxT("Function Start/End"), wxT("CMainFrame::OnNotebookSelectionChanged - Function End")); + fprintf(stderr, wxT("CMainFrame::OnNotebookSelectionChanged - Function End")); } void CMainFrame::OnListSelected( wxListEvent& event ) { - wxLogTrace(wxT("Function Start/End"), wxT("CMainFrame::OnListSelected - Function Begin")); + fprintf(stderr, wxT("CMainFrame::OnListSelected - Function Begin")); if ( IsShown() ) { @@ -966,13 +966,13 @@ void CMainFrame::OnListSelected( wxListEvent& event ) event.Skip(); - wxLogTrace(wxT("Function Start/End"), wxT("CMainFrame::OnListSelected - Function End")); + fprintf(stderr, wxT("CMainFrame::OnListSelected - Function End")); } void CMainFrame::OnListDeselected( wxListEvent& event ) { - wxLogTrace(wxT("Function Start/End"), wxT("CMainFrame::OnListDeselected - Function Begin")); + fprintf(stderr, wxT("CMainFrame::OnListDeselected - Function Begin")); if ( IsShown() ) { @@ -992,13 +992,13 @@ void CMainFrame::OnListDeselected( wxListEvent& event ) event.Skip(); - wxLogTrace(wxT("Function Start/End"), wxT("CMainFrame::OnListDeselected - Function End")); + fprintf(stderr, wxT("CMainFrame::OnListDeselected - Function End")); } void CMainFrame::OnFrameRender( wxTimerEvent &event ) { - wxLogTrace(wxT("Function Start/End"), wxT("CMainFrame::OnFrameRender - Function Begin")); + fprintf(stderr, wxT("CMainFrame::OnFrameRender - Function Begin")); if ( IsShown() ) { @@ -1035,13 +1035,13 @@ void CMainFrame::OnFrameRender( wxTimerEvent &event ) event.Skip(); - wxLogTrace(wxT("Function Start/End"), wxT("CMainFrame::OnFrameRender - Function End")); + fprintf(stderr, wxT("CMainFrame::OnFrameRender - Function End")); } void CMainFrame::OnListPanelRender( wxTimerEvent &event ) { - wxLogTrace(wxT("Function Start/End"), wxT("CMainFrame::OnListPanelRender - Function Begin")); + fprintf(stderr, wxT("CMainFrame::OnListPanelRender - Function Begin")); if ( IsShown() ) { @@ -1061,13 +1061,13 @@ void CMainFrame::OnListPanelRender( wxTimerEvent &event ) event.Skip(); - wxLogTrace(wxT("Function Start/End"), wxT("CMainFrame::OnListPanelRender - Function End")); + fprintf(stderr, wxT("CMainFrame::OnListPanelRender - Function End")); } void CMainFrame::OnTaskPanelRender( wxTimerEvent &event ) { - wxLogTrace(wxT("Function Start/End"), wxT("CMainFrame::OnTaskPanelRender - Function Begin")); + fprintf(stderr, wxT("CMainFrame::OnTaskPanelRender - Function Begin")); if ( IsShown() ) { @@ -1087,6 +1087,6 @@ void CMainFrame::OnTaskPanelRender( wxTimerEvent &event ) event.Skip(); - wxLogTrace(wxT("Function Start/End"), wxT("CMainFrame::OnTaskPanelRender - Function End")); + fprintf(stderr, wxT("CMainFrame::OnTaskPanelRender - Function End")); } diff --git a/lib/gui_rpc_client.C b/lib/gui_rpc_client.C index af5e856b3f..11e5265a43 100644 --- a/lib/gui_rpc_client.C +++ b/lib/gui_rpc_client.C @@ -22,6 +22,7 @@ static volatile const char *BOINCrcsid="$Id$"; #ifdef _WIN32 #include "boinc_win.h" +#include "version.h" #include "win_config.h" #endif