Added wxTE_PROCESS_TAB

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

diff --git a/include/wx/defs.h b/include/wx/defs.h
index 41839c1cdcce4d3d7665c0dc04ab2db26d6a6797..1218c39632210b43b366253d79ecdb0a26d62ffe 100644 (file)
--- a/include/wx/defs.h
+++ b/include/wx/defs.h
@@ -450,9 +450,7 @@ typedef void (*wxFunction) (wxObject&, wxEvent&);
 #define wxTE_PASSWORD       wxPASSWORD
 #define wxTE_READONLY       0x0010
 #define wxTE_MULTILINE      0x0020
 #define wxTE_PASSWORD       wxPASSWORD
 #define wxTE_READONLY       0x0010
 #define wxTE_MULTILINE      0x0020

-
-// MSW-only
-#define wxTE_RICHTEXT       0x0020
+#define wxTE_PROCESS_TAB    0x0040

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

diff --git a/include/wx/msw/textctrl.h b/include/wx/msw/textctrl.h
index 699980592213343c4b20127cda8b4906fef41d88..3764644be4852fbf102e5c29c097270ab108e04d 100644 (file)
--- a/include/wx/msw/textctrl.h
+++ b/include/wx/msw/textctrl.h
@@ -65,7 +65,7 @@ public:
   bool Create(wxWindow *parent, wxWindowID id,
               const wxString& value = wxEmptyString,
               const wxPoint& pos = wxDefaultPosition,
   bool Create(wxWindow *parent, wxWindowID id,
               const wxString& value = wxEmptyString,
               const wxPoint& pos = wxDefaultPosition,

-              const wxSize& size = wxDefaultSize, long style = 0,
+              const wxSize& size = wxDefaultSize, long style = wxTE_PROCESS_TAB,

               const wxValidator& validator = wxDefaultValidator,
               const wxString& name = wxTextCtrlNameStr);
   
               const wxValidator& validator = wxDefaultValidator,
               const wxString& name = wxTextCtrlNameStr);
   

diff --git a/src/msw/textctrl.cpp b/src/msw/textctrl.cpp
index 45a17a442381f06b05f554c1e78402e3db064889..614be2e193084f1011ac9da7c906a6fbc3ed4dd0 100644 (file)
--- a/src/msw/textctrl.cpp
+++ b/src/msw/textctrl.cpp
@@ -983,10 +983,13 @@ void wxTextCtrl::OnChar(wxKeyEvent& event)
 long wxTextCtrl::MSWGetDlgCode()
 {
   long lRc = DLGC_WANTCHARS | DLGC_WANTARROWS;
 long wxTextCtrl::MSWGetDlgCode()
 {
   long lRc = DLGC_WANTCHARS | DLGC_WANTARROWS;

-  if ( m_windowStyle & wxPROCESS_ENTER )
+  if ( m_windowStyle & wxTE_PROCESS_ENTER )

     lRc |= DLGC_WANTMESSAGE;
   else if ( m_windowStyle & wxTE_MULTILINE )
     lRc |= DLGC_WANTMESSAGE;
     lRc |= DLGC_WANTMESSAGE;
   else if ( m_windowStyle & wxTE_MULTILINE )
     lRc |= DLGC_WANTMESSAGE;

+  // ??
+  if ( m_windowStyle & wxTE_PROCESS_TAB )
+    lRc |= DLGC_WANTTAB;

 
   return lRc;
 }
 
   return lRc;
 }