#undef things which require other, disabled, ones, instead of re-#defining them as 1

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

diff --git a/include/wx/msw/missing.h b/include/wx/msw/missing.h
index a94ab22b2e756dd4eb3781caadafdc34f699d226..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


@@ -114,6 +119,31 @@
     #define CFM_BACKCOLOR 0x04000000
 #endif
 
     #define CFM_BACKCOLOR 0x04000000
 #endif
 

+#ifndef HANGUL_CHARSET
+    #define HANGUL_CHARSET 129
+#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 required for BC++ 5.5 (none at present.)
   */


@@ -124,10 +154,6 @@
 
 #ifdef __DMC__
 
 
 #ifdef __DMC__
 

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

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


@@ -176,21 +202,12 @@
     #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
 #endif
 
 #endif


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

-