X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/925e9792d32e353233985f53a4845f154e455a58..e755eb67b62b608174a4efbb13bdd9fbebfa29a1:/samples/font/font.cpp?ds=sidebyside

diff --git a/samples/font/font.cpp b/samples/font/font.cpp
index 626a5d8d4e..5e2f27962e 100644
--- 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);