1. PositionToXY() off-by-2 (!) bug corrected

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

diff --git a/samples/forty/scoredg.cpp b/samples/forty/scoredg.cpp
index 773b51361692094e4b5ef1c4cf7cd3a471c939a2..befb3725cdca16033ec08496915fd3772a41a503 100644 (file)
--- a/samples/forty/scoredg.cpp
+++ b/samples/forty/scoredg.cpp
@@ -28,7 +28,7 @@
 #endif
 
 #if wxUSE_IOSTREAMH
-#if defined(__WXMSW__) && !defined(GNUWIN32)
+#if defined(__WXMSW__) && !defined(__GNUWIN32__)
 #include <strstrea.h>
 #else
 #include <strstream.h>
@@ -96,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;