correction to last commit: Korean and Romanian translations will only be in 2.9.1...

[wxWidgets.git] / src / os2 / font.cpp

diff --git a/src/os2/font.cpp b/src/os2/font.cpp
index 60895954935e9bb714a530dd5d1f5078c4f6bc3f..ca09caefc38dacfb321eaf1be87a510efeff05af 100644 (file)
--- a/src/os2/font.cpp
+++ b/src/os2/font.cpp
@@ -249,9 +249,9 @@ protected:
     // Common part of all ctors
     //
     void Init( int             nSize
     // Common part of all ctors
     //
     void Init( int             nSize

-              ,int             nFamily
-              ,int             nStyle
-              ,int             nWeight
+              ,wxFontFamily    nFamily
+              ,wxFontStyle     nStyle
+              ,wxFontWeight    nWeight

               ,bool            bUnderlined
               ,const wxString& rsFaceName
               ,wxFontEncoding  vEncoding
               ,bool            bUnderlined
               ,const wxString& rsFaceName
               ,wxFontEncoding  vEncoding


@@ -697,7 +697,7 @@ bool wxNativeFontInfo::SetFaceName(
   const wxString&                   sFacename
 )
 {
   const wxString&                   sFacename
 )
 {

-    wxStrncpy((wxChar*)fa.szFacename, sFacename, WXSIZEOF(fa.szFacename));
+    wxStrlcpy((wxChar*)fa.szFacename, sFacename, WXSIZEOF(fa.szFacename));

     return true;
 } // end of wxNativeFontInfo::SetFaceName
 
     return true;
 } // end of wxNativeFontInfo::SetFaceName