don't define comparison operators taking wxStrings when wxUSE_STL == 1

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

diff --git a/include/wx/msw/missing.h b/include/wx/msw/missing.h
index e4ca8641b59657603395eb3f4147b6eaf8571f20..1c413a3462c63b4d61d8e2a67acca7db15dbb688 100644 (file)
--- a/include/wx/msw/missing.h
+++ b/include/wx/msw/missing.h
@@ -184,8 +184,9 @@ typedef struct {
 #define LVM_SETUNICODEFORMAT 0x2005
 #endif
 
 #define LVM_SETUNICODEFORMAT 0x2005
 #endif
 

+

 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------

-// Toolbar define value missing 
+// Toolbar define value missing

 // ----------------------------------------------------------------------------
 #if !defined(CCS_VERT)
 #define CCS_VERT                0x00000080L
 // ----------------------------------------------------------------------------
 #if !defined(CCS_VERT)
 #define CCS_VERT                0x00000080L


@@ -430,13 +431,13 @@ typedef struct {
     #define TVM_SETTEXTCOLOR        (TV_FIRST + 30)
 #endif
 
     #define TVM_SETTEXTCOLOR        (TV_FIRST + 30)
 #endif
 

-#ifndef TVS_INFOTIP 
+#ifndef TVS_INFOTIP

     #define TVS_INFOTIP 2048
 #endif
 
 #ifndef TVN_GETINFOTIPA
     #define TVS_INFOTIP 2048
 #endif
 
 #ifndef TVN_GETINFOTIPA

-    #define TVN_GETINFOTIPA    (TVN_FIRST-13)
-    #define TVN_GETINFOTIPW    (TVN_FIRST-14) 
+    #define TVN_GETINFOTIPA    (TVN_FIRST-13)
+    #define TVN_GETINFOTIPW    (TVN_FIRST-14)

 #endif
 
 #ifndef TVN_GETINFOTIP
 #endif
 
 #ifndef TVN_GETINFOTIP


@@ -477,6 +478,10 @@ typedef struct {
 // Misc stuff
 // ----------------------------------------------------------------------------
 
 // Misc stuff
 // ----------------------------------------------------------------------------
 

+#ifndef CCM_SETUNICODEFORMAT
+    #define CCM_SETUNICODEFORMAT 8197
+#endif
+

 #ifndef QS_ALLPOSTMESSAGE
     #define QS_ALLPOSTMESSAGE    0x0100
 #endif
 #ifndef QS_ALLPOSTMESSAGE
     #define QS_ALLPOSTMESSAGE    0x0100
 #endif


@@ -493,24 +498,24 @@ typedef struct {
     #define HANGUL_CHARSET  129
 #endif
 
     #define HANGUL_CHARSET  129
 #endif
 

-#ifndef TME_HOVER      
-    #define TME_HOVER  1
+#ifndef TME_HOVER
+    #define TME_HOVER     1

 #endif
 
 #endif
 

-#ifndef TME_LEAVE      
-    #define TME_LEAVE  2
+#ifndef TME_LEAVE
+    #define TME_LEAVE     2

 #endif
 
 #endif
 

-#ifndef TME_QUERY      
-    #define TME_QUERY  0x40000000
+#ifndef TME_QUERY
+    #define TME_QUERY     0x40000000

 #endif
 
 #endif
 

-#ifndef TME_CANCEL     
-    #define TME_CANCEL 0x80000000
+#ifndef TME_CANCEL
+    #define TME_CANCEL    0x80000000

 #endif
 
 #endif
 

-#ifndef HOVER_DEFAULT  
-    #define HOVER_DEFAULT      0xFFFFFFFF
+#ifndef HOVER_DEFAULT
+    #define HOVER_DEFAULT 0xFFFFFFFF

 #endif
 
 #ifdef __DMC__
 #endif
 
 #ifdef __DMC__


@@ -580,9 +585,28 @@ typedef struct {
     #define WC_NO_BEST_FIT_CHARS 0x400
 #endif
 
     #define WC_NO_BEST_FIT_CHARS 0x400
 #endif
 

-// Not in WinCE
-#ifndef HGDI_ERROR
-#define HGDI_ERROR ((HANDLE)(0xFFFFFFFFL))
+#ifndef OFN_EXPLORER
+    #define OFN_EXPLORER 0x00080000
+#endif
+
+#ifndef OFN_ENABLESIZING
+    #define OFN_ENABLESIZING 0x00800000
+#endif
+
+// ------------------ For Flashing Window -------------
+#if (defined(__BORLANDC__) && (__BORLANDC__ < 550))
+typedef struct {
+    UINT  cbSize;
+    HWND  hwnd;
+    DWORD dwFlags;
+    UINT  uCount;
+    DWORD dwTimeout;
+} FLASHWINFO, *PFLASHWINFO;
+#endif
+
+// In addition, include stuff not defined in WinCE
+#ifdef __WXWINCE__
+    #include "wx/msw/wince/missing.h"

 #endif
 
 #endif
 #endif
 
 #endif