Added missing NO_GCC_PRAGMA check.

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

diff --git a/include/wx/msw/missing.h b/include/wx/msw/missing.h
index e8da5b96c699e08bf13578710a2ec0c9d536aadb..a249a1df37a6b42d72f1e5bf448a155169aa86a2 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;
@@ -466,6 +477,10 @@ typedef struct {
 // Misc stuff
 // ----------------------------------------------------------------------------
 
+#ifndef CCM_SETUNICODEFORMAT
+    #define CCM_SETUNICODEFORMAT 8197
+#endif
+
 #ifndef QS_ALLPOSTMESSAGE
     #define QS_ALLPOSTMESSAGE    0x0100
 #endif
@@ -482,5 +497,99 @@ 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);
+
+  #define CCM_SETUNICODEFORMAT 8197
+  
+#endif
+
+// This didn't appear in mingw until 2.95.2
+#ifndef SIF_TRACKPOS
+#define SIF_TRACKPOS 16
+#endif
+
+#if wxUSE_MOUSEWHEEL
+    #ifndef WM_MOUSEWHEEL
+        #define WM_MOUSEWHEEL           0x020A
+    #endif
+    #ifndef WHEEL_DELTA
+        #define WHEEL_DELTA             120
+    #endif
+    #ifndef SPI_GETWHEELSCROLLLINES
+        #define SPI_GETWHEELSCROLLLINES 104
+    #endif
+#endif // wxUSE_MOUSEWHEEL
+
+#ifndef VK_OEM_1
+    #define VK_OEM_1        0xBA
+    #define VK_OEM_2        0xBF
+    #define VK_OEM_3        0xC0
+    #define VK_OEM_4        0xDB
+    #define VK_OEM_5        0xDC
+    #define VK_OEM_6        0xDD
+    #define VK_OEM_7        0xDE
+#endif
+
+#ifndef VK_OEM_COMMA
+    #define VK_OEM_PLUS     0xBB
+    #define VK_OEM_COMMA    0xBC
+    #define VK_OEM_MINUS    0xBD
+    #define VK_OEM_PERIOD   0xBE
+#endif
+
+#ifndef WM_UPDATEUISTATE
+    #define WM_UPDATEUISTATE    0x128
+#endif
+
+#ifndef UIS_INITIALIZE
+    #define UIS_INITIALIZE  3
+#endif
+
+#ifndef UISF_HIDEFOCUS
+    #define UISF_HIDEFOCUS  1
+#endif
+
+#ifndef UISF_HIDEACCEL
+    #define UISF_HIDEACCEL 2
+#endif
+
+#ifndef WC_NO_BEST_FIT_CHARS
+    #define WC_NO_BEST_FIT_CHARS 0x400
+#endif
+
+// In addition, include stuff not defined in WinCE
+#ifdef __WXWINCE__
+    #include "wx/msw/wince/missing.h"
+#endif
+
 #endif
     // _WX_MISSING_H_