restore tabg.cpp for wxMotif's wxNotebook implementation

[wxWidgets.git] / src / msw / fontutil.cpp

diff --git a/src/msw/fontutil.cpp b/src/msw/fontutil.cpp
index a1b318d725b52882ef44d5909ae4aa4555bd6bb5..22b4a6210102a77a9887ae482a38cad9570261d8 100644 (file)
--- a/src/msw/fontutil.cpp
+++ b/src/msw/fontutil.cpp
@@ -29,6 +29,7 @@
     #include "wx/log.h"
     #include "wx/intl.h"
     #include "wx/encinfo.h"
     #include "wx/log.h"
     #include "wx/intl.h"
     #include "wx/encinfo.h"

+    #include "wx/wxcrtvararg.h"

 #endif //WX_PRECOMP
 
 #include "wx/msw/private.h"
 #endif //WX_PRECOMP
 
 #include "wx/msw/private.h"


@@ -161,7 +162,7 @@ bool wxTestFontEncoding(const wxNativeEncodingInfo& info)
     wxZeroMemory(lf);       // all default values
 
     lf.lfCharSet = (BYTE)info.charset;
     wxZeroMemory(lf);       // all default values
 
     lf.lfCharSet = (BYTE)info.charset;

-    wxStrncpy(lf.lfFaceName, info.facename, WXSIZEOF(lf.lfFaceName));
+    wxStrlcpy(lf.lfFaceName, info.facename.c_str(), WXSIZEOF(lf.lfFaceName));

 
     HFONT hfont = ::CreateFontIndirect(&lf);
     if ( !hfont )
 
     HFONT hfont = ::CreateFontIndirect(&lf);
     if ( !hfont )