New Module Definition file for VisualAge .dll builds

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

diff --git a/src/os2/font.cpp b/src/os2/font.cpp
index 38289bdeba19644d3a0803e9fd6d087595f3248b..d33d991d89a827520a65ab64a66223b235e5eeaa 100644 (file)
--- a/src/os2/font.cpp
+++ b/src/os2/font.cpp
@@ -161,6 +161,21 @@ wxFontRefData::~wxFontRefData()
 // wxFont
 // ----------------------------------------------------------------------------
 
 // wxFont
 // ----------------------------------------------------------------------------
 

+wxFont::wxFont(const wxNativeFontInfo& rInfo)
+    {
+        Init();
+
+        (void)Create( rInfo.pointSize
+                     ,rInfo.family
+                     ,rInfo.style
+                     ,rInfo.weight
+                     ,rInfo.underlined
+                     ,rInfo.faceName
+                     ,rInfo.encoding
+                    );
+    }
+
+

 void wxFont::Init()
 {
     if ( wxTheFontList )
 void wxFont::Init()
 {
     if ( wxTheFontList )


@@ -355,7 +370,7 @@ bool wxFont::RealizeResource()
         vError = ::WinGetLastError(vHabmain);
     }
 
         vError = ::WinGetLastError(vHabmain);
     }
 

-    strcpy(zFacename, M_FONTDATA->m_vFattrs.szFacename);
+    M_FONTDATA->m_sFaceName = zFacename;

 
     if(::GpiCreateLogFont( M_FONTDATA->m_hPS
                           ,NULL
 
     if(::GpiCreateLogFont( M_FONTDATA->m_hPS
                           ,NULL


@@ -399,12 +414,17 @@ bool wxFont::FreeResource(
     return FALSE;
 } // end of wxFont::FreeResource
 
     return FALSE;
 } // end of wxFont::FreeResource
 

-WXHANDLE wxFont::GetResourceHandle()
+WXHANDLE wxFont::GetHFONT() const

 {
     if (!M_FONTDATA)
         return 0;
     else
         return (WXHANDLE)M_FONTDATA->m_hFont;
 {
     if (!M_FONTDATA)
         return 0;
     else
         return (WXHANDLE)M_FONTDATA->m_hFont;

+} // end of wxFont::GetHFONT
+
+WXHANDLE wxFont::GetResourceHandle()
+{
+    return GetHFONT();

 } // end of wxFont::GetResourceHandle
 
 bool wxFont::IsFree() const
 } // end of wxFont::GetResourceHandle
 
 bool wxFont::IsFree() const