Fixed bug in border style translation

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

diff --git a/src/os2/fontutil.cpp b/src/os2/fontutil.cpp
index a1347e8a8e45f83f34009ec76b0e545007398ccf..010a2b6dd6d420ff1b75befa58b63080026482f9 100644 (file)
--- a/src/os2/fontutil.cpp
+++ b/src/os2/fontutil.cpp
@@ -8,10 +8,6 @@
 // Copyright:   (c) 1999 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) 1999 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////

-#define DEBUG_PRINTF(NAME)   { static int raz=0; \
-  printf( #NAME " %i\n",raz); fflush(stdout);       \
-   raz++;                                        \
- }

 
 // ============================================================================
 // declarations
 
 // ============================================================================
 // declarations


@@ -21,13 +17,16 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#ifdef __GNUG__
-    #pragma implementation "fontutil.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 

+#define DEBUG_PRINTF(NAME)                            \
+    {                                                 \
+        static int raz=0;                             \
+        printf( #NAME " %i\n",raz); fflush(stdout);   \
+        raz++;                                        \
+    }
+

 #ifndef WX_PRECOMP
     #include "wx/app.h"
     #include "wx/string.h"
 #ifndef WX_PRECOMP
     #include "wx/app.h"
     #include "wx/string.h"


@@ -54,9 +53,7 @@
 // convert to/from the string representation: format is
 //      encodingid;facename[;charset]
 
 // convert to/from the string representation: format is
 //      encodingid;facename[;charset]
 

-bool wxNativeEncodingInfo::FromString(
-  const wxString&                   rsStr
-)
+bool wxNativeEncodingInfo::FromString( const wxString& rsStr )

 {
     wxStringTokenizer               vTokenizer(rsStr, _T(";"));
     wxString                        sEncid = vTokenizer.GetNextToken();
 {
     wxStringTokenizer               vTokenizer(rsStr, _T(";"));
     wxString                        sEncid = vTokenizer.GetNextToken();


@@ -83,7 +80,7 @@ bool wxNativeEncodingInfo::FromString(
             return FALSE;
         }
     }
             return FALSE;
         }
     }

-    return TRUE;
+    return true;

 } // end of wxNativeEncodingInfo::FromString
 
 wxString wxNativeEncodingInfo::ToString() const
 } // end of wxNativeEncodingInfo::FromString
 
 wxString wxNativeEncodingInfo::ToString() const


@@ -103,10 +100,8 @@ wxString wxNativeEncodingInfo::ToString() const
 // helper functions
 // ----------------------------------------------------------------------------
 
 // helper functions
 // ----------------------------------------------------------------------------
 

-bool wxGetNativeFontEncoding(
-  wxFontEncoding                    vEncoding
-, wxNativeEncodingInfo*             pInfo
-)
+bool wxGetNativeFontEncoding( wxFontEncoding vEncoding,
+                              wxNativeEncodingInfo* pInfo )

 {
     wxCHECK_MSG(pInfo, FALSE, _T("bad pointer in wxGetNativeFontEncoding") );
     if (vEncoding == wxFONTENCODING_DEFAULT)
 {
     wxCHECK_MSG(pInfo, FALSE, _T("bad pointer in wxGetNativeFontEncoding") );
     if (vEncoding == wxFONTENCODING_DEFAULT)


@@ -168,7 +163,7 @@ bool wxGetNativeFontEncoding(
             pInfo->charset = 850;
             break;
     }
             pInfo->charset = 850;
             break;
     }

-    return TRUE;
+    return true;

 } // end of wxGetNativeFontEncoding
 
 wxFontEncoding wxGetFontEncFromCharSet(
 } // end of wxGetNativeFontEncoding
 
 wxFontEncoding wxGetFontEncFromCharSet(


@@ -223,24 +218,22 @@ wxFontEncoding wxGetFontEncFromCharSet(
     return eFontEncoding;
 } // end of wxGetNativeFontEncoding
 
     return eFontEncoding;
 } // end of wxGetNativeFontEncoding
 

-bool wxTestFontEncoding(
-  const wxNativeEncodingInfo&       rInfo
-)
+bool wxTestFontEncoding( const wxNativeEncodingInfo& rInfo )

 {
 {

-    FATTRS                          vLogFont;
-    HPS                             hPS;
+    FATTRS vLogFont;
+    HPS    hPS;

 
     hPS = ::WinGetPS(HWND_DESKTOP);
 
     memset(&vLogFont, '\0', sizeof(FATTRS));           // all default values
     vLogFont.usRecordLength = sizeof(FATTRS);
 
     hPS = ::WinGetPS(HWND_DESKTOP);
 
     memset(&vLogFont, '\0', sizeof(FATTRS));           // all default values
     vLogFont.usRecordLength = sizeof(FATTRS);

-    vLogFont.usCodePage = rInfo.charset;
+    vLogFont.usCodePage = (USHORT)rInfo.charset;

     vLogFont.lMaxBaselineExt = 0L;                    // Outline fonts should use 0
     vLogFont.lAveCharWidth = 0L;                      // Outline fonts should use 0
     vLogFont.fsFontUse = FATTR_FONTUSE_OUTLINE |      // only outline fonts allowed
                          FATTR_FONTUSE_TRANSFORMABLE; // may be transformed
 
     vLogFont.lMaxBaselineExt = 0L;                    // Outline fonts should use 0
     vLogFont.lAveCharWidth = 0L;                      // Outline fonts should use 0
     vLogFont.fsFontUse = FATTR_FONTUSE_OUTLINE |      // only outline fonts allowed
                          FATTR_FONTUSE_TRANSFORMABLE; // may be transformed
 

-    strncpy(vLogFont.szFacename, rInfo.facename.c_str(), sizeof(vLogFont.szFacename));
+    wxStrncpy((wxChar*)vLogFont.szFacename, rInfo.facename.c_str(), WXSIZEOF(vLogFont.szFacename));

 
     if (!::GpiCreateLogFont( hPS
                             ,NULL
 
     if (!::GpiCreateLogFont( hPS
                             ,NULL


@@ -252,7 +245,7 @@ bool wxTestFontEncoding(
         return FALSE;
     }
     ::WinReleasePS(hPS);
         return FALSE;
     }
     ::WinReleasePS(hPS);

-    return TRUE;
+    return true;

 } // end of wxTestFontEncoding
 
 // ----------------------------------------------------------------------------
 } // end of wxTestFontEncoding
 
 // ----------------------------------------------------------------------------


@@ -297,21 +290,19 @@ void wxConvertVectorFontSize(
 
 } // end of wxConvertVectorPointSize
 
 
 } // end of wxConvertVectorPointSize
 

-void wxFillLogFont(
-  LOGFONT*                          pFattrs  // OS2 GPI FATTRS
-, PFACENAMEDESC                     pFaceName
-, HPS*                              phPS
-, bool*                             pbInternalPS
-, long*                             pflId
-, wxString&                         sFaceName
-, wxFont*                           pFont
-)
+void wxFillLogFont( LOGFONT*      pFattrs,  // OS2 GPI FATTRS
+                    PFACENAMEDESC pFaceName,
+                    HPS*          phPS,
+                    bool*         pbInternalPS,
+                    long*         pflId,
+                    wxString&     sFaceName,
+                    wxFont*       pFont )

 {
 {

-    LONG                            lNumFonts = 0L;       // For system font count
-    ERRORID                         vError;               // For logging API errors
-    LONG                            lTemp = 0L;
-    bool                            bInternalPS = FALSE;  // if we have to create one
-    PFONTMETRICS                    pFM = NULL;
+    LONG         lNumFonts = 0L;       // For system font count
+    ERRORID      vError;               // For logging API errors
+    LONG         lTemp = 0L;
+    bool         bInternalPS = false;  // if we have to create one
+    PFONTMETRICS pFM = NULL;

 
     //
     // Initial house cleaning to free data buffers and ensure we have a
 
     //
     // Initial house cleaning to free data buffers and ensure we have a


@@ -320,7 +311,7 @@ void wxFillLogFont(
     if (!*phPS)
     {
         *phPS = ::WinGetPS(HWND_DESKTOP);
     if (!*phPS)
     {
         *phPS = ::WinGetPS(HWND_DESKTOP);

-        bInternalPS = TRUE;
+        bInternalPS = true;

     }
 
     //
     }
 
     //


@@ -413,7 +404,7 @@ void wxFillLogFont(
         }
         if (*pflId == 0L)
             *pflId = 1L;
         }
         if (*pflId == 0L)
             *pflId = 1L;

-        for(unsigned long LCNum = 0; LCNum < lNumLids; LCNum++)
+        for(unsigned long LCNum = 0; LCNum < (unsigned long)lNumLids; LCNum++)

             if(alIds[LCNum] == *pflId)
                ++*pflId;
         if(*pflId > 254)  // wow, no id available!
             if(alIds[LCNum] == *pflId)
                ++*pflId;
         if(*pflId > 254)  // wow, no id available!


@@ -447,7 +438,7 @@ void wxFillLogFont(
     {
         vError = ::WinGetLastError(vHabmain);
     }
     {
         vError = ::WinGetLastError(vHabmain);
     }

-    sFaceName = zFacename;
+    sFaceName = (wxChar*)zFacename;

     *pbInternalPS = bInternalPS;
 
     //
     *pbInternalPS = bInternalPS;
 
     //


@@ -470,7 +461,7 @@ void wxOS2SelectMatchingFontByName(
     int                             anDiff[16];
     int                             anMinDiff[16];
     int                             nIndex = 0;
     int                             anDiff[16];
     int                             anMinDiff[16];
     int                             nIndex = 0;

-    char                            zFontFaceName[FACESIZE];
+    wxChar                          zFontFaceName[FACESIZE];

     wxString                        sFaceName;
     USHORT                          usWeightClass;
     int                             fsSelection = 0;
     wxString                        sFaceName;
     USHORT                          usWeightClass;
     int                             fsSelection = 0;


@@ -565,7 +556,7 @@ void wxOS2SelectMatchingFontByName(
         int                         nEmHeight = 0;
         int                         nXHeight = 0;
 
         int                         nEmHeight = 0;
         int                         nXHeight = 0;
 

-        anDiff[0] = wxGpiStrcmp(pFM[i].szFacename, zFontFaceName);
+        anDiff[0] = wxGpiStrcmp((wxChar*)pFM[i].szFacename, zFontFaceName);

         anDiff[1] = abs(pFM[i].lEmHeight - nPointSize);
         anDiff[2] = abs(pFM[i].usWeightClass -  usWeightClass);
         anDiff[3] = abs((pFM[i].fsSelection & 0x2f) -  fsSelection);
         anDiff[1] = abs(pFM[i].lEmHeight - nPointSize);
         anDiff[2] = abs(pFM[i].usWeightClass -  usWeightClass);
         anDiff[3] = abs((pFM[i].fsSelection & 0x2f) -  fsSelection);


@@ -641,7 +632,7 @@ void wxOS2SelectMatchingFontByName(
     pFattrs->fsType          = 0;
     pFattrs->lMaxBaselineExt = 0;
     pFattrs->lAveCharWidth   = 0;
     pFattrs->fsType          = 0;
     pFattrs->lMaxBaselineExt = 0;
     pFattrs->lAveCharWidth   = 0;

-    wxStrcpy(pFattrs->szFacename, pFM[nIndex].szFacename);
+    wxStrcpy((wxChar*)pFattrs->szFacename, (wxChar*)pFM[nIndex].szFacename);

     if (pFont->GetWeight() == wxNORMAL)
         pFattrs->fsSelection = 0;
     else
     if (pFont->GetWeight() == wxNORMAL)
         pFattrs->fsSelection = 0;
     else


@@ -669,8 +660,8 @@ wxFont wxCreateFontFromLogFont(
 } // end of wxCreateFontFromLogFont
 
 int wxGpiStrcmp(
 } // end of wxCreateFontFromLogFont
 
 int wxGpiStrcmp(

-  char*                             s0
-, char*                             s1
+  wxChar*                           s0
+, wxChar*                           s1

 )
 {   int                             l0;
     int                             l1;
 )
 {   int                             l0;
     int                             l1;


@@ -691,8 +682,8 @@ int wxGpiStrcmp(
     else if(s1 == NULL)
         return 32;
 
     else if(s1 == NULL)
         return 32;
 

-    l0 = strlen(s0);
-    l1 = strlen(s1);
+    l0 = wxStrlen(s0);
+    l1 = wxStrlen(s1);

     l  = l0;
     if(l0 != l1)
     {
     l  = l0;
     if(l0 != l1)
     {


@@ -705,11 +696,10 @@ int wxGpiStrcmp(
         d = s0[i]-s1[i];
         if(!d)
             continue;
         d = s0[i]-s1[i];
         if(!d)
             continue;

-        d1 = toupper(s0[i]) - toupper(s1[i]);
+        d1 = wxToupper(s0[i]) - wxToupper(s1[i]);

         if(!d1)
             continue;
         rc += abs(d);
     }
     return rc;
 }
         if(!d1)
             continue;
         rc += abs(d);
     }
     return rc;
 }

-