Remove my binary compatibility stuff from HEAD. Patch #1367014 used for reference.

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

diff --git a/src/os2/font.cpp b/src/os2/font.cpp
index 52e3ec4d2e103970e2424eacaa661b8b8a267af6..ff695a16d02bb1d4c6d78afad5d4c705e54cfd61 100644 (file)
--- a/src/os2/font.cpp
+++ b/src/os2/font.cpp
@@ -9,6 +9,9 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
 // ============================================================================
 // declarations
 // ============================================================================
@@ -17,10 +20,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
- #include <malloc.h>
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
 #ifndef WX_PRECOMP
     #include <stdio.h>
     #include "wx/setup.h"
@@ -39,6 +38,8 @@
 
 #include "wx/tokenzr.h"
 
+#include <malloc.h>
+
 IMPLEMENT_DYNAMIC_CLASS(wxFont, wxGDIObject)
 
 // ----------------------------------------------------------------------------
@@ -51,7 +52,7 @@ public:
     wxFontRefData()
     {
         Init(-1, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, FALSE,
-             "", wxFONTENCODING_DEFAULT);
+             wxEmptyString, wxFONTENCODING_DEFAULT);
     }
 
     wxFontRefData( int             nSize
@@ -260,7 +261,7 @@ protected:
               ,WXHANDLE                hPS   = 0
              );
     //
-    // If TRUE, the pointer to the actual font is temporary and SHOULD NOT BE
+    // If true, the pointer to the actual font is temporary and SHOULD NOT BE
     // DELETED by destructor
     //
     bool                            m_bTemporary;
@@ -347,13 +348,13 @@ void wxFontRefData::Init(
     m_hFont = hFont;
     m_nFontId = (int)hFont;
 
-    m_bNativeFontInfoOk = TRUE;
+    m_bNativeFontInfoOk = true;
     m_vNativeFontInfo = rInfo;
 
     if (hPS == NULLHANDLE)
     {
         m_hPS = ::WinGetPS(HWND_DESKTOP);
-        m_bInternalPS = TRUE;
+        m_bInternalPS = true;
     }
     else
         m_hPS = (HPS)hPS;
@@ -369,15 +370,11 @@ wxFontRefData::~wxFontRefData()
     Free();
 }
 
-bool wxFontRefData::Alloc(
-  wxFont*                           pFont
-)
+bool wxFontRefData::Alloc( wxFont* pFont )
 {
     wxString                        sFaceName;
     long                            flId = m_hFont;
     long                            lRc;
-    short                           nIndex = 0;
-    PFONTMETRICS                    pFM = NULL;
     ERRORID                         vError;
     wxString                        sError;
 
@@ -391,7 +388,7 @@ bool wxFontRefData::Alloc(
                       ,sFaceName
                       ,pFont
                      );
-        m_bNativeFontInfoOk = TRUE;
+        m_bNativeFontInfoOk = true;
     }
     else
     {
@@ -415,7 +412,7 @@ bool wxFontRefData::Alloc(
     {
         vError = ::WinGetLastError(vHabmain);
         sError = wxPMErrorToStr(vError);
-        wxLogLastError("CreateFont");
+        wxLogLastError(wxT("CreateFont"));
     }
 
     ::GpiSetCharSet(m_hPS, flId); // sets font for presentation space
@@ -496,7 +493,7 @@ bool wxFontRefData::Alloc(
             m_nWeight = wxFONTWEIGHT_NORMAL;
     }
     m_bUnderlined = ((m_vNativeFontInfo.fa.fsSelection & FATTR_SEL_UNDERSCORE) != 0);
-    m_sFaceName = m_vNativeFontInfo.fa.szFacename;
+    m_sFaceName = (wxChar*)m_vNativeFontInfo.fa.szFacename;
     m_vEncoding = wxGetFontEncFromCharSet(m_vNativeFontInfo.fa.usCodePage);
 
     //
@@ -516,7 +513,7 @@ bool wxFontRefData::Alloc(
         // Select the font into the Presentation space
         //
         ::GpiSetCharSet(m_hPS, flId); // sets font for presentation space
-    return TRUE;
+    return true;
 } // end of wxFontRefData::Alloc
 
 void wxFontRefData::Free()
@@ -584,7 +581,7 @@ bool wxNativeFontInfo::GetUnderlined() const
 
 wxString wxNativeFontInfo::GetFaceName() const
 {
-    return fm.szFacename;
+    return (wxChar*)fm.szFacename;
 } // end of wxNativeFontInfo::GetFaceName
 
 wxFontFamily wxNativeFontInfo::GetFamily() const
@@ -694,10 +691,10 @@ void wxNativeFontInfo::SetUnderlined(
 } // end of wxNativeFontInfo::SetUnderlined
 
 void wxNativeFontInfo::SetFaceName(
-  wxString                          sFacename
+  const wxString&                   sFacename
 )
 {
-    wxStrncpy(fa.szFacename, sFacename, WXSIZEOF(fa.szFacename));
+    wxStrncpy((wxChar*)fa.szFacename, sFacename, WXSIZEOF(fa.szFacename));
 } // end of wxNativeFontInfo::SetFaceName
 
 void wxNativeFontInfo::SetFamily(
@@ -737,15 +734,13 @@ void wxNativeFontInfo::SetFamily(
             sFacename = wxT("System VIO") ;
     }
 
-    if (!wxStrlen(fa.szFacename) )
+    if (!wxStrlen((wxChar*)fa.szFacename) )
     {
         SetFaceName(sFacename);
     }
 } // end of wxNativeFontInfo::SetFamily
 
-void wxNativeFontInfo::SetEncoding(
-  wxFontEncoding                    eEncoding
-)
+void wxNativeFontInfo::SetEncoding( wxFontEncoding eEncoding )
 {
     wxNativeEncodingInfo            vInfo;
 
@@ -773,12 +768,10 @@ void wxNativeFontInfo::SetEncoding(
             vInfo.charset = 850;
         }
     }
-    fa.usCodePage = vInfo.charset;
+    fa.usCodePage = (USHORT)vInfo.charset;
 } // end of wxNativeFontInfo::SetFaceName
 
-bool wxNativeFontInfo::FromString(
-  const wxString&                   rsStr
-)
+bool wxNativeFontInfo::FromString( const wxString& rsStr )
 {
     long                            lVal;
 
@@ -840,8 +833,8 @@ bool wxNativeFontInfo::FromString(
     sToken = vTokenizer.GetNextToken();
     if(!sToken)
         return FALSE;
-    wxStrcpy(fa.szFacename, sToken.c_str());
-    return TRUE;
+    wxStrcpy((wxChar*)fa.szFacename, sToken.c_str());
+    return true;
 } // end of wxNativeFontInfo::FromString
 
 wxString wxNativeFontInfo::ToString() const
@@ -872,17 +865,15 @@ void wxFont::Init()
 {
 } // end of wxFont::Init
 
-bool wxFont::Create(
-  const wxNativeFontInfo&           rInfo
-, WXHFONT                           hFont
-)
+bool wxFont::Create( const wxNativeFontInfo& rInfo,
+                     WXHFONT hFont )
 {
     UnRef();
     m_refData = new wxFontRefData( rInfo
                                   ,hFont
                                  );
     RealizeResource();
-    return TRUE;
+    return true;
 } // end of wxFont::Create
 
 wxFont::wxFont(
@@ -899,15 +890,13 @@ wxFont::wxFont(
 // Constructor for a font. Note that the real construction is done
 // in wxDC::SetFont, when information is available about scaling etc.
 // ----------------------------------------------------------------------------
-bool wxFont::Create(
-  int                               nPointSize
-, int                               nFamily
-, int                               nStyle
-, int                               nWeight
-, bool                              bUnderlined
-, const wxString&                   rsFaceName
-, wxFontEncoding                    vEncoding
-)
+bool wxFont::Create( int             nPointSize,
+                     int             nFamily,
+                     int             nStyle,
+                     int             nWeight,
+                     bool            bUnderlined,
+                     const wxString& rsFaceName,
+                     wxFontEncoding  vEncoding )
 {
     UnRef();
 
@@ -928,7 +917,7 @@ bool wxFont::Create(
                                   ,vEncoding
                                  );
     RealizeResource();
-    return TRUE;
+    return true;
 } // end of wxFont::Create
 
 wxFont::~wxFont()
@@ -946,21 +935,19 @@ bool wxFont::RealizeResource()
 {
     if ( GetResourceHandle() )
     {
-        return TRUE;
+        return true;
     }
     return M_FONTDATA->Alloc(this);
 } // end of wxFont::RealizeResource
 
-bool wxFont::FreeResource(
-  bool                              bForce
-)
+bool wxFont::FreeResource( bool WXUNUSED(bForce) )
 {
     if (GetResourceHandle())
     {
         M_FONTDATA->Free();
-        return TRUE;
+        return true;
     }
-    return FALSE;
+    return false;
 } // end of wxFont::FreeResource
 
 WXHANDLE wxFont::GetResourceHandle()
@@ -1140,11 +1127,10 @@ wxFontEncoding wxFont::GetEncoding() const
     return M_FONTDATA->GetEncoding();
 } // end of wxFont::GetEncoding
 
-wxNativeFontInfo* wxFont::GetNativeFontInfo() const
+const wxNativeFontInfo* wxFont::GetNativeFontInfo() const
 {
-    if (M_FONTDATA->HasNativeFontInfo())
-        return new wxNativeFontInfo(M_FONTDATA->GetNativeFontInfo());
-    return 0;
+    return M_FONTDATA->HasNativeFontInfo() ? &(M_FONTDATA->GetNativeFontInfo())
+                                           : NULL;
 } // end of wxFont::GetNativeFontInfo
 
 //
@@ -1170,4 +1156,3 @@ void wxFont::SetPS(
 
     RealizeResource();
 } // end of wxFont::SetPS
-