More SC++ fixes; HelpGen starting to compile with VC++; image sample now compiles...

[wxWidgets.git] / samples / forty / scoredg.cpp

diff --git a/samples/forty/scoredg.cpp b/samples/forty/scoredg.cpp
index 765fa47b5d965d08fbf5ad385d455805beb78ee3..befb3725cdca16033ec08496915fd3772a41a503 100644 (file)
--- a/samples/forty/scoredg.cpp
+++ b/samples/forty/scoredg.cpp
@@ -27,11 +27,16 @@
 #include "wx/wx.h"
 #endif
 
-#if defined(__WXMSW__) && !defined(GNUWIN32)
+#if wxUSE_IOSTREAMH
+#if defined(__WXMSW__) && !defined(__GNUWIN32__)
 #include <strstrea.h>
 #else
 #include <strstream.h>
 #endif
+#else
+#include <strstream>
+using namespace std;
+#endif
 #include "scorefil.h"
 #include "scoredg.h"
 
@@ -64,7 +69,7 @@ ScoreCanvas::ScoreCanvas(wxWindow* parent, ScoreFile* scoreFile) :
        ostrstream os;
 
        os << "Player\tWins\tGames\tScore\n";
-       for (int i = 0; i < players.Count(); i++)
+       for (unsigned int i = 0; i < players.Count(); i++)
        {
                int wins, games, score;
                scoreFile->ReadPlayersScore(players[i], wins, games, score);
@@ -91,7 +96,7 @@ ScoreCanvas::~ScoreCanvas()
 
 void ScoreCanvas::OnDraw(wxDC& dc)
 {
-       dc.SetFont(m_font);
+       dc.SetFont(* m_font);
 
        const char* str = m_text;
        unsigned int tab = 0;