assert -> wxASSERT

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

diff --git a/include/wx/msw/missing.h b/include/wx/msw/missing.h
index 3297e1bd63ba6eb16d9a4f103d58bf1a49360140..cbedea9379eb1112db4a9e3190425d689c2f3f74 100644 (file)
--- a/include/wx/msw/missing.h
+++ b/include/wx/msw/missing.h
@@ -15,6 +15,11 @@
  * The following are required for VC++ 6.
  */
 
  * The following are required for VC++ 6.
  */
 

+// Needed by cursor.cpp
+#ifndef IDC_HAND
+    #define IDC_HAND MAKEINTRESOURCE(32649)
+#endif
+

 // Needed by strconv.cpp
 #ifndef WC_NO_BEST_FIT_CHARS
     #define WC_NO_BEST_FIT_CHARS 0x400
 // Needed by strconv.cpp
 #ifndef WC_NO_BEST_FIT_CHARS
     #define WC_NO_BEST_FIT_CHARS 0x400


@@ -90,25 +95,65 @@
 // Needed by listctrl.cpp
 // ----------------------------------------------------------------------------
 
 // Needed by listctrl.cpp
 // ----------------------------------------------------------------------------
 

+#ifndef LVS_EX_FULLROWSELECT
+    #define LVS_EX_FULLROWSELECT 0x00000020
+#endif
+

 #ifndef LVS_EX_LABELTIP
     #define LVS_EX_LABELTIP 0x00004000
 #endif
 
  /*
 #ifndef LVS_EX_LABELTIP
     #define LVS_EX_LABELTIP 0x00004000
 #endif
 
  /*

-  * In addition to the above, the following are required for BC++ 5.5.
-  * (None presently.)
+  * In addition to the above, the following are required for several compilers.

   */
 
   */
 

- /*
-  * In addition to the above, the following are required for Digital Mars C++
-  */
+#if !defined(CCS_VERT)
+#define CCS_VERT                0x00000080L
+#endif

 
 

-#ifdef __DMC__
+#if !defined(TB_SETDISABLEDIMAGELIST)
+    #define TB_SETDISABLEDIMAGELIST (WM_USER + 54)
+#endif // !defined(TB_SETDISABLEDIMAGELIST)
+
+#ifndef CFM_BACKCOLOR
+    #define CFM_BACKCOLOR 0x04000000
+#endif
+
+#ifndef HANGUL_CHARSET
+    #define HANGUL_CHARSET 129
+#endif

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

+// ----------------------------------------------------------------------------
+// Tree control
+// ----------------------------------------------------------------------------
+
+#ifndef TV_FIRST
+    #define TV_FIRST                0x1100
+#endif
+
+#ifndef TVS_FULLROWSELECT
+    #define TVS_FULLROWSELECT       0x1000
+#endif
+
+#ifndef TVM_SETBKCOLOR
+    #define TVM_SETBKCOLOR          (TV_FIRST + 29)
+    #define TVM_SETTEXTCOLOR        (TV_FIRST + 30)
+#endif
+
+ /*
+  * The following are required for BC++ 5.5 (none at present.)
+  */
+
+ /*
+  * The following are specifically required for Digital Mars C++
+  */
+
+#ifdef __DMC__
+

 #ifdef __DMC__
     #ifndef _TrackMouseEvent
         #define _TrackMouseEvent TrackMouseEvent
 #ifdef __DMC__
     #ifndef _TrackMouseEvent
         #define _TrackMouseEvent TrackMouseEvent


@@ -149,17 +194,6 @@
     #define LVSICF_NOSCROLL         0x0002
 #endif
 
     #define LVSICF_NOSCROLL         0x0002
 #endif
 

-// ----------------------------------------------------------------------------
-// Toolbar define value missing
-// ----------------------------------------------------------------------------
-#if !defined(CCS_VERT)
-#define CCS_VERT                0x00000080L
-#endif
-
-#if !defined(TB_SETDISABLEDIMAGELIST)
-    #define TB_SETDISABLEDIMAGELIST (WM_USER + 54)
-#endif // !defined(TB_SETDISABLEDIMAGELIST)
-

 // ----------------------------------------------------------------------------
 // Tree control
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // Tree control
 // ----------------------------------------------------------------------------


@@ -168,53 +202,29 @@
     #define TVIS_FOCUSED            0x0001
 #endif
 
     #define TVIS_FOCUSED            0x0001
 #endif
 

-#ifndef TV_FIRST
-    #define TV_FIRST                0x1100
-#endif
-

 #ifndef TVS_CHECKBOXES
     #define TVS_CHECKBOXES          0x0100
 #endif
 
 #ifndef TVS_CHECKBOXES
     #define TVS_CHECKBOXES          0x0100
 #endif
 

-#ifndef TVS_FULLROWSELECT
-    #define TVS_FULLROWSELECT       0x1000
-#endif
-
-#ifndef TVM_SETBKCOLOR
-    #define TVM_SETBKCOLOR          (TV_FIRST + 29)
-    #define TVM_SETTEXTCOLOR        (TV_FIRST + 30)
+#ifndef TVITEM
+    #define TVITEM TV_ITEM

 #endif
 
 #endif
     // DMC++
 
  /*
 #endif
 
 #endif
     // DMC++
 
  /*

-  * In addition to the declarations for VC++, the following are required for OpenWatcom C++
+  * The following are specifically required for OpenWatcom C++ (none at present)

   */
 
 #if defined(__WATCOMC__)
   */
 
 #if defined(__WATCOMC__)

-#ifndef CFM_BACKCOLOR
-    #define CFM_BACKCOLOR 0x04000000
-#endif
-
-#if !defined(CCS_VERT)
-#define CCS_VERT                0x00000080L
-#endif
-
-#if !defined(TB_SETDISABLEDIMAGELIST)
-    #define TB_SETDISABLEDIMAGELIST (WM_USER + 54)
-#endif // !defined(TB_SETDISABLEDIMAGELIST)
-

 #endif
 
  /*
 #endif
 
  /*

-  * In addition to the declarations for VC++, the following are required for MinGW
+  * The following are specifically required for MinGW (none at present)

   */
 
 #if defined (__MINGW32__)
   */
 
 #if defined (__MINGW32__)

-#ifndef CFM_BACKCOLOR
-    #define CFM_BACKCOLOR 0x04000000
-#endif

 #endif
 
  /*
 #endif
 
  /*


@@ -227,4 +237,3 @@
 
 #endif
     // _WX_MISSING_H_
 
 #endif
     // _WX_MISSING_H_

-