misc fixes for wxDirDialog; new wxDD_CHANGE_DIR flag (patch 1478051)

[wxWidgets.git] / src / x11 / textctrl.cpp

diff --git a/src/x11/textctrl.cpp b/src/x11/textctrl.cpp
index c3aee9d8be5aba2798a2c1a43a244478db17f4ee..a7e36d04043cb7c1dec591eea6f9cfc67f972c0b 100644 (file)
--- a/src/x11/textctrl.cpp
+++ b/src/x11/textctrl.cpp
@@ -7,13 +7,19 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
+// for compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
 #include "wx/textctrl.h"
 
-#include "wx/utils.h"
-#include "wx/intl.h"
-#include "wx/log.h"
+#ifndef WX_PRECOMP
+    #include "wx/intl.h"
+    #include "wx/log.h"
+    #include "wx/utils.h"
+    #include "wx/panel.h"
+#endif
+
 #include "wx/settings.h"
-#include "wx/panel.h"
 #include "wx/clipbrd.h"
 #include "wx/tokenzr.h"
 #include "wx/dcclient.h"
@@ -1887,7 +1893,7 @@ void wxTextCtrl::OnChar( wxKeyEvent &event )
         }
         case WXK_RETURN:
         {
-            if (m_windowStyle & wxPROCESS_ENTER)
+            if (m_windowStyle & wxTE_PROCESS_ENTER)
             {
                 wxCommandEvent event(wxEVT_COMMAND_TEXT_ENTER, m_windowId);
                 event.SetEventObject(this);