added wxRESERVE_SPACE_EVEN_IF_HIDDEN sizer flag that prevents the sizer from changing...

[wxWidgets.git] / src / msw / tooltip.cpp

diff --git a/src/msw/tooltip.cpp b/src/msw/tooltip.cpp
index 2fec32201250067472ed02ac641a4687b7c11fcb..dd3fdd076b086d079ee41fa5d05f4ac46d3484b8 100644 (file)
--- a/src/msw/tooltip.cpp
+++ b/src/msw/tooltip.cpp
@@ -40,6 +40,10 @@
     #define TTTOOLINFO_V1_SIZE 0x28
 #endif
 
+#ifndef TTF_TRANSPARENT
+    #define TTF_TRANSPARENT 0x0100
+#endif
+
 // VZ: normally, the trick with subclassing the tooltip control and processing
 //     TTM_WINDOWFROMPOINT should work but, somehow, it doesn't. I leave the
 //     code here for now (but it's not compiled) in case we need it later.
@@ -101,7 +105,7 @@ public:
             uFlags |= TTF_TRANSPARENT;
         }
 
-        uId = (UINT)hwndOwner;
+        uId = (UINT_PTR)hwndOwner;
     }
 };
 
@@ -370,9 +374,12 @@ void wxToolTip::Add(WXHWND hWnd)
                 }
 
                 // only set a new width if it is bigger than the current setting
-                if (max > SendTooltipMessage(GetToolTipCtrl(), TTM_GETMAXTIPWIDTH, 0))
+                if ( max > SendTooltipMessage(GetToolTipCtrl(),
+                                              TTM_GETMAXTIPWIDTH, 0) )
+                {
                     SendTooltipMessage(GetToolTipCtrl(), TTM_SETMAXTIPWIDTH,
-                                       (void *)max);
+                                       wxUIntToPtr(max));
+                }
             }
             else
 #endif // comctl32.dll >= 4.70