Applied patch [ 573644 ] wxDisplay for Mac (again)

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

diff --git a/src/os2/fontutil.cpp b/src/os2/fontutil.cpp
index bb4490f96c889aa31ed7c016c59184d992d52bc8..86f9063dfe0314e46837b54c893cd6fbe39a7b60 100644 (file)
--- a/src/os2/fontutil.cpp
+++ b/src/os2/fontutil.cpp
@@ -361,6 +361,7 @@ void wxFillLogFont(
         STR8                        azNames[255];
         long                        alIds[255];
 
+        memset(alIds, 0, sizeof(long) * 255);
         if(!::GpiQuerySetIds( *phPS
                              ,lNumLids
                              ,alTypes
@@ -372,7 +373,8 @@ void wxFillLogFont(
                 ::WinReleasePS(*phPS);
             return;
         }
-
+        if (*pflId == 0L)
+            *pflId = 1L;
         for(unsigned long LCNum = 0; LCNum < lNumLids; LCNum++)
             if(alIds[LCNum] == *pflId)
                ++*pflId;