diff --git a/clientgui/AsyncRPC.h b/clientgui/AsyncRPC.h index b61e809b387..6d46aaa1733 100644 --- a/clientgui/AsyncRPC.h +++ b/clientgui/AsyncRPC.h @@ -380,7 +380,6 @@ class AsyncRPCDlg : public wxDialog public: AsyncRPCDlg(); - void OnRPCDlgTimer(wxTimerEvent &event); void OnExit(wxCommandEvent& event); }; diff --git a/clientgui/BOINCListCtrl.h b/clientgui/BOINCListCtrl.h index e2b11440400..b41884c3a79 100644 --- a/clientgui/BOINCListCtrl.h +++ b/clientgui/BOINCListCtrl.h @@ -79,7 +79,6 @@ class CBOINCListCtrl : public LISTCTRL_BASE { void SetStandardColumnOrder(); bool IsColumnOrderStandard(); void SetDefaultColumnDisplay(); - void InsertShownColumns(wxString tokenized, char * delimiters); long GetFocusedItem() { return GetNextItem(-1, wxLIST_NEXT_ALL, wxLIST_STATE_FOCUSED); } long GetFirstSelected() { return GetNextItem(-1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED); } diff --git a/clientgui/DlgEventLog.h b/clientgui/DlgEventLog.h index f46270d458b..5451143fe18 100644 --- a/clientgui/DlgEventLog.h +++ b/clientgui/DlgEventLog.h @@ -152,9 +152,6 @@ class CDlgEventLog : public DlgEventLogBase virtual wxString OnListGetItemText( long item, long column ) const; virtual wxListItemAttr* OnListGetItemAttr( long item ) const; - bool OnSaveState(wxConfigBase* pConfig); - bool OnRestoreState(wxConfigBase* pConfig); - void UpdateButtons(); private: @@ -198,8 +195,6 @@ class CDlgEventLog : public DlgEventLogBase void OnSize(wxSizeEvent& event); void OnMove(wxMoveEvent& event); - void OnMouseUp(wxMouseEvent& event); - void ResetMessageFiltering(); void FindErrorMessages(bool isFiltered); diff --git a/clientgui/DlgOptions.h b/clientgui/DlgOptions.h index 34c94cf5406..73cf52d3359 100644 --- a/clientgui/DlgOptions.h +++ b/clientgui/DlgOptions.h @@ -158,8 +158,6 @@ class CDlgOptions: public wxDialog wxString GetDefaultDialupConnection() const; void SetDefaultDialupConnection(wxString value); - bool UpdateControlStates(); - bool ReadSettings(); bool SaveSettings(); @@ -188,8 +186,8 @@ class CDlgOptions: public wxDialog wxTextCtrl* m_SOCKSPortCtrl; wxTextCtrl* m_SOCKSUsernameCtrl; wxTextCtrl* m_SOCKSPasswordCtrl; - wxTextCtrl* m_HTTPNoProxiesCtrl; - wxTextCtrl* m_SOCKSNoProxiesCtrl; + wxTextCtrl* m_HTTPNoProxiesCtrl; + wxTextCtrl* m_SOCKSNoProxiesCtrl; ////@end CDlgOptions member variables bool m_bRetrievedProxyConfiguration; }; diff --git a/clientgui/MainDocument.h b/clientgui/MainDocument.h index 56cbdef0bf5..dc954de9b3a 100644 --- a/clientgui/MainDocument.h +++ b/clientgui/MainDocument.h @@ -147,9 +147,6 @@ class CMainDocument : public wxObject { ); int Reconnect(); - int CachedStateLock(); - int CachedStateUnlock(); - void ForceDisconnect(); int FrameShutdownDetected(); int CoreClientQuit(); @@ -239,7 +236,6 @@ class CMainDocument : public wxObject { int ProjectNoMoreWork(int iIndex); int ProjectAllowMoreWork(int iIndex); - int ProjectAttach(const wxString& strURL, const wxString& strAccountKey); int ProjectDetach(int iIndex); int ProjectUpdate(int iIndex); int ProjectReset(int iIndex); diff --git a/clientgui/ViewNotices.h b/clientgui/ViewNotices.h index fe190314f49..3e3e2a9b27e 100644 --- a/clientgui/ViewNotices.h +++ b/clientgui/ViewNotices.h @@ -55,7 +55,6 @@ class CViewNotices : public CBOINCBaseView { virtual bool OnRestoreState( wxConfigBase* pConfig ); virtual void OnListRender( wxTimerEvent& event ); - void OnRetryButton( wxCommandEvent& event ); }; #endif diff --git a/clientgui/sg_BoincSimpleFrame.h b/clientgui/sg_BoincSimpleFrame.h index aaea1348b8d..a426de2272f 100644 --- a/clientgui/sg_BoincSimpleFrame.h +++ b/clientgui/sg_BoincSimpleFrame.h @@ -40,30 +40,30 @@ class CSimpleGUIPanel : public wxPanel CSimpleGUIPanel(wxWindow* parent); ~CSimpleGUIPanel(); - // + // // My tasks panel (shown when there are active tasks) CSimpleTaskPanel *m_taskPanel; - // My projects panel - CSimpleProjectPanel *m_projPanel; - ////////////////////////////; + // My projects panel + CSimpleProjectPanel *m_projPanel; + ////////////////////////////; void SetBackgroundBitmap(); void ReskinInterface(); - void UpdateProjectView(); + void UpdateProjectView(); void OnFrameRender(); - void OnProjectsAttachToProject(wxCommandEvent& event); + void OnProjectsAttachToProject(wxCommandEvent& event); void OnShowNotices(wxCommandEvent& event); void OnSuspendResume(wxCommandEvent& event); void OnHelp( wxCommandEvent& event ); - void SetDlgOpen(bool newDlgState) { dlgOpen = newDlgState; } - bool GetDlgOpen() { return dlgOpen; } + void SetDlgOpen(bool newDlgState) { dlgOpen = newDlgState; } + bool GetDlgOpen() { return dlgOpen; } wxBitmap *GetBackgroundBitMap() { return &m_bmpBg; } void OnCheckForNewNotices(wxTimerEvent& WXUNUSED(event)); void NoticesViewed(); - ////////// - wxBoxSizer *mainSizer; - ////////// + ////////// + wxBoxSizer *mainSizer; + ////////// bool m_bNewNoticeAlert; bool m_bNoticesButtonIsRed; DECLARE_EVENT_TABLE() @@ -86,7 +86,7 @@ class CSimpleGUIPanel : public wxPanel private: int m_irefreshCount; bool dlgOpen; - wxTimer* checkForNewNoticesTimer; + wxTimer* checkForNewNoticesTimer; wxString m_sSuspendButtonToolTip; wxString m_sResumeButtonToolTip; }; @@ -112,21 +112,20 @@ class CSimpleFrame : public CBOINCBaseFrame void OnPreferences( wxCommandEvent& event ); void OnOptions( wxCommandEvent& event ); void OnDiagnosticLogFlags( wxCommandEvent& event ); - void OnOldSG( wxCommandEvent& event ); void OnHelp( wxHelpEvent& event ); void OnHelpBOINC( wxCommandEvent& event ); void OnHelpAbout( wxCommandEvent& event ); void OnCheckVersion( wxCommandEvent& event ); void OnReportBug( wxCommandEvent& event ); - void OnConnect(CFrameEvent& event ); + void OnConnect(CFrameEvent& event ); void OnReloadSkin( CFrameEvent& event ); void OnRefreshView( CFrameEvent& event ); void OnNotification( CFrameEvent& event ); void OnEventLog(wxCommandEvent& event); void OnDarkModeChanged( wxSysColourChangedEvent& event ); - void SetMsgsDlgOpen(CDlgMessages* newDlgPtr) { dlgMsgsPtr = newDlgPtr; } + void SetMsgsDlgOpen(CDlgMessages* newDlgPtr) { dlgMsgsPtr = newDlgPtr; } bool isMessagesDlgOpen() { return (dlgMsgsPtr != NULL); } bool SaveWindowPosition(); @@ -145,12 +144,12 @@ class CSimpleFrame : public CBOINCBaseFrame protected: virtual int _GetCurrentViewPage(); - wxMenuBar* m_pMenubar; + wxMenuBar* m_pMenubar; wxMenu* m_pSubmenuSkins; wxAcceleratorEntry m_Shortcuts[3]; wxAcceleratorTable* m_pAccelTable; - CSimpleGUIPanel* m_pBackgroundPanel; + CSimpleGUIPanel* m_pBackgroundPanel; private: diff --git a/clientgui/sg_DlgPreferences.h b/clientgui/sg_DlgPreferences.h index 76e027d136d..aeb2ab4c3b3 100644 --- a/clientgui/sg_DlgPreferences.h +++ b/clientgui/sg_DlgPreferences.h @@ -111,12 +111,6 @@ class CPanelPreferences: public wxPanel /// wxEVT_ERASE_BACKGROUND event handler for ID_DLGPREFERENCES void OnEraseBackground( wxEraseEvent& event ); - /// wxEVT_COMMAND_COMBOBOX_SELECTED event handler for ID_WORKBETWEENBEGIN - void OnWorkBetweenBeginSelected( wxCommandEvent& event ); - - /// wxEVT_COMMAND_COMBOBOX_SELECTED event handler for ID_CONNECTBETWEENBEGIN - void OnConnectBetweenBeginSelected( wxCommandEvent& event ); - /// wxEVT_COMMAND_BUTTON_CLICKED event handler for ID_SIMPLE_HELP void OnButtonHelp( wxCommandEvent& event ); @@ -129,21 +123,21 @@ class CPanelPreferences: public wxPanel bool UpdateControlStates(); bool ClearPreferenceSettings(); - wxString DoubleToTimeString(double dt); - double TimeStringToDouble(wxString timeStr); + wxString DoubleToTimeString(double dt); + double TimeStringToDouble(wxString timeStr); double RoundToHundredths(double td); void DisplayValue(double value, wxTextCtrl* textCtrl, wxCheckBox* checkBox=NULL); bool ReadPreferenceSettings(); bool SavePreferenceSettings(); - bool ValidateInput(); + bool ValidateInput(); bool m_bUsingLocalPrefs; - void ShowErrorMessage(wxString& msg,wxTextCtrl* errorCtrl); - bool IsValidFloatChar(const wxChar& ch); - bool IsValidFloatValue(const wxString& value, bool allowNegative=false); + void ShowErrorMessage(wxString& msg,wxTextCtrl* errorCtrl); + bool IsValidFloatChar(const wxChar& ch); + bool IsValidFloatValue(const wxString& value, bool allowNegative=false); bool IsValidFloatValueBetween(const wxString& value, double minVal, double maxVal); - bool IsValidTimeChar(const wxChar& ch); - bool IsValidTimeValue(const wxString& value); - void OnHandleCheckboxEvent(wxCommandEvent& ev); + bool IsValidTimeChar(const wxChar& ch); + bool IsValidTimeValue(const wxString& value); + void OnHandleCheckboxEvent(wxCommandEvent& ev); void addNewRowToSizer(wxSizer* toSizer, wxString& toolTipText, wxWindow* first, wxWindow* second, wxWindow* third,