X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f3314fbcb44e8840cd3353a7f8e22207bf26c03d..5c5ab9ebc3a7dd441c9e3b25cb3daf8f733c374f:/src/msw/fontutil.cpp?ds=sidebyside

diff --git a/src/msw/fontutil.cpp b/src/msw/fontutil.cpp
index 5fddec59b8..f75d090505 100644
--- a/src/msw/fontutil.cpp
+++ b/src/msw/fontutil.cpp
@@ -158,6 +158,8 @@ bool wxGetNativeFontEncoding(wxFontEncoding encoding,
             return FALSE;
     }
 
+    info->encoding = encoding;
+   
     return TRUE;
 }
 
@@ -168,7 +170,7 @@ bool wxTestFontEncoding(const wxNativeEncodingInfo& info)
     wxZeroMemory(lf);       // all default values
 
     lf.lfCharSet = info.charset;
-    strncpy(lf.lfFaceName, info.facename, sizeof(lf.lfFaceName));
+    wxStrncpy(lf.lfFaceName, info.facename, sizeof(lf.lfFaceName));
 
     HFONT hfont = ::CreateFontIndirect(&lf);
     if ( !hfont )