sharedaemon-cvs

[<ma...@us...>]

Update of /cvsroot/sharedaemon/ui-wx/src
In directory sc8-pr-cvs1:/tmp/cvs-serv15965

Modified Files:
	SearchWnd.cpp ServerWnd.cpp ServerWnd.h 
Log Message:
Removed no longer used logging functions

Index: SearchWnd.cpp
===================================================================
RCS file: /cvsroot/sharedaemon/ui-wx/src/SearchWnd.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- SearchWnd.cpp	30 Nov 2003 20:38:36 -0000	1.16
+++ SearchWnd.cpp	29 Dec 2003 09:25:25 -0000	1.17
@@ -69,5 +69,4 @@
  */ 
 void CSearchWnd::StartNewSearch(wxCommandEvent &event) {
 	m_searchstring = GetSearchString()->GetValue();
-	serverwnd->AddLogLine(m_searchstring, true);
 }

Index: ServerWnd.cpp
===================================================================
RCS file: /cvsroot/sharedaemon/ui-wx/src/ServerWnd.cpp,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -d -r1.54 -r1.55
--- ServerWnd.cpp	29 Dec 2003 06:22:42 -0000	1.54
+++ ServerWnd.cpp	29 Dec 2003 09:25:25 -0000	1.55
@@ -93,45 +93,10 @@
 	m_config->Write(wxT("SideBar"), sidebar->IsShown());
 }
 
-/**
- * These three almost identical methods add a line of [text] into the
- * corresponding log listctrls, optionally also displaying it in statusbar.
- * All lines will be added current date/time before it, and listctrls
- * are scrolled to display the last added line.
- */
-void CServerWnd::AddDebugLine(wxString text, bool status) {
-	if (status) {
-		mainframe->GetStatusText()->SetLabel(text);
-	}
-
-	wxDateTime now = wxDateTime::Now();
-	text = wxString::Format(
-		wxT("[%s] %s\n"), now.Format(wxT("%c")).c_str(), text.c_str()
-	);
-
-	GetDebugLog()->AppendText(text);
-	GetDebugLog()->ShowPosition(GetDebugLog()->GetLastPosition());
-}
-
-void CServerWnd::AddLogLine(wxString text, bool status) {
-	if (status) {
-		mainframe->GetStatusText()->SetLabel(text);
-	}
-
-	wxDateTime now = wxDateTime::Now();
-	text = wxString::Format(
-		wxT("[%s] %s\n"), now.Format(wxT("%c")).c_str(), text.c_str()
-	);
-	
-	GetLog()->AppendText(text);
-	GetLog()->ShowPosition(GetLog()->GetLastPosition());
-}
-
 /*
  * Add new server to servers list.
  */
 void CServerWnd::AddNewServer() {
-	AddDebugLine(wxT("Add New Server button clicked."));
 }
 
 /*
@@ -139,7 +104,6 @@
  * to server list.
  */
 void CServerWnd::UpdateFromURL() {
-	AddDebugLine(wxT("Update Server List from URL button clicked."));
 }
 
 /* Creates server page controls */

Index: ServerWnd.h
===================================================================
RCS file: /cvsroot/sharedaemon/ui-wx/src/ServerWnd.h,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- ServerWnd.h	29 Dec 2003 06:08:48 -0000	1.32
+++ ServerWnd.h	29 Dec 2003 09:25:25 -0000	1.33
@@ -54,9 +54,6 @@
 			wxNO_FULL_REPAINT_ON_RESIZE
 	);
 	virtual ~CServerWnd();
-	void AddLogLine(wxString text, bool status = false);
-	void AddDebugLine(wxString text, bool status = false);
-	void AddServerLogLine(wxString text, bool status = false);
 
 private:
 	DECLARE_EVENT_TABLE()
@@ -97,15 +94,6 @@
 	wxFlexGridSizer *mainsizer;
 
 	/* Getters for dialog controls */
-	wxNotebook* GetLogBook()  {
-		return (wxNotebook*) FindWindow( ID_LOGBOOK );
-	}
-	wxTextCtrl* GetLog() {
-		return (wxTextCtrl*) FindWindow( ID_LOG );
-	}
-	wxTextCtrl* GetDebugLog() {
-		return (wxTextCtrl*) FindWindow( ID_DEBUGLOG );
-	}
 	wxButton* GetUpdate()  {
 		return (wxButton*) FindWindow( ID_UPDATE );
 	}