1. wxDialogs are now destroyed when they go out of scope

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

diff --git a/src/msw/textctrl.cpp b/src/msw/textctrl.cpp
index dc70319e757c3a7c804e0024ba155fa57e0d681a..65b1f2522266e004d9dd6ee5d9e795974abc6640 100644 (file)
--- a/src/msw/textctrl.cpp
+++ b/src/msw/textctrl.cpp
@@ -23,6 +23,9 @@
 #ifndef WX_PRECOMP
 #include "wx/textctrl.h"
 #include "wx/settings.h"
 #ifndef WX_PRECOMP
 #include "wx/textctrl.h"
 #include "wx/settings.h"

+#include "wx/brush.h"
+#include "wx/utils.h"
+#include "wx/log.h"

 #endif
 
 #if wxUSE_CLIPBOARD
 #endif
 
 #if wxUSE_CLIPBOARD


@@ -36,20 +39,21 @@
 #include <stdlib.h>
 
 #if wxUSE_IOSTREAMH
 #include <stdlib.h>
 
 #if wxUSE_IOSTREAMH

-#include <fstream.h>
+#   include <fstream.h>

 #else
 #else

-#include <fstream>
-#  ifdef _MSC_VER
-      using namespace std;
-#  endif
+#   include <fstream>

 #endif
 
 #include <sys/types.h>
 #endif
 
 #include <sys/types.h>

+#ifndef __MWERKS__

 #include <sys/stat.h>
 #include <sys/stat.h>

+#else
+#include <stat.h>
+#endif

 #if defined(__BORLANDC__) && !defined(__WIN32__)
 #include <alloc.h>
 #else
 #if defined(__BORLANDC__) && !defined(__WIN32__)
 #include <alloc.h>
 #else

-#ifndef __GNUWIN32__
+#if !defined(__GNUWIN32__) && !defined(__SALFORDC__)

 #include <malloc.h>
 #endif
 #define farmalloc malloc
 #include <malloc.h>
 #endif
 #define farmalloc malloc


@@ -59,29 +63,42 @@
 
 #include <string.h>
 
 
 #include <string.h>
 

-#if defined(__WIN95__) && !defined(__GNUWIN32__)
-#include <richedit.h>
+#if wxUSE_RICHEDIT && !defined(__GNUWIN32__)
+    #include <richedit.h>

 #endif
 
 #if !USE_SHARED_LIBRARY
 #endif
 
 #if !USE_SHARED_LIBRARY

+

 IMPLEMENT_DYNAMIC_CLASS(wxTextCtrl, wxControl)
 
 BEGIN_EVENT_TABLE(wxTextCtrl, wxControl)
   EVT_CHAR(wxTextCtrl::OnChar)
   EVT_DROP_FILES(wxTextCtrl::OnDropFiles)
 IMPLEMENT_DYNAMIC_CLASS(wxTextCtrl, wxControl)
 
 BEGIN_EVENT_TABLE(wxTextCtrl, wxControl)
   EVT_CHAR(wxTextCtrl::OnChar)
   EVT_DROP_FILES(wxTextCtrl::OnDropFiles)

-  EVT_ERASE_BACKGROUND(wxTextCtrl::OnEraseBackground)
+
+  EVT_MENU(wxID_CUT, wxTextCtrl::OnCut)
+  EVT_MENU(wxID_COPY, wxTextCtrl::OnCopy)
+  EVT_MENU(wxID_PASTE, wxTextCtrl::OnPaste)
+  EVT_MENU(wxID_UNDO, wxTextCtrl::OnUndo)
+  EVT_MENU(wxID_REDO, wxTextCtrl::OnRedo)
+
+  EVT_UPDATE_UI(wxID_CUT, wxTextCtrl::OnUpdateCut)
+  EVT_UPDATE_UI(wxID_COPY, wxTextCtrl::OnUpdateCopy)
+  EVT_UPDATE_UI(wxID_PASTE, wxTextCtrl::OnUpdatePaste)
+  EVT_UPDATE_UI(wxID_UNDO, wxTextCtrl::OnUpdateUndo)
+  EVT_UPDATE_UI(wxID_REDO, wxTextCtrl::OnUpdateRedo)

 END_EVENT_TABLE()
 
 END_EVENT_TABLE()
 

-#endif
+#endif // USE_SHARED_LIBRARY

 
 // Text item
 
 // Text item

-wxTextCtrl::wxTextCtrl(void)
+wxTextCtrl::wxTextCtrl()

 #ifndef NO_TEXT_WINDOW_STREAM
 #ifndef NO_TEXT_WINDOW_STREAM

- :streambuf()
+          : streambuf()

 #endif
 {
 #endif
 {

-  m_fileName = "";
+#if wxUSE_RICHEDIT

   m_isRich = FALSE;
   m_isRich = FALSE;

+#endif

 }
 
 bool wxTextCtrl::Create(wxWindow *parent, wxWindowID id,
 }
 
 bool wxTextCtrl::Create(wxWindow *parent, wxWindowID id,


@@ -91,7 +108,6 @@ bool wxTextCtrl::Create(wxWindow *parent, wxWindowID id,
                         const wxValidator& validator,
                         const wxString& name)
 {
                         const wxValidator& validator,
                         const wxString& name)
 {

-  m_fileName = "";

   SetName(name);
   SetValidator(validator);
   if (parent) parent->AddChild(this);
   SetName(name);
   SetValidator(validator);
   if (parent) parent->AddChild(this);


@@ -115,24 +131,15 @@ bool wxTextCtrl::Create(wxWindow *parent, wxWindowID id,
   int width = size.x;
   int height = size.y;
 
   int width = size.x;
   int height = size.y;
 

-#ifdef __WIN32__
-  WXHGLOBAL m_globalHandle = 0;
-#else
-  // Obscure method from the MS Developer's Network Disk for
-  // using global memory instead of the local heap, which
-  // runs out far too soon. Solves the problem with
-  // failing to appear.
-
-  // Doesn't seem to work for Win95, so removing.
-  m_globalHandle=0;
-//  if ((wxGetOsVersion() != wxWINDOWS_NT) && (wxGetOsVersion() != wxWIN95))
-//    m_globalHandle = (WXHGLOBAL) GlobalAlloc(GMEM_MOVEABLE | GMEM_ZEROINIT,
-//                         256L);
-#endif
-

   long msStyle = ES_LEFT | WS_VISIBLE | WS_CHILD | WS_TABSTOP;
   if (m_windowStyle & wxTE_MULTILINE)
   long msStyle = ES_LEFT | WS_VISIBLE | WS_CHILD | WS_TABSTOP;
   if (m_windowStyle & wxTE_MULTILINE)

-  msStyle |= ES_MULTILINE | ES_WANTRETURN | WS_VSCROLL ; // WS_BORDER
+  {
+    wxASSERT_MSG( !(m_windowStyle & wxTE_PROCESS_ENTER),
+                  _T("wxTE_PROCESS_ENTER style is ignored for multiline controls") );
+
+    msStyle |= ES_MULTILINE | ES_WANTRETURN | WS_VSCROLL ; // WS_BORDER
+    m_windowStyle |= wxTE_PROCESS_ENTER;
+  }

   else
     msStyle |= ES_AUTOHSCROLL ;
 
   else
     msStyle |= ES_AUTOHSCROLL ;
 


@@ -144,28 +151,29 @@ bool wxTextCtrl::Create(wxWindow *parent, wxWindowID id,
   if (m_windowStyle & wxTE_PASSWORD) // hidden input
     msStyle |= ES_PASSWORD;
 
   if (m_windowStyle & wxTE_PASSWORD) // hidden input
     msStyle |= ES_PASSWORD;
 

-  char *windowClass = "EDIT";
-#if defined(__WIN95__)
+  const wxChar *windowClass = _T("EDIT");
+
+#if wxUSE_RICHEDIT

   if ( m_windowStyle & wxTE_MULTILINE )
   {
     msStyle |= ES_AUTOVSCROLL;
     m_isRich = TRUE;
   if ( m_windowStyle & wxTE_MULTILINE )
   {
     msStyle |= ES_AUTOVSCROLL;
     m_isRich = TRUE;

-    windowClass = "RichEdit" ;
+    windowClass = _T("RichEdit") ;

   }
   else
   }
   else

-#endif

     m_isRich = FALSE;
     m_isRich = FALSE;

+#endif

 
   bool want3D;
   WXDWORD exStyle = Determine3DEffects(WS_EX_CLIENTEDGE, &want3D) ;
 
   // If we're in Win95, and we want a simple 2D border,
   // then make it an EDIT control instead.
 
   bool want3D;
   WXDWORD exStyle = Determine3DEffects(WS_EX_CLIENTEDGE, &want3D) ;
 
   // If we're in Win95, and we want a simple 2D border,
   // then make it an EDIT control instead.

-#if defined(__WIN95__)
+#if wxUSE_RICHEDIT

   if (m_windowStyle & wxSIMPLE_BORDER)
   {
   if (m_windowStyle & wxSIMPLE_BORDER)
   {

-    windowClass = "EDIT";
-  m_isRich = FALSE;
+    windowClass = _T("EDIT");
+    m_isRich = FALSE;

   }
 #endif
 
   }
 #endif
 


@@ -177,11 +185,11 @@ bool wxTextCtrl::Create(wxWindow *parent, wxWindowID id,
   m_hWnd = (WXHWND)::CreateWindowEx(exStyle, windowClass, NULL,
                         msStyle,
                         0, 0, 0, 0, (HWND) ((wxWindow*)parent)->GetHWND(), (HMENU)m_windowId,
   m_hWnd = (WXHWND)::CreateWindowEx(exStyle, windowClass, NULL,
                         msStyle,
                         0, 0, 0, 0, (HWND) ((wxWindow*)parent)->GetHWND(), (HMENU)m_windowId,

-                        m_globalHandle ? (HINSTANCE) m_globalHandle : wxGetInstance(), NULL);
+                        wxGetInstance(), NULL);

 
 

-  wxCHECK_MSG( m_hWnd, FALSE, "Failed to create text ctrl" );
+  wxCHECK_MSG( m_hWnd, FALSE, _T("Failed to create text ctrl") );

 
 

-#if CTL3D
+#if wxUSE_CTL3D

   if ( want3D )
   {
     Ctl3dSubclassCtl((HWND)m_hWnd);
   if ( want3D )
   {
     Ctl3dSubclassCtl((HWND)m_hWnd);


@@ -189,7 +197,7 @@ bool wxTextCtrl::Create(wxWindow *parent, wxWindowID id,
   }
 #endif
 
   }
 #endif
 

-#if defined(__WIN95__)
+#if wxUSE_RICHEDIT

   if (m_isRich)
   {
     // Have to enable events
   if (m_isRich)
   {
     // Have to enable events


@@ -200,9 +208,9 @@ bool wxTextCtrl::Create(wxWindow *parent, wxWindowID id,
 
   SubclassWin(GetHWND());
 
 
   SubclassWin(GetHWND());
 

-  if ( parent->GetFont() && parent->GetFont()->Ok() )
+  if ( parent->GetFont().Ok() && parent->GetFont().Ok() )

   {
   {

-  SetFont(* parent->GetFont());
+    SetFont(parent->GetFont());

   }
   else
   {
   }
   else
   {


@@ -223,32 +231,39 @@ bool wxTextCtrl::Create(wxWindow *parent, wxWindowID id,
 }
 
 // Make sure the window style (etc.) reflects the HWND style (roughly)
 }
 
 // Make sure the window style (etc.) reflects the HWND style (roughly)

-void wxTextCtrl::AdoptAttributesFromHWND(void)
+void wxTextCtrl::AdoptAttributesFromHWND()

 {
   wxWindow::AdoptAttributesFromHWND();
 
 {
   wxWindow::AdoptAttributesFromHWND();
 

-  HWND hWnd = (HWND) GetHWND();
+  HWND hWnd = GetHwnd();

   long style = GetWindowLong((HWND) hWnd, GWL_STYLE);
 
   long style = GetWindowLong((HWND) hWnd, GWL_STYLE);
 

-    char buf[256];
+  // retrieve the style to see whether this is an edit or richedit ctrl
+#if wxUSE_RICHEDIT
+  wxChar buf[256];

 
 #ifndef __WIN32__
   GetClassName((HWND) hWnd, buf, 256);
 #else
 #ifdef UNICODE
   GetClassNameW((HWND) hWnd, buf, 256);
 
 #ifndef __WIN32__
   GetClassName((HWND) hWnd, buf, 256);
 #else
 #ifdef UNICODE
   GetClassNameW((HWND) hWnd, buf, 256);

+#else
+#ifdef __TWIN32__
+  GetClassName((HWND) hWnd, buf, 256);

 #else
   GetClassNameA((HWND) hWnd, buf, 256);
 #endif
 #else
   GetClassNameA((HWND) hWnd, buf, 256);
 #endif

+#endif

 #endif
 
   wxString str(buf);
   str.UpperCase();
 
 #endif
 
   wxString str(buf);
   str.UpperCase();
 

-  if (str == "EDIT")
+  if (str == _T("EDIT"))

     m_isRich = FALSE;
   else
     m_isRich = TRUE;
     m_isRich = FALSE;
   else
     m_isRich = TRUE;

+#endif

 
   if (style & ES_MULTILINE)
     m_windowStyle |= wxTE_MULTILINE;
 
   if (style & ES_MULTILINE)
     m_windowStyle |= wxTE_MULTILINE;


@@ -260,20 +275,15 @@ void wxTextCtrl::AdoptAttributesFromHWND(void)
     m_windowStyle |= wxTE_PROCESS_ENTER;
 }
 
     m_windowStyle |= wxTE_PROCESS_ENTER;
 }
 

-void wxTextCtrl::SetupColours(void)
+void wxTextCtrl::SetupColours()

 {
   SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_WINDOW));
   SetForegroundColour(GetParent()->GetForegroundColour());
 }
 
 {
   SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_WINDOW));
   SetForegroundColour(GetParent()->GetForegroundColour());
 }
 

-wxString wxTextCtrl::GetValue(void) const
+wxString wxTextCtrl::GetValue() const

 {
 {

-    int length = GetWindowTextLength((HWND) GetHWND());
-    char *s = new char[length+1];
-    GetWindowText((HWND) GetHWND(), s, length+1);
-    wxString str(s);
-    delete[] s;
-  return str;
+    return wxGetWindowText(GetHWND());

 }
 
 void wxTextCtrl::SetValue(const wxString& value)
 }
 
 void wxTextCtrl::SetValue(const wxString& value)


@@ -289,7 +299,7 @@ void wxTextCtrl::SetValue(const wxString& value)
   }
   if (singletons > 0)
   {
   }
   if (singletons > 0)
   {

-    char *tmp = new char[len + singletons + 1];
+    wxChar *tmp = new wxChar[len + singletons + 1];

     int j = 0;
     for (i = 0; i < len; i ++)
     {
     int j = 0;
     for (i = 0; i < len; i ++)
     {


@@ -302,14 +312,16 @@ void wxTextCtrl::SetValue(const wxString& value)
       j ++;
     }
     tmp[j] = 0;
       j ++;
     }
     tmp[j] = 0;

-    SetWindowText((HWND) GetHWND(), tmp);
+    SetWindowText(GetHwnd(), tmp);

     delete[] tmp;
   }
   else
     delete[] tmp;
   }
   else

-    SetWindowText((HWND) GetHWND(), (const char *)value);
+    SetWindowText(GetHwnd(), (const wxChar *)value);
+
+  AdjustSpaceLimit();

 }
 
 }
 

-void wxTextCtrl::SetSize(int x, int y, int width, int height, int sizeFlags)
+void wxTextCtrl::DoSetSize(int x, int y, int width, int height, int sizeFlags)

 {
   int currentX, currentY;
   GetPosition(&currentX, &currentY);
 {
   int currentX, currentY;
   GetPosition(&currentX, &currentY);


@@ -328,7 +340,7 @@ void wxTextCtrl::SetSize(int x, int y, int width, int height, int sizeFlags)
   int cx; // button font dimensions
   int cy;
 
   int cx; // button font dimensions
   int cy;
 

-  wxGetCharSize(GetHWND(), &cx, &cy,GetFont());
+  wxGetCharSize(GetHWND(), &cx, &cy, & this->GetFont());

 
   int control_width, control_height, control_x, control_y;
 
 
   int control_width, control_height, control_x, control_y;
 


@@ -354,40 +366,49 @@ void wxTextCtrl::SetSize(int x, int y, int width, int height, int sizeFlags)
   if (control_width <= 0)
     control_width = DEFAULT_ITEM_WIDTH;
 
   if (control_width <= 0)
     control_width = DEFAULT_ITEM_WIDTH;
 

-  MoveWindow((HWND) GetHWND(), (int)control_x, (int)control_y,
+  MoveWindow(GetHwnd(), (int)control_x, (int)control_y,

                               (int)control_width, (int)control_height, TRUE);
 }
 
 // Clipboard operations
                               (int)control_width, (int)control_height, TRUE);
 }
 
 // Clipboard operations

-void wxTextCtrl::Copy(void)
+void wxTextCtrl::Copy()

 {
 {

-  HWND hWnd = (HWND) GetHWND();
-  SendMessage(hWnd, WM_COPY, 0, 0L);
+    if (CanCopy())
+    {
+        HWND hWnd = GetHwnd();
+        SendMessage(hWnd, WM_COPY, 0, 0L);
+    }

 }
 
 }
 

-void wxTextCtrl::Cut(void)
+void wxTextCtrl::Cut()

 {
 {

-  HWND hWnd = (HWND) GetHWND();
-  SendMessage(hWnd, WM_CUT, 0, 0L);
+    if (CanCut())
+    {
+        HWND hWnd = GetHwnd();
+        SendMessage(hWnd, WM_CUT, 0, 0L);
+    }

 }
 
 }
 

-void wxTextCtrl::Paste(void)
+void wxTextCtrl::Paste()

 {
 {

-  HWND hWnd = (HWND) GetHWND();
-  SendMessage(hWnd, WM_PASTE, 0, 0L);
+    if (CanPaste())
+    {
+        HWND hWnd = GetHwnd();
+        SendMessage(hWnd, WM_PASTE, 0, 0L);
+    }

 }
 
 void wxTextCtrl::SetEditable(bool editable)
 {
 }
 
 void wxTextCtrl::SetEditable(bool editable)
 {

-  HWND hWnd = (HWND) GetHWND();
+  HWND hWnd = GetHwnd();

   SendMessage(hWnd, EM_SETREADONLY, (WPARAM)!editable, (LPARAM)0L);
 }
 
 void wxTextCtrl::SetInsertionPoint(long pos)
 {
   SendMessage(hWnd, EM_SETREADONLY, (WPARAM)!editable, (LPARAM)0L);
 }
 
 void wxTextCtrl::SetInsertionPoint(long pos)
 {

-  HWND hWnd = (HWND) GetHWND();
+  HWND hWnd = GetHwnd();

 #ifdef __WIN32__
 #ifdef __WIN32__

-#if defined(__WIN95__)
+#if wxUSE_RICHEDIT

   if ( m_isRich)
   {
     CHARRANGE range;
   if ( m_isRich)
   {
     CHARRANGE range;


@@ -409,39 +430,39 @@ void wxTextCtrl::SetInsertionPoint(long pos)
   SendMessage(hWnd, EM_REPLACESEL, 0, (LPARAM)nothing);
 }
 
   SendMessage(hWnd, EM_REPLACESEL, 0, (LPARAM)nothing);
 }
 

-void wxTextCtrl::SetInsertionPointEnd(void)
+void wxTextCtrl::SetInsertionPointEnd()

 {
   long pos = GetLastPosition();
   SetInsertionPoint(pos);
 }
 
 {
   long pos = GetLastPosition();
   SetInsertionPoint(pos);
 }
 

-long wxTextCtrl::GetInsertionPoint(void) const
+long wxTextCtrl::GetInsertionPoint() const

 {
 {

-#if defined(__WIN95__)
+#if wxUSE_RICHEDIT

   if (m_isRich)
   {
     CHARRANGE range;
     range.cpMin = 0;
     range.cpMax = 0;
   if (m_isRich)
   {
     CHARRANGE range;
     range.cpMin = 0;
     range.cpMax = 0;

-    SendMessage((HWND) GetHWND(), EM_EXGETSEL, 0, (LPARAM) &range);
+    SendMessage(GetHwnd(), EM_EXGETSEL, 0, (LPARAM) &range);

     return range.cpMin;
   }
 #endif
 
     return range.cpMin;
   }
 #endif
 

-  DWORD Pos=(DWORD)SendMessage((HWND) GetHWND(), EM_GETSEL, 0, 0L);
+  DWORD Pos=(DWORD)SendMessage(GetHwnd(), EM_GETSEL, 0, 0L);

   return Pos&0xFFFF;
 }
 
   return Pos&0xFFFF;
 }
 

-long wxTextCtrl::GetLastPosition(void) const
+long wxTextCtrl::GetLastPosition() const

 {
 {

-    HWND hWnd = (HWND) GetHWND();
+    HWND hWnd = GetHwnd();

 
     // Will always return a number > 0 (according to docs)
     int noLines = (int)SendMessage(hWnd, EM_GETLINECOUNT, (WPARAM)0, (LPARAM)0L);
 
     // This gets the char index for the _beginning_ of the last line
     int charIndex = (int)SendMessage(hWnd, EM_LINEINDEX, (WPARAM)(noLines-1), (LPARAM)0L);
 
     // Will always return a number > 0 (according to docs)
     int noLines = (int)SendMessage(hWnd, EM_GETLINECOUNT, (WPARAM)0, (LPARAM)0L);
 
     // This gets the char index for the _beginning_ of the last line
     int charIndex = (int)SendMessage(hWnd, EM_LINEINDEX, (WPARAM)(noLines-1), (LPARAM)0L);

-    
+

     // Get number of characters in the last line. We'll add this to the character
     // index for the last line, 1st position.
     int lineLength = (int)SendMessage(hWnd, EM_LINELENGTH, (WPARAM)charIndex, (LPARAM)0L);
     // Get number of characters in the last line. We'll add this to the character
     // index for the last line, 1st position.
     int lineLength = (int)SendMessage(hWnd, EM_LINELENGTH, (WPARAM)charIndex, (LPARAM)0L);


@@ -451,10 +472,11 @@ long wxTextCtrl::GetLastPosition(void) const
 
 void wxTextCtrl::Replace(long from, long to, const wxString& value)
 {
 
 void wxTextCtrl::Replace(long from, long to, const wxString& value)
 {

-    HWND hWnd = (HWND) GetHWND();
+#if wxUSE_CLIPBOARD
+    HWND hWnd = GetHwnd();

     long fromChar = from;
     long toChar = to;
     long fromChar = from;
     long toChar = to;

-    
+

     // Set selection and remove it
 #ifdef __WIN32__
     SendMessage(hWnd, EM_SETSEL, fromChar, toChar);
     // Set selection and remove it
 #ifdef __WIN32__
     SendMessage(hWnd, EM_SETSEL, fromChar, toChar);


@@ -464,18 +486,21 @@ void wxTextCtrl::Replace(long from, long to, const wxString& value)
     SendMessage(hWnd, WM_CUT, (WPARAM)0, (LPARAM)0);
 
     // Now replace with 'value', by pasting.
     SendMessage(hWnd, WM_CUT, (WPARAM)0, (LPARAM)0);
 
     // Now replace with 'value', by pasting.

-    wxSetClipboardData(wxDF_TEXT, (wxObject *) (const char *)value, 0, 0);
+    wxSetClipboardData(wxDF_TEXT, (wxObject *) (const wxChar *)value, 0, 0);

 
     // Paste into edit control
     SendMessage(hWnd, WM_PASTE, (WPARAM)0, (LPARAM)0L);
 
     // Paste into edit control
     SendMessage(hWnd, WM_PASTE, (WPARAM)0, (LPARAM)0L);

+#else
+    wxFAIL_MSG("wxTextCtrl::Replace not implemented if wxUSE_CLIPBOARD is 0.");
+#endif

 }
 
 void wxTextCtrl::Remove(long from, long to)
 {
 }
 
 void wxTextCtrl::Remove(long from, long to)
 {

-    HWND hWnd = (HWND) GetHWND();
+    HWND hWnd = GetHwnd();

     long fromChar = from;
     long toChar = to;
     long fromChar = from;
     long toChar = to;

-    
+

     // Cut all selected text
 #ifdef __WIN32__
     SendMessage(hWnd, EM_SETSEL, fromChar, toChar);
     // Cut all selected text
 #ifdef __WIN32__
     SendMessage(hWnd, EM_SETSEL, fromChar, toChar);


@@ -487,7 +512,7 @@ void wxTextCtrl::Remove(long from, long to)
 
 void wxTextCtrl::SetSelection(long from, long to)
 {
 
 void wxTextCtrl::SetSelection(long from, long to)
 {

-    HWND hWnd = (HWND) GetHWND();
+    HWND hWnd = GetHwnd();

     long fromChar = from;
     long toChar = to;
     // if from and to are both -1, it means
     long fromChar = from;
     long toChar = to;
     // if from and to are both -1, it means


@@ -498,7 +523,7 @@ void wxTextCtrl::SetSelection(long from, long to)
       fromChar = 0;
       toChar = -1;
     }
       fromChar = 0;
       toChar = -1;
     }

-    
+

 #ifdef __WIN32__
     SendMessage(hWnd, EM_SETSEL, (WPARAM)fromChar, (LPARAM)toChar);
     SendMessage(hWnd, EM_SCROLLCARET, (WPARAM)0, (LPARAM)0);
 #ifdef __WIN32__
     SendMessage(hWnd, EM_SETSEL, (WPARAM)fromChar, (LPARAM)toChar);
     SendMessage(hWnd, EM_SCROLLCARET, (WPARAM)0, (LPARAM)0);


@@ -510,7 +535,7 @@ void wxTextCtrl::SetSelection(long from, long to)
 
 bool wxTextCtrl::LoadFile(const wxString& file)
 {
 
 bool wxTextCtrl::LoadFile(const wxString& file)
 {

-  if (!FileExists(WXSTRINGCAST file))
+  if (!wxFileExists(WXSTRINGCAST file))

     return FALSE;
 
   m_fileName = file;
     return FALSE;
 
   m_fileName = file;


@@ -518,7 +543,7 @@ bool wxTextCtrl::LoadFile(const wxString& file)
   Clear();
 
 //  ifstream input(WXSTRINGCAST file, ios::nocreate | ios::in);
   Clear();
 
 //  ifstream input(WXSTRINGCAST file, ios::nocreate | ios::in);

-  ifstream input(WXSTRINGCAST file, ios::in);
+  ifstream input(MBSTRINGCAST file.mb_str(wxConvFile), ios::in);

 
   if (!input.bad())
   {
 
   if (!input.bad())
   {


@@ -528,32 +553,47 @@ bool wxTextCtrl::LoadFile(const wxString& file)
       // positions as signed shorts. Now load in one chunk...
       // Note use of 'farmalloc' as in Borland 3.1 'size_t' is 16-bits...
 
       // positions as signed shorts. Now load in one chunk...
       // Note use of 'farmalloc' as in Borland 3.1 'size_t' is 16-bits...
 

+#ifdef __SALFORDC__
+      struct _stat stat_buf;
+      if (stat(MBSTRINGCAST file.mb_str(wxConvFile), &stat_buf) < 0)
+        return FALSE;
+#else

       struct stat stat_buf;
       struct stat stat_buf;

-      if (stat(file, &stat_buf) < 0)
+      if (stat(file.mb_str(wxConvFile), &stat_buf) < 0)

         return FALSE;
         return FALSE;

-//      char *tmp_buffer = (char*)farmalloc(stat_buf.st_size+1);
+#endif
+
+//      wxChar *tmp_buffer = (wxChar*)farmalloc(stat_buf.st_size+1);

       // This may need to be a bigger buffer than the file size suggests,
       // if it's a UNIX file. Give it an extra 1000 just in case.
       // This may need to be a bigger buffer than the file size suggests,
       // if it's a UNIX file. Give it an extra 1000 just in case.

-      char *tmp_buffer = (char*)farmalloc((size_t)(stat_buf.st_size+1+1000));
+      wxChar *tmp_buffer = (wxChar*)farmalloc((size_t)(stat_buf.st_size+1+1000));
+      char *read_buffer = new char[512];

       long no_lines = 0;
       long pos = 0;
       while (!input.eof() && input.peek() != EOF)
       {
       long no_lines = 0;
       long pos = 0;
       while (!input.eof() && input.peek() != EOF)
       {

-        input.getline(wxBuffer, 500);
-  int len = strlen(wxBuffer);
+        input.getline(read_buffer, 500);
+  int len = strlen(read_buffer);

   wxBuffer[len] = 13;
   wxBuffer[len+1] = 10;
   wxBuffer[len+2] = 0;
   wxBuffer[len] = 13;
   wxBuffer[len+1] = 10;
   wxBuffer[len+2] = 0;

-  strcpy(tmp_buffer+pos, wxBuffer);
-  pos += strlen(wxBuffer);
+#if wxUSE_UNICODE
+  pos += wxConvCurrent->MB2WC(tmp_buffer+pos, read_buffer, (size_t)-1);
+#else
+  strcpy(tmp_buffer+pos, read_buffer);
+  pos += strlen(read_buffer);
+#endif

   no_lines++;
       }
   no_lines++;
       }

+      delete[] read_buffer;

 
 

-//      SendMessage((HWND) GetHWND(), WM_SETTEXT, 0, (LPARAM)tmp_buffer);
-      SetWindowText((HWND) GetHWND(), tmp_buffer);
-      SendMessage((HWND) GetHWND(), EM_SETMODIFY, FALSE, 0L);
+      SetWindowText(GetHwnd(), tmp_buffer);
+      SendMessage(GetHwnd(), EM_SETMODIFY, FALSE, 0L);

       farfree(tmp_buffer);
 
       farfree(tmp_buffer);
 

+      // update the size limit if needed
+      AdjustSpaceLimit();
+

       return TRUE;
   }
   return FALSE;
       return TRUE;
   }
   return FALSE;


@@ -563,33 +603,36 @@ bool wxTextCtrl::LoadFile(const wxString& file)
 // Returns TRUE if succeeds.
 bool wxTextCtrl::SaveFile(const wxString& file)
 {
 // Returns TRUE if succeeds.
 bool wxTextCtrl::SaveFile(const wxString& file)
 {

-  wxString theFile(file);
-  if (theFile == "")
-    theFile = m_fileName;
-  if (theFile == "")
-    return FALSE;
-  m_fileName = theFile;
+    wxString theFile(file);

 
 

-  ofstream output((char*) (const char*) theFile);
-  if (output.bad())
-  return FALSE;
+    if (theFile == _T(""))
+        theFile = m_fileName;
+
+    if (theFile == _T(""))
+        return FALSE;
+
+    m_fileName = theFile;
+
+    ofstream output(MBSTRINGCAST theFile.mb_str(wxConvFile));
+    if (output.bad())
+        return FALSE;

 
     // This will only save 64K max
 
     // This will only save 64K max

-    unsigned long nbytes = SendMessage((HWND) GetHWND(), WM_GETTEXTLENGTH, 0, 0);
+    unsigned long nbytes = SendMessage(GetHwnd(), WM_GETTEXTLENGTH, 0, 0);

     char *tmp_buffer = (char*)farmalloc((size_t)(nbytes+1));
     char *tmp_buffer = (char*)farmalloc((size_t)(nbytes+1));

-    SendMessage((HWND) GetHWND(), WM_GETTEXT, (WPARAM)(nbytes+1), (LPARAM)tmp_buffer);
+    SendMessage(GetHwnd(), WM_GETTEXT, (WPARAM)(nbytes+1), (LPARAM)tmp_buffer);

     char *pstr = tmp_buffer;
 
     char *pstr = tmp_buffer;
 

-  // Convert \r\n to just \n
-  while (*pstr)
-  {
-    if (*pstr != '\r')
-      output << *pstr;
-    pstr++;
-  }
+    // Convert \r\n to just \n
+    while (*pstr)
+    {
+      if (*pstr != '\r')
+        output << *pstr;
+      pstr++;
+    }

 
     farfree(tmp_buffer);
 
     farfree(tmp_buffer);

-    SendMessage((HWND) GetHWND(), EM_SETMODIFY, FALSE, 0L);
+    SendMessage(GetHwnd(), EM_SETMODIFY, FALSE, 0L);

 
     return TRUE;
 }
 
     return TRUE;
 }


@@ -613,40 +656,47 @@ void wxTextCtrl::WriteText(const wxString& text)
       j ++;
     }
     newtext[j] = 0;
       j ++;
     }
     newtext[j] = 0;

-    SendMessage((HWND) GetHWND(), EM_REPLACESEL, 0, (LPARAM)newtext);
+    SendMessage(GetHwnd(), EM_REPLACESEL, 0, (LPARAM)newtext);

     delete[] newtext;
     delete[] newtext;

+
+    AdjustSpaceLimit();
+}
+
+void wxTextCtrl::AppendText(const wxString& text)
+{
+    SetInsertionPointEnd();
+    WriteText(text);

 }
 
 }
 

-void wxTextCtrl::Clear(void)
+void wxTextCtrl::Clear()

 {
 {

-//    SendMessage((HWND) GetHWND(), WM_SETTEXT, 0, (LPARAM)"");
-    SetWindowText((HWND) GetHWND(), "");
+    SetWindowText(GetHwnd(), _T(""));

 }
 
 }
 

-bool wxTextCtrl::IsModified(void) const
+bool wxTextCtrl::IsModified() const

 {
 {

-    return (SendMessage((HWND) GetHWND(), EM_GETMODIFY, 0, 0) != 0);
+    return (SendMessage(GetHwnd(), EM_GETMODIFY, 0, 0) != 0);

 }
 
 // Makes 'unmodified'
 }
 
 // Makes 'unmodified'

-void wxTextCtrl::DiscardEdits(void)
+void wxTextCtrl::DiscardEdits()

 {
 {

-  SendMessage((HWND) GetHWND(), EM_SETMODIFY, FALSE, 0L);
+  SendMessage(GetHwnd(), EM_SETMODIFY, FALSE, 0L);

 }
 
 /*
  * Some of the following functions are yet to be implemented
  *
  */
 }
 
 /*
  * Some of the following functions are yet to be implemented
  *
  */

- 
-int wxTextCtrl::GetNumberOfLines(void) const
+
+int wxTextCtrl::GetNumberOfLines() const

 {
 {

-    return (int)SendMessage((HWND) GetHWND(), EM_GETLINECOUNT, (WPARAM)0, (LPARAM)0);
+    return (int)SendMessage(GetHwnd(), EM_GETLINECOUNT, (WPARAM)0, (LPARAM)0);

 }
 
 long wxTextCtrl::XYToPosition(long x, long y) const
 {
 }
 
 long wxTextCtrl::XYToPosition(long x, long y) const
 {

-    HWND hWnd = (HWND) GetHWND();
+    HWND hWnd = GetHwnd();

 
     // This gets the char index for the _beginning_ of this line
     int charIndex = (int)SendMessage(hWnd, EM_LINEINDEX, (WPARAM)y, (LPARAM)0);
 
     // This gets the char index for the _beginning_ of this line
     int charIndex = (int)SendMessage(hWnd, EM_LINEINDEX, (WPARAM)y, (LPARAM)0);


@@ -655,7 +705,7 @@ long wxTextCtrl::XYToPosition(long x, long y) const
 
 void wxTextCtrl::PositionToXY(long pos, long *x, long *y) const
 {
 
 void wxTextCtrl::PositionToXY(long pos, long *x, long *y) const
 {

-    HWND hWnd = (HWND) GetHWND();
+    HWND hWnd = GetHwnd();

 
     // This gets the line number containing the character
     int lineNo = (int)SendMessage(hWnd, EM_LINEFROMCHAR, (WPARAM)pos, (LPARAM)0);
 
     // This gets the line number containing the character
     int lineNo = (int)SendMessage(hWnd, EM_LINEFROMCHAR, (WPARAM)pos, (LPARAM)0);


@@ -668,7 +718,7 @@ void wxTextCtrl::PositionToXY(long pos, long *x, long *y) const
 
 void wxTextCtrl::ShowPosition(long pos)
 {
 
 void wxTextCtrl::ShowPosition(long pos)
 {

-    HWND hWnd = (HWND) GetHWND();
+    HWND hWnd = GetHwnd();

 
     // To scroll to a position, we pass the number of lines and characters
     // to scroll *by*. This means that we need to:
 
     // To scroll to a position, we pass the number of lines and characters
     // to scroll *by*. This means that we need to:


@@ -684,39 +734,129 @@ void wxTextCtrl::ShowPosition(long pos)
     int currentLineLineNo = (int)SendMessage(hWnd, EM_GETFIRSTVISIBLELINE, (WPARAM)0, (LPARAM)0L);
 
     int specifiedLineLineNo = (int)SendMessage(hWnd, EM_LINEFROMCHAR, (WPARAM)pos, (LPARAM)0L);
     int currentLineLineNo = (int)SendMessage(hWnd, EM_GETFIRSTVISIBLELINE, (WPARAM)0, (LPARAM)0L);
 
     int specifiedLineLineNo = (int)SendMessage(hWnd, EM_LINEFROMCHAR, (WPARAM)pos, (LPARAM)0L);

-    
-    int linesToScroll = specifiedLineLineNo - currentLineLineNo;

 
 

-/*
-    wxDebugMsg("Caret line: %d; Current visible line: %d; Specified line: %d; lines to scroll: %d\n",
-      currentLineLineNo1, currentLineLineNo, specifiedLineLineNo, linesToScroll);
-*/
+    int linesToScroll = specifiedLineLineNo - currentLineLineNo;

 
     if (linesToScroll != 0)
 
     if (linesToScroll != 0)

-      (void)SendMessage(hWnd, EM_LINESCROLL, (WPARAM)0, (LPARAM)MAKELPARAM(linesToScroll, 0));
+      (void)SendMessage(hWnd, EM_LINESCROLL, (WPARAM)0, (LPARAM)linesToScroll);

 }
 
 int wxTextCtrl::GetLineLength(long lineNo) const
 {
     long charIndex = XYToPosition(0, lineNo);
 }
 
 int wxTextCtrl::GetLineLength(long lineNo) const
 {
     long charIndex = XYToPosition(0, lineNo);

-    HWND hWnd = (HWND) GetHWND();
+    HWND hWnd = GetHwnd();

     int len = (int)SendMessage(hWnd, EM_LINELENGTH, (WPARAM)charIndex, (LPARAM)0);
     return len;
 }
 
 wxString wxTextCtrl::GetLineText(long lineNo) const
 {
     int len = (int)SendMessage(hWnd, EM_LINELENGTH, (WPARAM)charIndex, (LPARAM)0);
     return len;
 }
 
 wxString wxTextCtrl::GetLineText(long lineNo) const
 {

-    HWND hWnd = (HWND) GetHWND();
+    HWND hWnd = GetHwnd();

     *(WORD *)wxBuffer = 512;
     int noChars = (int)SendMessage(hWnd, EM_GETLINE, (WPARAM)lineNo, (LPARAM)wxBuffer);
     wxBuffer[noChars] = 0;
   return wxString(wxBuffer);
 }
 
     *(WORD *)wxBuffer = 512;
     int noChars = (int)SendMessage(hWnd, EM_GETLINE, (WPARAM)lineNo, (LPARAM)wxBuffer);
     wxBuffer[noChars] = 0;
   return wxString(wxBuffer);
 }
 

-/*
- * Text item
- */
- 
+bool wxTextCtrl::CanCopy() const
+{
+    // Can copy if there's a selection
+    long from, to;
+    GetSelection(& from, & to);
+    return (from != to) ;
+}
+
+bool wxTextCtrl::CanCut() const
+{
+    // Can cut if there's a selection
+    long from, to;
+    GetSelection(& from, & to);
+    return (from != to) ;
+}
+
+bool wxTextCtrl::CanPaste() const
+{
+#if wxUSE_RICHEDIT
+    if (m_isRich)
+    {
+        int dataFormat = 0; // 0 == any format
+        return (::SendMessage( GetHwnd(), EM_CANPASTE, (WPARAM) (UINT) dataFormat, 0) != 0);
+    }
+#endif
+    if (!IsEditable())
+        return FALSE;
+
+    // Standard edit control: check for straight text on clipboard
+    bool isTextAvailable = FALSE;
+    if (::OpenClipboard((HWND) wxTheApp->GetTopWindow()->GetHWND()))
+    {
+        isTextAvailable = (::IsClipboardFormatAvailable(CF_TEXT) != 0);
+        ::CloseClipboard();
+    }
+    return isTextAvailable;
+}
+
+// Undo/redo
+void wxTextCtrl::Undo()
+{
+    if (CanUndo())
+    {
+        ::SendMessage(GetHwnd(), EM_UNDO, 0, 0);
+    }
+}
+
+void wxTextCtrl::Redo()
+{
+    if (CanRedo())
+    {
+        // Same as Undo, since Undo undoes the undo, i.e. a redo.
+        ::SendMessage(GetHwnd(), EM_UNDO, 0, 0);
+    }
+}
+
+bool wxTextCtrl::CanUndo() const
+{
+    return (::SendMessage(GetHwnd(), EM_CANUNDO, 0, 0) != 0);
+}
+
+bool wxTextCtrl::CanRedo() const
+{
+    return (::SendMessage(GetHwnd(), EM_CANUNDO, 0, 0) != 0);
+}
+
+// If the return values from and to are the same, there is no
+// selection.
+void wxTextCtrl::GetSelection(long* from, long* to) const
+{
+#if wxUSE_RICHEDIT
+    if (m_isRich)
+    {
+        CHARRANGE charRange;
+        ::SendMessage(GetHwnd(), EM_EXGETSEL, 0, (LPARAM) (CHARRANGE*) & charRange);
+
+        *from = charRange.cpMin;
+        *to = charRange.cpMax;
+
+        return;
+    }
+#endif
+    DWORD dwStart, dwEnd;
+    WPARAM wParam = (WPARAM) (DWORD*) & dwStart; // receives starting position
+    LPARAM lParam = (LPARAM) (DWORD*) & dwEnd;   // receives ending position
+
+    ::SendMessage(GetHwnd(), EM_GETSEL, wParam, lParam);
+
+    *from = dwStart;
+    *to = dwEnd;
+}
+
+bool wxTextCtrl::IsEditable() const
+{
+    long style = ::GetWindowLong(GetHwnd(), GWL_STYLE);
+
+    return ((style & ES_READONLY) == 0);
+}
+

 void wxTextCtrl::Command(wxCommandEvent & event)
 {
   SetValue (event.GetString());
 void wxTextCtrl::Command(wxCommandEvent & event)
 {
   SetValue (event.GetString());


@@ -736,11 +876,11 @@ void wxTextCtrl::OnDropFiles(wxDropFilesEvent& event)
 // AT&T's "C++ Lanuage System Release 3.0 Library Manual" - Stein Somers
 
 //=========================================================================
 // AT&T's "C++ Lanuage System Release 3.0 Library Manual" - Stein Somers
 
 //=========================================================================

-// Called then the buffer is full (gcc 2.6.3) 
+// Called then the buffer is full (gcc 2.6.3)

 // or when "endl" is output (Borland 4.5)
 //=========================================================================
 // Class declaration using multiple inheritance doesn't work properly for
 // or when "endl" is output (Borland 4.5)
 //=========================================================================
 // Class declaration using multiple inheritance doesn't work properly for

-// Borland. See note in wb_text.h.
+// Borland. See note in textctrl.h.

 #ifndef NO_TEXT_WINDOW_STREAM
 int wxTextCtrl::overflow(int c)
 {
 #ifndef NO_TEXT_WINDOW_STREAM
 int wxTextCtrl::overflow(int c)
 {


@@ -750,11 +890,11 @@ int wxTextCtrl::overflow(int c)
 #if wxUSE_IOSTREAMH
   if ( allocate()==EOF )
   {
 #if wxUSE_IOSTREAMH
   if ( allocate()==EOF )
   {

-    wxError("Streambuf allocation failed","Internal error");
+    wxLogError("Streambuf allocation failed");

     return EOF;
   }
 #endif
     return EOF;
   }
 #endif

-  
+

   // Verify that there are no characters in get area
   if ( gptr() && gptr() < egptr() )
   {
   // Verify that there are no characters in get area
   if ( gptr() && gptr() < egptr() )
   {


@@ -796,7 +936,7 @@ int wxTextCtrl::overflow(int c)
   txt[plen] = (char)c;     // append c
   txt[plen+xtra] = '\0';   // append '\0' or overwrite c
     // If the put area already contained \0, output will be truncated there
   txt[plen] = (char)c;     // append c
   txt[plen+xtra] = '\0';   // append '\0' or overwrite c
     // If the put area already contained \0, output will be truncated there

-  WriteText(txt);
+  AppendText(txt);

     delete[] txt;
   }
 
     delete[] txt;
   }
 


@@ -826,7 +966,7 @@ int wxTextCtrl::overflow(int c)
 //=========================================================================
 // called then "endl" is output (gcc) or then explicit sync is done (Borland)
 //=========================================================================
 //=========================================================================
 // called then "endl" is output (gcc) or then explicit sync is done (Borland)
 //=========================================================================

-int wxTextCtrl::sync(void)
+int wxTextCtrl::sync()

 {
   // Verify that there are no characters in get area
   if ( gptr() && gptr() < egptr() )
 {
   // Verify that there are no characters in get area
   if ( gptr() && gptr() < egptr() )


@@ -853,7 +993,7 @@ int wxTextCtrl::sync(void)
 //=========================================================================
 // Should not be called by a "ostream". Used by a "istream"
 //=========================================================================
 //=========================================================================
 // Should not be called by a "ostream". Used by a "istream"
 //=========================================================================

-int wxTextCtrl::underflow(void)
+int wxTextCtrl::underflow()

 {
   return EOF;
 }
 {
   return EOF;
 }


@@ -861,39 +1001,39 @@ int wxTextCtrl::underflow(void)
 
 wxTextCtrl& wxTextCtrl::operator<<(const wxString& s)
 {
 
 wxTextCtrl& wxTextCtrl::operator<<(const wxString& s)
 {

-  WriteText(s);
-  return *this;
+    AppendText(s);
+    return *this;

 }
 
 wxTextCtrl& wxTextCtrl::operator<<(float f)
 {
     wxString str;
 }
 
 wxTextCtrl& wxTextCtrl::operator<<(float f)
 {
     wxString str;

-    str.Printf("%.2f", f);
-    WriteText(str);
+    str.Printf(_T("%.2f"), f);
+    AppendText(str);

     return *this;
 }
 
 wxTextCtrl& wxTextCtrl::operator<<(double d)
 {
     wxString str;
     return *this;
 }
 
 wxTextCtrl& wxTextCtrl::operator<<(double d)
 {
     wxString str;

-    str.Printf("%.2f", d);
-    WriteText(str);
+    str.Printf(_T("%.2f"), d);
+    AppendText(str);

     return *this;
 }
 
 wxTextCtrl& wxTextCtrl::operator<<(int i)
 {
     wxString str;
     return *this;
 }
 
 wxTextCtrl& wxTextCtrl::operator<<(int i)
 {
     wxString str;

-    str.Printf("%d", i);
-    WriteText(str);
+    str.Printf(_T("%d"), i);
+    AppendText(str);

     return *this;
 }
 
 wxTextCtrl& wxTextCtrl::operator<<(long i)
 {
     wxString str;
     return *this;
 }
 
 wxTextCtrl& wxTextCtrl::operator<<(long i)
 {
     wxString str;

-    str.Printf("%ld", i);
-    WriteText(str);
+    str.Printf(_T("%ld"), i);
+    AppendText(str);

     return *this;
 }
 
     return *this;
 }
 


@@ -903,14 +1043,14 @@ wxTextCtrl& wxTextCtrl::operator<<(const char c)
 
     buf[0] = c;
     buf[1] = 0;
 
     buf[0] = c;
     buf[1] = 0;

-    WriteText(buf);
+    AppendText(buf);

     return *this;
 }
 
 WXHBRUSH wxTextCtrl::OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,
       WXUINT message, WXWPARAM wParam, WXLPARAM lParam)
 {
     return *this;
 }
 
 WXHBRUSH wxTextCtrl::OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,
       WXUINT message, WXWPARAM wParam, WXLPARAM lParam)
 {

-#if CTL3D
+#if wxUSE_CTL3D

   if ( m_useCtl3D )
   {
     HBRUSH hbrush = Ctl3dCtlColorEx(message, wParam, lParam);
   if ( m_useCtl3D )
   {
     HBRUSH hbrush = Ctl3dCtlColorEx(message, wParam, lParam);


@@ -937,137 +1077,141 @@ WXHBRUSH wxTextCtrl::OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,
 
 void wxTextCtrl::OnChar(wxKeyEvent& event)
 {
 
 void wxTextCtrl::OnChar(wxKeyEvent& event)
 {

-  if ( (event.KeyCode() == WXK_RETURN) && (m_windowStyle & wxPROCESS_ENTER))
-  {
-    wxCommandEvent event(wxEVT_COMMAND_TEXT_ENTER, m_windowId);
-    event.SetEventObject( this );
-    if ( GetEventHandler()->ProcessEvent(event) )
-      return;
-  }
-  else if ( event.KeyCode() == WXK_TAB ) {
-    wxNavigationKeyEvent event;
-    event.SetDirection(!(::GetKeyState(VK_SHIFT) & 0x100));
-    event.SetWindowChange(FALSE);
-    event.SetEventObject(this);
-
-    if ( GetEventHandler()->ProcessEvent(event) )
-      return;
-  }
+    switch ( event.KeyCode() )
+    {
+        case WXK_RETURN:
+            if ( !(m_windowStyle & wxTE_MULTILINE) )
+            {
+                wxCommandEvent event(wxEVT_COMMAND_TEXT_ENTER, m_windowId);
+                event.SetEventObject( this );
+                if ( GetEventHandler()->ProcessEvent(event) )
+                    return;
+            }
+            //else: multiline controls need Enter for themselves
+
+            break;
+
+        case WXK_TAB:
+            // only produce navigation event if we don't process TAB ourself or
+            // if it's a Shift-Tab keypress (we assume nobody will ever need
+            // this key combo for himself)
+            //
+            // NB: Notice that Ctrl-Tab is handled elsewhere and Alt-Tab is
+            //     handled by Windows
+            if ( event.ShiftDown() || !(m_windowStyle & wxTE_PROCESS_TAB) )
+            {
+                wxNavigationKeyEvent eventNav;
+                eventNav.SetDirection(!event.ShiftDown());
+                eventNav.SetWindowChange(FALSE);
+                eventNav.SetEventObject(this);
+
+                if ( GetEventHandler()->ProcessEvent(eventNav) )
+                    return;
+            }
+            break;
+
+        default:
+            event.Skip();
+            return;
+    }

 
 

-  event.Skip();
+    // don't just call event.Skip() because this will cause TABs and ENTERs
+    // be passed upwards and we don't always want this - instead process it
+    // right here
+
+    // FIXME
+    event.Skip();

 }
 
 long wxTextCtrl::MSWGetDlgCode()
 {
 }
 
 long wxTextCtrl::MSWGetDlgCode()
 {

-  long lRc = DLGC_WANTCHARS | DLGC_WANTARROWS;
-  if ( m_windowStyle & wxPROCESS_ENTER )
-    lRc |= DLGC_WANTMESSAGE;
-  else if ( m_windowStyle & wxTE_MULTILINE )
-    lRc |= DLGC_WANTMESSAGE;
-
-  return lRc;
+    // we always want the characters and the arrows
+    long lRc = DLGC_WANTCHARS | DLGC_WANTARROWS;
+
+    // we may have several different cases:
+    // 1. normal case: both TAB and ENTER are used for dialog navigation
+    // 2. ctrl which wants TAB for itself: ENTER is used to pass to the next
+    //    control in the dialog
+    // 3. ctrl which wants ENTER for itself: TAB is used for dialog navigation
+    // 4. ctrl which wants both TAB and ENTER: Ctrl-ENTER is used to pass to
+    //    the next control
+    if ( m_windowStyle & wxTE_PROCESS_ENTER )
+        lRc |= DLGC_WANTMESSAGE;
+    if ( m_windowStyle & wxTE_PROCESS_TAB )
+        lRc |= DLGC_WANTTAB;
+
+    return lRc;

 }
 
 }
 

-void wxTextCtrl::OnEraseBackground(wxEraseEvent& event)
+bool wxTextCtrl::MSWCommand(WXUINT param, WXWORD WXUNUSED(id))

 {
 {

-    if ( m_windowStyle & wxTE_MULTILINE )
+    switch (param)

     {
     {

-        // No flicker - only problem is we probably can't change the background
-        Default();
-/*
-        RECT rect;
-        ::GetClientRect((HWND) GetHWND(), &rect);
-
-        HBRUSH hBrush = ::CreateSolidBrush(PALETTERGB(GetBackgroundColour().Red(), GetBackgroundColour().Green(), GetBackgroundColour().Blue()));
-        int mode = ::SetMapMode((HDC) event.GetDC()->GetHDC(), MM_TEXT);
-
-        ::FillRect ((HDC) event.GetDC()->GetHDC(), &rect, hBrush);
-        ::DeleteObject(hBrush);
-        ::SetMapMode((HDC) event.GetDC()->GetHDC(), mode);
-*/
+        case EN_SETFOCUS:
+        case EN_KILLFOCUS:
+            {
+                wxFocusEvent event(param == EN_KILLFOCUS ? wxEVT_KILL_FOCUS
+                        : wxEVT_SET_FOCUS,
+                        m_windowId);
+                event.SetEventObject( this );
+                GetEventHandler()->ProcessEvent(event);
+            }
+            break;
+
+        case EN_CHANGE:
+            {
+                wxCommandEvent event(wxEVT_COMMAND_TEXT_UPDATED, m_windowId);
+                wxString val(GetValue());
+                if ( !val.IsNull() )
+                    event.m_commandString = WXSTRINGCAST val;
+                event.SetEventObject( this );
+                ProcessCommand(event);
+            }
+            break;
+
+        case EN_ERRSPACE:
+            // the text size limit has been hit - increase it
+            AdjustSpaceLimit();
+            break;
+
+            // the other notification messages are not processed
+        case EN_UPDATE:
+        case EN_MAXTEXT:
+        case EN_HSCROLL:
+        case EN_VSCROLL:
+        default:
+            return FALSE;

     }
     }

-//        wxWindow::OnEraseBackground(event);
+
+    // processed
+    return TRUE;

 }
 
 }
 

-bool wxTextCtrl::MSWCommand(WXUINT param, WXWORD WXUNUSED(id))
+void wxTextCtrl::AdjustSpaceLimit()

 {
 {

-/*
-  // Debugging
-  wxDebugMsg("Edit control %d: ", (int)id);
-  switch (param)
-  {
-    case EN_SETFOCUS:
-      wxDebugMsg("EN_SETFOCUS\n");
-      break;
-    case EN_KILLFOCUS:
-      wxDebugMsg("EN_KILLFOCUS\n");
-      break;
-    case EN_CHANGE:
-      wxDebugMsg("EN_CHANGE\n");
-      break;
-    case EN_UPDATE:
-      wxDebugMsg("EN_UPDATE\n");
-      break;
-    case EN_ERRSPACE:
-      wxDebugMsg("EN_ERRSPACE\n");
-      break;
-    case EN_MAXTEXT:
-      wxDebugMsg("EN_MAXTEXT\n");
-      break;
-    case EN_HSCROLL:
-      wxDebugMsg("EN_HSCROLL\n");
-      break;
-    case EN_VSCROLL:
-      wxDebugMsg("EN_VSCROLL\n");
-      break;
-    default:
-      wxDebugMsg("Unknown EDIT notification\n");
-      break;
-  }
-*/
-  switch (param)
-  {
-    case EN_SETFOCUS:
-    case EN_KILLFOCUS:
-      {
-        wxFocusEvent event(param == EN_KILLFOCUS ? wxEVT_KILL_FOCUS
-                                                 : wxEVT_SET_FOCUS,
-                           m_windowId);
-        event.SetEventObject( this );
-        ProcessEvent(event);
-      }
-      break;
-
-    case EN_CHANGE:
-      {
-        wxCommandEvent event(wxEVT_COMMAND_TEXT_UPDATED, m_windowId);
-        wxString val(GetValue());
-        if ( !val.IsNull() )
-          event.m_commandString = WXSTRINGCAST val;
-        event.SetEventObject( this );
-        ProcessCommand(event);
-      }
-      break;
-
-    // the other notification messages are not processed
-    case EN_UPDATE:
-    case EN_ERRSPACE:
-    case EN_MAXTEXT:
-    case EN_HSCROLL:
-    case EN_VSCROLL:
-    default:
-      return FALSE;
-  }
+#ifndef __WIN16__
+    unsigned int len = ::GetWindowTextLength(GetHwnd()),
+    limit = ::SendMessage(GetHwnd(), EM_GETLIMITTEXT, 0, 0);
+    if ( len > limit )
+    {
+        limit = len + 0x8000;    // 32Kb

 
 

-  // processed
-  return TRUE;
+#if wxUSE_RICHEDIT
+        if ( m_isRich || limit > 0xffff )
+#else
+        if ( limit > 0xffff )
+#endif
+            ::SendMessage(GetHwnd(), EM_LIMITTEXT, 0, limit);
+        else
+            ::SendMessage(GetHwnd(), EM_LIMITTEXT, limit, 0);
+    }
+#endif

 }
 
 }
 

-

 // For Rich Edit controls. Do we need it?
 #if 0
 // For Rich Edit controls. Do we need it?
 #if 0

-#if defined(__WIN95__)
-bool wxTextCtrl::MSWNotify(WXWPARAM wParam, WXLPARAM lParam)
+#if wxUSE_RICHEDIT
+bool wxTextCtrl::MSWOnNotify(WXWPARAM wParam, WXLPARAM lParam)

 {
   wxCommandEvent event(0, m_windowId);
   int eventType = 0;
 {
   wxCommandEvent event(0, m_windowId);
   int eventType = 0;


@@ -1076,14 +1220,14 @@ bool wxTextCtrl::MSWNotify(WXWPARAM wParam, WXLPARAM lParam)
   {
     // Insert case code here
     default :
   {
     // Insert case code here
     default :

-      return wxControl::MSWNotify(wParam, lParam);
+      return wxControl::MSWOnNotify(wParam, lParam);

       break;
   }
 
   event.SetEventObject( this );
   event.SetEventType(eventType);
 
       break;
   }
 
   event.SetEventObject( this );
   event.SetEventType(eventType);
 

-  if ( !ProcessEvent(event) )
+  if ( !GetEventHandler()->ProcessEvent(event) )

     return FALSE;
 
     return TRUE;
     return FALSE;
 
     return TRUE;


@@ -1091,3 +1235,53 @@ bool wxTextCtrl::MSWNotify(WXWPARAM wParam, WXLPARAM lParam)
 #endif
 #endif
 
 #endif
 #endif
 

+void wxTextCtrl::OnCut(wxCommandEvent& event)
+{
+    Cut();
+}
+
+void wxTextCtrl::OnCopy(wxCommandEvent& event)
+{
+    Copy();
+}
+
+void wxTextCtrl::OnPaste(wxCommandEvent& event)
+{
+    Paste();
+}
+
+void wxTextCtrl::OnUndo(wxCommandEvent& event)
+{
+    Undo();
+}
+
+void wxTextCtrl::OnRedo(wxCommandEvent& event)
+{
+    Redo();
+}
+
+void wxTextCtrl::OnUpdateCut(wxUpdateUIEvent& event)
+{
+    event.Enable( CanCut() );
+}
+
+void wxTextCtrl::OnUpdateCopy(wxUpdateUIEvent& event)
+{
+    event.Enable( CanCopy() );
+}
+
+void wxTextCtrl::OnUpdatePaste(wxUpdateUIEvent& event)
+{
+    event.Enable( CanPaste() );
+}
+
+void wxTextCtrl::OnUpdateUndo(wxUpdateUIEvent& event)
+{
+    event.Enable( CanUndo() );
+}
+
+void wxTextCtrl::OnUpdateRedo(wxUpdateUIEvent& event)
+{
+    event.Enable( CanRedo() );
+}
+