post wxUniv merge fix

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11153 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/samples/font/font.cpp b/samples/font/font.cpp
index 00719a113f5a1d528ddb306a7efd8782d8c6bd26..d919ea6a59c6f8b07299fc15b17dd66f6fc10a5a 100644 (file)
--- a/samples/font/font.cpp
+++ b/samples/font/font.cpp
@@ -678,7 +678,7 @@ void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) )
     if ( m_font.Ok() )
     {
         wxString fontDesc = m_font.GetNativeFontInfoDesc();
     if ( m_font.Ok() )
     {
         wxString fontDesc = m_font.GetNativeFontInfoDesc();

-        dc.SetFont(wxFont(fontDesc));
+        dc.SetFont(m_font);

         fontInfo.Printf("Native font info: %s", fontDesc.c_str());
         dc.DrawText(fontInfo, 5, 5 + dc.GetCharHeight());
     }
         fontInfo.Printf("Native font info: %s", fontDesc.c_str());
         dc.DrawText(fontInfo, 5, 5 + dc.GetCharHeight());
     }