From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Mon, 24 Jan 2000 20:19:07 +0000 (+0000)
Subject: value of wxTE_PASSWORD changed to be different from wxCANCEL
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/c857185ce07eeb3699b53aea20748c30b52b0ed3

value of wxTE_PASSWORD changed to be different from wxCANCEL


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5641 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/include/wx/defs.h b/include/wx/defs.h
index e717c38ff2..ff94eca938 100644
--- a/include/wx/defs.h
+++ b/include/wx/defs.h
@@ -963,10 +963,9 @@ enum wxStretch
 /*
  * wxTextCtrl style flags
  */
-#define wxPROCESS_ENTER     0x0004
-#define wxPASSWORD          0x0008
-#define wxTE_PROCESS_ENTER  wxPROCESS_ENTER
-#define wxTE_PASSWORD       wxPASSWORD
+// the flag bits 0x0001, 2, 4 and 8 are free but should be used only for the
+// things which don't make sense for a text control used by wxTextEntryDialog
+// because they would otherwise conflict with wxOK, wxCANCEL, wxCENTRE
 #define wxTE_READONLY       0x0010
 #define wxTE_MULTILINE      0x0020
 #define wxTE_PROCESS_TAB    0x0040
@@ -975,6 +974,10 @@ enum wxStretch
 #define wxTE_RICH           0x0080
 #define wxTE_NO_VSCROLL     0x0100
 #define wxTE_AUTO_SCROLL    0x0200
+#define wxPROCESS_ENTER     0x0400
+#define wxPASSWORD          0x0800
+#define wxTE_PROCESS_ENTER  wxPROCESS_ENTER
+#define wxTE_PASSWORD       wxPASSWORD
 
 /*
  * wxComboBox style flags