Changeset 7616 for trunk/src/comctl32/toolbar.c

Timestamp:

Dec 12, 2001, 1:49:34 PM (24 years ago)

Author:

sandervl

Message:

font delete bugs removed

File:

• trunk/src/comctl32/toolbar.c (modified) (3 diffs)

trunk/src/comctl32/toolbar.c

@@ -102 +102 @@
     INT      nOldHit;
     INT      nHotItem;        /* index of the "hot" item */
+#ifdef __WIN32OS2__
+    HFONT    hDefaultFont;
+#endif
     HFONT    hFont;           /* text font */
     HIMAGELIST himlInt;         /* image list created internally */
@@ -4042 +4045 @@
 
     SystemParametersInfoA (SPI_GETICONTITLELOGFONT, 0, &logFont, 0);
+#ifdef __WIN32OS2__
+    infoPtr->hFont = infoPtr->hDefaultFont = CreateFontIndirectA (&logFont);
+#else
     infoPtr->hFont = CreateFontIndirectA (&logFont);
+#endif
 
     if (dwStyle & TBSTYLE_TOOLTIPS) {
@@ -4099 +4106 @@
 
     /* delete default font */
+#ifdef __WIN32OS2__
+    //NEVER delete the font object received by WM_SETFONT!
+    if (infoPtr->hDefaultFont)
+        DeleteObject (infoPtr->hDefaultFont);
+#else
     if (infoPtr->hFont)
         DeleteObject (infoPtr->hFont);
+#endif
 
     /* free toolbar info data */