Removed every usage of obsolete wxTLW flags. 2.6 compatibility markup for them.

[wxWidgets.git] / include / wx / defs.h

diff --git a/include/wx/defs.h b/include/wx/defs.h
index e1d94d62aa393d2eaa4c6aee0dcdc77a29aa07f7..537c94c0d7806534d7adec0d10d81423784e7bb1 100644 (file)
--- a/include/wx/defs.h
+++ b/include/wx/defs.h
@@ -1034,7 +1034,7 @@ inline void *wxUIntToPtr(wxUIntPtr p)
 
     #define wxHAS_INT64 1
 
 
     #define wxHAS_INT64 1
 

-#else // !wxUSE_LONGLONG
+#else /* !wxUSE_LONGLONG */

 
     #define wxHAS_INT64 0
 
 
     #define wxHAS_INT64 0
 


@@ -1526,9 +1526,11 @@ enum wxBorder
 /*  always show an entire number of rows */
 #define wxLB_INT_HEIGHT     0x0800
 
 /*  always show an entire number of rows */
 #define wxLB_INT_HEIGHT     0x0800
 

-/*  deprecated synonyms */
-#define wxPROCESS_ENTER     0x0400  /*  wxTE_PROCESS_ENTER */
-#define wxPASSWORD          0x0800  /*  wxTE_PASSWORD */
+#if WXWIN_COMPATIBILITY_2_6
+    /*  deprecated synonyms */
+    #define wxPROCESS_ENTER   0x0400  /*  wxTE_PROCESS_ENTER */
+    #define wxPASSWORD        0x0800  /*  wxTE_PASSWORD */
+#endif

 
 /*
  * wxComboBox style flags
 
 /*
  * wxComboBox style flags