From: Julian Smart <julian@anthemion.co.uk>
Date: Wed, 8 Jan 2003 09:14:35 +0000 (+0000)
Subject: Eliminated streams from scoredg.cpp
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/0447ac8e6410d85a405cc26129c3a76edee1da96

Eliminated streams from scoredg.cpp


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18636 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/demos/forty/scoredg.cpp b/demos/forty/scoredg.cpp
index d8f31924a2..39f8f5eacb 100644
--- a/demos/forty/scoredg.cpp
+++ b/demos/forty/scoredg.cpp
@@ -58,7 +58,7 @@ ScoreCanvas::ScoreCanvas(wxWindow* parent, ScoreFile* scoreFile) :
 
 	wxString os;
 
-	os << _T("Player\tWins\tGames\tScore\n");
+	os << wxT("Player\tWins\tGames\tScore\n");
 	for (unsigned int i = 0; i < players.Count(); i++)
 	{
 		int wins, games, score;
@@ -69,12 +69,12 @@ ScoreCanvas::ScoreCanvas(wxWindow* parent, ScoreFile* scoreFile) :
 			average = (2 * score + games) / (2 * games);
 		}
 
-		os << players[i] << _T('\t') 
-		   << wins  << _T('\t')
-		   << games << _T('\t')
-		   << average << _T('\n');
+		os << players[i] << wxT('\t') 
+		   << wins  << wxT('\t')
+		   << games << wxT('\t')
+		   << average << wxT('\n');
 	}
-	os << _T('\0');
+	os << wxT('\0');
 	m_text = os;
 }
 
@@ -86,7 +86,7 @@ void ScoreCanvas::OnDraw(wxDC& dc)
 {
 	dc.SetFont(* m_font);
 
-	const wxChar* str = m_text;
+	const char* str = m_text;
 	unsigned int tab = 0;
 	unsigned int tabstops[] = { 5, 100, 150, 200 };
 
@@ -94,29 +94,29 @@ void ScoreCanvas::OnDraw(wxDC& dc)
 	int lineSpacing;
 	{
 		long w, h;
-		dc.GetTextExtent(_T("Testing"), &w, &h);
+		dc.GetTextExtent("Testing", &w, &h);
 		lineSpacing = (int)h;
 	}
 
 	int y = 0;
 	while (*str)
 	{
-		wxChar text[256];
-		wxChar* dest = text;
+		char text[256];
+		char* dest = text;
 		
-		while (*str && *str >= _T(' ')) *dest++ = *str++;
-		*dest = _T('\0');
+		while (*str && *str >= ' ') *dest++ = *str++;
+		*dest = '\0';
 
 		dc.DrawText(text, tabstops[tab], y);
 
-		if (*str == _T('\t'))
+		if (*str == '\t')
 		{
 			if (tab < sizeof(tabstops) / sizeof(tabstops[0]) - 1)
 			{
 				tab++;
 			}
 		}
-		else if (*str == _T('\n'))
+		else if (*str == '\n')
 		{
 			tab = 0;
 			y += lineSpacing;
@@ -133,7 +133,7 @@ ScoreDialog::ScoreDialog(
 							wxWindow* parent,
 							ScoreFile* file
 							) :
-	wxDialog(parent, -1, _T("Scores"),
+	wxDialog(parent, -1, "Scores",
 			wxDefaultPosition, wxSize(310, 200),
 			wxDIALOG_MODAL | wxDEFAULT_DIALOG_STYLE),
 	m_scoreFile(file)
@@ -142,7 +142,7 @@ ScoreDialog::ScoreDialog(
 	SetAutoLayout (TRUE);
 
 	ScoreCanvas* list = new ScoreCanvas(this, m_scoreFile);
-	m_OK = new wxButton(this, wxID_OK, _T("OK"));
+	m_OK = new wxButton(this, wxID_OK, "OK");
 
 	wxLayoutConstraints* layout;