Add wxUSE_THREADS checks around wxMSW functions dealing with threads.

[wxWidgets.git] / demos / forty / scorefil.cpp

diff --git a/demos/forty/scorefil.cpp b/demos/forty/scorefil.cpp
index 83c2e6e45b6ebb9fb24d3058b55f954921f6e6a6..96f66d3198d23c6271b4053c7d4de618a3321a27 100644 (file)
--- a/demos/forty/scorefil.cpp
+++ b/demos/forty/scorefil.cpp
@@ -33,7 +33,7 @@
 
 ScoreFile::ScoreFile(const wxString& appName)
 {
-    m_config = new wxConfig(appName, _T("wxWidgets"), appName, wxEmptyString,
+    m_config = new wxConfig(appName, wxT("wxWidgets"), appName, wxEmptyString,
                                 wxCONFIG_USE_LOCAL_FILE);  // only local
 }
 
@@ -45,7 +45,7 @@ ScoreFile::~ScoreFile()
 
 void ScoreFile::GetPlayerList( wxArrayString &list )
 {
-    m_config->SetPath(_T("/Players"));
+    m_config->SetPath(wxT("/Players"));
     int length = m_config->GetNumberOfGroups();
 
     if (length <= 0) return;
@@ -87,8 +87,8 @@ long ScoreFile::CalcCheck(const wxString& name, int p1, int p2, int p3)
 wxString ScoreFile::GetPreviousPlayer() const
 {
     wxString result;
-    m_config->SetPath(_T("/General"));
-    m_config->Read(_T("LastPlayer"), &result);
+    m_config->SetPath(wxT("/General"));
+    m_config->Read(wxT("LastPlayer"), &result);
     return result;
 }
 
@@ -103,16 +103,16 @@ void ScoreFile::ReadPlayersScore(
 
     games = wins = score = 0;
 
-    m_config->SetPath(_T("/Players"));
+    m_config->SetPath(wxT("/Players"));
     m_config->SetPath(player);
-    if (m_config->Read(_T("Score"), &myScore, 0L) &&
-        m_config->Read(_T("Games"), &myGames, 0L) &&
-        m_config->Read(_T("Wins"),  &myWins, 0L) &&
-        m_config->Read(_T("Check"), &check, 0L))
+    if (m_config->Read(wxT("Score"), &myScore, 0L) &&
+        m_config->Read(wxT("Games"), &myGames, 0L) &&
+        m_config->Read(wxT("Wins"),  &myWins, 0L) &&
+        m_config->Read(wxT("Check"), &check, 0L))
     {
         if (check != CalcCheck(player, myGames, myWins, myScore))
         {
-            wxMessageBox(_T("Score file corrupted"), _T("Warning"),
+            wxMessageBox(wxT("Score file corrupted"), wxT("Warning"),
                                      wxOK | wxICON_EXCLAMATION);
         }
         else
@@ -128,16 +128,16 @@ void ScoreFile::ReadPlayersScore(
 
 void ScoreFile::WritePlayersScore(const wxString& player, int wins, int games, int score)
 {
-    if (player)
+    if (!player.empty())
     {
-        m_config->SetPath(_T("/General"));
-        m_config->Write(_T("LastPlayer"), wxString(player)); // Without wxString tmp, thinks it's bool in VC++
+        m_config->SetPath(wxT("/General"));
+        m_config->Write(wxT("LastPlayer"), wxString(player)); // Without wxString tmp, thinks it's bool in VC++
 
-        m_config->SetPath(_T("/Players"));
+        m_config->SetPath(wxT("/Players"));
         m_config->SetPath(player);
-        m_config->Write(_T("Score"), (long)score);
-        m_config->Write(_T("Games"), (long)games);
-        m_config->Write(_T("Wins"), (long)wins);
-        m_config->Write(_T("Check"), CalcCheck(player, games, wins, score));
+        m_config->Write(wxT("Score"), (long)score);
+        m_config->Write(wxT("Games"), (long)games);
+        m_config->Write(wxT("Wins"), (long)wins);
+        m_config->Write(wxT("Check"), CalcCheck(player, games, wins, score));
     }
 }