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

Timestamp:

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

Author:

sandervl

Message:

font delete bugs removed

File:

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

trunk/src/comctl32/rebar.c

@@ -209 +209 @@
     HWND     hwndToolTip; /* handle to the tool tip control */
     HWND     hwndNotify;  /* notification window (parent) */
+#ifdef __WIN32OS2__
+    HFONT    hDefaultFont;
+#endif
     HFONT    hFont;       /* handle to the rebar's font */
     SIZE     imageSize;   /* image size (image list) */
@@ -3633 +3636 @@
     DeleteObject (infoPtr->hcurVert);
     DeleteObject (infoPtr->hcurDrag);
+
+#ifdef __WIN32OS2__
+    //NEVER delete the font object received by WM_SETFONT!
+    DeleteObject (infoPtr->hDefaultFont);
+#else
     DeleteObject (infoPtr->hFont);
+#endif
     SetWindowLongA (infoPtr->hwndSelf, 0, 0);
 
@@ -3847 +3856 @@
     tfont = CreateFontIndirectA (&ncm.lfCaptionFont);
     if (tfont) {
+#ifdef __WIN32OS2__
+        infoPtr->hFont = infoPtr->hDefaultFont = tfont;
+#else
         infoPtr->hFont = tfont;
+#endif
     }