Correction in comment in closing #endif.

[wxWidgets.git] / samples / font / font.cpp

diff --git a/samples/font/font.cpp b/samples/font/font.cpp
index 626a5d8d4e60fb5aad2714a3f6c50c9f65725315..5e2f27962e40aed22825fa8e08229ed7173033aa 100644 (file)
--- a/samples/font/font.cpp
+++ b/samples/font/font.cpp
@@ -32,6 +32,8 @@
 #include "wx/splitter.h"
 #include "wx/textfile.h"
 
+#include "../sample.xpm"
+
 #ifdef __WXMAC__
 #undef wxFontDialog
 #include "wx/mac/fontdlg.h"
@@ -234,6 +236,8 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
 {
     m_fontSize = 12;
 
+    SetIcon(wxIcon(sample_xpm));
+    
     // create a menu bar
     wxMenu *menuFile = new wxMenu;
 
@@ -737,7 +741,7 @@ void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) )
     fontInfo.Printf(wxT("Font size is %d points, family: %s, encoding: %s"),
                     m_font.GetPointSize(),
                     m_font.GetFamilyString().c_str(),
-                    wxFontMapper::Get()->
+                    wxFontMapper::
                         GetEncodingDescription(m_font.GetEncoding()).c_str());
 
     dc.DrawText(fontInfo, x, y);