Incomplete setup build fix.

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

diff --git a/src/os2/fontutil.cpp b/src/os2/fontutil.cpp
index 01b7d7b4ff2c26d02db0f3588bf555d24abc998e..264d0b7b2d2044013db17ddc7f9425004ee47e15 100644 (file)
--- a/src/os2/fontutil.cpp
+++ b/src/os2/fontutil.cpp
@@ -6,7 +6,7 @@
 // Created:     01.03.00
 // RCS-ID:      $Id$
 // Copyright:   (c) 1999 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// Licence:     wxWindows license
+// Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 #define DEBUG_PRINTF(NAME)   { static int raz=0; \
   printf( #NAME " %i\n",raz); fflush(stdout);       \
@@ -39,6 +39,7 @@
 
 #include "wx/fontutil.h"
 #include "wx/fontmap.h"
+#include "wx/encinfo.h"
 
 #include "wx/tokenzr.h"
 
@@ -391,7 +392,6 @@ void wxFillLogFont(
     // font, so now we need to generate an ID
     //
     long                            lNumLids = ::GpiQueryNumberSetIds(*phPS);
-    long                            lGpiError;
 
     if(lNumLids )
     {
@@ -413,7 +413,7 @@ void wxFillLogFont(
         }
         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!
@@ -464,17 +464,12 @@ void wxOS2SelectMatchingFontByName(
 )
 {
     int                             i;
-    int                             nDiff0;
     int                             nPointSize;
-    int                             nDiff;
     int                             nIs;
-    int                             nMinDiff;
     int                             nMinDiff0;
-    int                             nApirc;
     int                             anDiff[16];
     int                             anMinDiff[16];
     int                             nIndex = 0;
-    STR8                            zFn;
     char                            zFontFaceName[FACESIZE];
     wxString                        sFaceName;
     USHORT                          usWeightClass;
@@ -640,12 +635,12 @@ void wxOS2SelectMatchingFontByName(
     //
     pFattrs->usRecordLength  = sizeof(FATTRS);              // Sets size of structure
     pFattrs->lMatch          = pFM[nIndex].lMatch;          // Force match
-    pFattrs->idRegistry      = 0;                           // Registry
-    pFattrs->usCodePage      = 0;                           // Match proper CodePage
-    pFattrs->fsFontUse       = 0;                           // Use only outline fonts
-    pFattrs->fsType          = 0;                           // Use only outline fonts
-    pFattrs->lMaxBaselineExt = 0;                           // Use only outline fonts
-    pFattrs->lAveCharWidth   = 0;                           // Use only outline fonts
+    pFattrs->idRegistry      = 0;
+    pFattrs->usCodePage      = 0;
+    pFattrs->fsFontUse       = 0;
+    pFattrs->fsType          = 0;
+    pFattrs->lMaxBaselineExt = 0;
+    pFattrs->lAveCharWidth   = 0;
     wxStrcpy(pFattrs->szFacename, pFM[nIndex].szFacename);
     if (pFont->GetWeight() == wxNORMAL)
         pFattrs->fsSelection = 0;