Changeset 7616 for trunk/src/comctl32/tooltips.cpp

Timestamp:

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

Author:

sandervl

Message:

font delete bugs removed

File:

• trunk/src/comctl32/tooltips.cpp (modified) (5 diffs)

trunk/src/comctl32/tooltips.cpp

@@ -26 +26 @@
 #include "commctrl.h"
 #include "ccbase.h"
-#include "tooltips.h"
 #include "comctl32.h"
 
@@ -33 +32 @@
 #define ID_TIMERLEAVE  3    /* tool leave timer */
 
+
+typedef struct tagTT_SUBCLASS_INFO
+{
+    WNDPROC wpOrigProc;
+    HWND    hwndToolTip;
+    UINT    uRefCount;
+} TT_SUBCLASS_INFO, *LPTT_SUBCLASS_INFO;
+
+
+typedef struct tagTTTOOL_INFO
+{
+    UINT      uFlags;
+    HWND      hwnd;
+    UINT      uId;
+    RECT      rect;
+    HINSTANCE hinst;
+    LPWSTR    lpszText;
+    LPARAM    lParam;
+} TTTOOL_INFO;
+
+
+typedef struct tagTOOLTIPS_INFO
+{
+    COMCTL32_HEADER header;
+
+    WCHAR    szTipText[INFOTIPSIZE];
+    BOOL     bActive;
+    BOOL     bTrackActive;
+    UINT     uNumTools;
+    COLORREF clrBk;
+    COLORREF clrText;
+#ifdef __WIN32OS2__
+    HFONT    hDefaultFont;
+#endif
+    HFONT    hFont;
+    INT      xTrackPos;
+    INT      yTrackPos;
+    INT      nMaxTipWidth;
+    INT      nTool;
+    INT      nOldTool;
+    INT      nCurrentTool;
+    INT      nTrackTool;
+    INT      nAutomaticTime;
+    INT      nReshowTime;
+    INT      nAutoPopTime;
+    INT      nInitialTime;
+    RECT     rcMargin;
+
+    TTTOOL_INFO *tools;
+} TOOLTIPS_INFO;
 
 extern LPSTR COMCTL32_aSubclass; /* global subclassing atom */
@@ -2002 +2051 @@
     nclm.cbSize = sizeof(NONCLIENTMETRICSA);
     SystemParametersInfoA(SPI_GETNONCLIENTMETRICS,0,&nclm,0);
+
+#ifdef __WIN32OS2__
+    infoPtr->hFont = infoPtr-> hDefaultFont = CreateFontIndirectA(&nclm.lfStatusFont);
+#else
     infoPtr->hFont = CreateFontIndirectA(&nclm.lfStatusFont);
+#endif
 
     infoPtr->nMaxTipWidth = -1;
@@ -2079 +2133 @@
 
     /* delete font */
+#ifdef __WIN32OS2__
+    //NEVER delete the font object received by WM_SETFONT!
+    DeleteObject (infoPtr->hDefaultFont);
+#else
     DeleteObject (infoPtr->hFont);
+#endif
 
     /* free tool tips info data */
@@ -2286 +2345 @@
     infoPtr->clrText = GetSysColor (COLOR_INFOTEXT);
 
+#ifdef __WIN32OS2__
+    //NEVER delete the font object received by WM_SETFONT!
+    DeleteObject (infoPtr->hDefaultFont);
+#else
     DeleteObject (infoPtr->hFont);
+#endif
     nclm.cbSize = sizeof(NONCLIENTMETRICSA);
     SystemParametersInfoA (SPI_GETNONCLIENTMETRICS, 0, &nclm, 0);
+#ifdef __WIN32OS2__
+    infoPtr->hFont = infoPtr->hDefaultFont = CreateFontIndirectA (&nclm.lfStatusFont);
+#else
     infoPtr->hFont = CreateFontIndirectA (&nclm.lfStatusFont);
-
+#endif
     return 0;
 }