wxMenu::Append (and similar) now return a pointer to the wxMenuItem

[wxWidgets.git] / include / wx / msw / missing.h

diff --git a/include/wx/msw/missing.h b/include/wx/msw/missing.h
index e8da5b96c699e08bf13578710a2ec0c9d536aadb..dd7ad37b2ddf3d7000cda99494cce9c734a33be3 100644 (file)
--- a/include/wx/msw/missing.h
+++ b/include/wx/msw/missing.h
@@ -430,6 +430,15 @@ typedef struct {
     #define TVM_SETTEXTCOLOR        (TV_FIRST + 30)
 #endif
 
+#ifndef TVS_INFOTIP 
+    #define TVS_INFOTIP 2048
+#endif
+
+#ifndef TVN_GETINFOTIPA
+    #define TVN_GETINFOTIPA    (TVN_FIRST-13)
+    #define TVN_GETINFOTIPW    (TVN_FIRST-14) 
+#endif
+
 #ifndef TVN_GETINFOTIP
     #ifdef UNICODE
         #define TVN_GETINFOTIP TVN_GETINFOTIPW
@@ -438,7 +447,9 @@ typedef struct {
     #endif
 #endif
 
-#ifndef NMTVGETINFOTIP
+#if !defined(NMTVGETINFOTIP) && defined(TVN_FIRST)
+    // NB: Check for TVN_FIRST is done so that this code is not included if
+    //     <commctrl.h> (which defined HTREEITEM) wasn't included before.
     struct NMTVGETINFOTIPA
     {
         NMHDR     hdr;
@@ -482,5 +493,38 @@ typedef struct {
     #define HANGUL_CHARSET  129
 #endif
 
+#ifndef TME_HOVER      
+    #define TME_HOVER  1
+#endif
+
+#ifndef TME_LEAVE      
+    #define TME_LEAVE  2
+#endif
+
+#ifndef TME_QUERY      
+    #define TME_QUERY  0x40000000
+#endif
+
+#ifndef TME_CANCEL     
+    #define TME_CANCEL 0x80000000
+#endif
+
+#ifndef HOVER_DEFAULT  
+    #define HOVER_DEFAULT      0xFFFFFFFF
+#endif
+
+#ifdef __DMC__
+
+  typedef struct tagTRACKMOUSEEVENT {
+      DWORD cbSize;
+      DWORD dwFlags;
+      HWND  hwndTrack;
+      DWORD dwHoverTime;
+  } TRACKMOUSEEVENT, *LPTRACKMOUSEEVENT;
+
+  WINCOMMCTRLAPI BOOL WINAPI _TrackMouseEvent(LPTRACKMOUSEEVENT lpEventTrack);
+
+#endif
+
 #endif
     // _WX_MISSING_H_