Wrappers for *ToText

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

diff --git a/src/os2/fontutil.cpp b/src/os2/fontutil.cpp
index 8437a713129b9c218b86756b908671273a8aa12b..a1347e8a8e45f83f34009ec76b0e545007398ccf 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>
 // 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);       \
 ///////////////////////////////////////////////////////////////////////////////
 #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/fontutil.h"
 #include "wx/fontmap.h"

+#include "wx/encinfo.h"

 
 #include "wx/tokenzr.h"
 
 
 #include "wx/tokenzr.h"
 


@@ -391,7 +392,6 @@ void wxFillLogFont(
     // font, so now we need to generate an ID
     //
     long                            lNumLids = ::GpiQueryNumberSetIds(*phPS);
     // font, so now we need to generate an ID
     //
     long                            lNumLids = ::GpiQueryNumberSetIds(*phPS);

-    long                            lGpiError;

 
     if(lNumLids )
     {
 
     if(lNumLids )
     {


@@ -464,17 +464,12 @@ void wxOS2SelectMatchingFontByName(
 )
 {
     int                             i;
 )
 {
     int                             i;

-    int                             nDiff0;

     int                             nPointSize;
     int                             nPointSize;

-    int                             nDiff;

     int                             nIs;
     int                             nIs;

-    int                             nMinDiff;

     int                             nMinDiff0;
     int                             nMinDiff0;

-    int                             nApirc;

     int                             anDiff[16];
     int                             anMinDiff[16];
     int                             nIndex = 0;
     int                             anDiff[16];
     int                             anMinDiff[16];
     int                             nIndex = 0;

-    STR8                            zFn;

     char                            zFontFaceName[FACESIZE];
     wxString                        sFaceName;
     USHORT                          usWeightClass;
     char                            zFontFaceName[FACESIZE];
     wxString                        sFaceName;
     USHORT                          usWeightClass;