Added dummy OnIdle to wxWindow in wxGTK; doc tweaks

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

diff --git a/src/msw/textctrl.cpp b/src/msw/textctrl.cpp
index 1bf29317922fe4f3f191e7c0a656ac81c66e275e..bfb35eaa50dd0757b10b00cc22ccd5c66ad60f9d 100644 (file)
--- a/src/msw/textctrl.cpp
+++ b/src/msw/textctrl.cpp
@@ -6,7 +6,7 @@
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart and Markus Holzem
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart and Markus Holzem

-// Licence:    wxWindows license
+// Licence:     wxWindows license

 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__


@@ -23,9 +23,12 @@
 #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
 
 #endif
 

-#if USE_CLIPBOARD
+#if wxUSE_CLIPBOARD

 #include "wx/app.h"
 #include "wx/clipbrd.h"
 #endif
 #include "wx/app.h"
 #include "wx/clipbrd.h"
 #endif


@@ -34,14 +37,23 @@
 
 #include <windows.h>
 #include <stdlib.h>
 
 #include <windows.h>
 #include <stdlib.h>

-#include "fstream.h"
+
+#if wxUSE_IOSTREAMH
+#   include <fstream.h>
+#else
+#   include <fstream>
+#endif

 
 #include <sys/types.h>
 
 #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


@@ -51,39 +63,38 @@
 
 #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
 IMPLEMENT_DYNAMIC_CLASS(wxTextCtrl, wxControl)
 
 BEGIN_EVENT_TABLE(wxTextCtrl, wxControl)
 #endif
 
 #if !USE_SHARED_LIBRARY
 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_CHAR(wxTextCtrl::OnChar)
+  EVT_DROP_FILES(wxTextCtrl::OnDropFiles)
+  EVT_ERASE_BACKGROUND(wxTextCtrl::OnEraseBackground)

 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
 {

-  fileName = "";
+#if wxUSE_RICHEDIT

   m_isRich = FALSE;
   m_isRich = FALSE;

+#endif

 }
 
 }
 

-bool wxTextCtrl::Create(wxWindow *parent, const wxWindowID id,
-                  const wxString& value,
-           const wxPoint& pos,
-           const wxSize& size, const long style,
-           const wxValidator& validator,
-           const wxString& name)
+bool wxTextCtrl::Create(wxWindow *parent, wxWindowID id,
+                        const wxString& value,
+                        const wxPoint& pos,
+                        const wxSize& size, long style,
+                        const wxValidator& validator,
+                        const wxString& name)

 {
 {

-  fileName = "";

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


@@ -95,35 +106,27 @@ bool wxTextCtrl::Create(wxWindow *parent, const wxWindowID id,
 
   SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_WINDOW));
 
 
   SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_WINDOW));
 

-  SetForegroundColour(parent->GetDefaultForegroundColour()) ;
+  SetForegroundColour(parent->GetForegroundColour()) ;

 
   if ( id == -1 )
 
   if ( id == -1 )

-       m_windowId = (int)NewControlId();
+    m_windowId = (int)NewControlId();

   else
   else

-       m_windowId = id;
+  m_windowId = id;

 
   int x = pos.x;
   int y = pos.y;
   int width = size.x;
   int height = size.y;
 
 
   int x = pos.x;
   int y = pos.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),
+                  "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 ;
 


@@ -135,136 +138,144 @@ bool wxTextCtrl::Create(wxWindow *parent, const 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 char *windowClass = "EDIT";
+
+#if wxUSE_RICHEDIT

   if ( m_windowStyle & wxTE_MULTILINE )
   if ( m_windowStyle & wxTE_MULTILINE )

-#else
-  if ( FALSE )
-#endif

   {
   {

-      msStyle |= ES_AUTOVSCROLL;
-         m_isRich = TRUE;
-         windowClass = "RichEdit" ;
+    msStyle |= ES_AUTOVSCROLL;
+    m_isRich = TRUE;
+    windowClass = "RichEdit" ;

   }
   else
   }
   else

-         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)
   {
     windowClass = "EDIT";
   if (m_windowStyle & wxSIMPLE_BORDER)
   {
     windowClass = "EDIT";

-       m_isRich = FALSE;
+    m_isRich = FALSE;

   }
 #endif
 
   // Even with extended styles, need to combine with WS_BORDER
   // for them to look right.
   }
 #endif
 
   // Even with extended styles, need to combine with WS_BORDER
   // for them to look right.

-  if (want3D || (m_windowStyle & wxSIMPLE_BORDER) || (m_windowStyle & wxRAISED_BORDER) ||
-       (m_windowStyle & wxSUNKEN_BORDER) || (m_windowStyle & wxDOUBLE_BORDER))
+  if ( want3D || wxStyleHasBorder(m_windowStyle) )

     msStyle |= WS_BORDER;
 
     msStyle |= WS_BORDER;
 

-  HWND edit = CreateWindowEx(exStyle, windowClass, NULL,
+  m_hWnd = (WXHWND)::CreateWindowEx(exStyle, windowClass, NULL,

                         msStyle,
                         0, 0, 0, 0, (HWND) ((wxWindow*)parent)->GetHWND(), (HMENU)m_windowId,
                         msStyle,
                         0, 0, 0, 0, (HWND) ((wxWindow*)parent)->GetHWND(), (HMENU)m_windowId,

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

 
 

-#if CTL3D
+  wxCHECK_MSG( m_hWnd, FALSE, "Failed to create text ctrl" );
+
+#if wxUSE_CTL3D

   if ( want3D )
   {
   if ( want3D )
   {

-    Ctl3dSubclassCtl(edit);
-       m_useCtl3D = TRUE;
+    Ctl3dSubclassCtl((HWND)m_hWnd);
+    m_useCtl3D = TRUE;

   }
 #endif
 
   }
 #endif
 

-  m_hWnd = (WXHWND)edit;
-
-#if defined(__WIN95__)
+#if wxUSE_RICHEDIT

   if (m_isRich)
   {
   if (m_isRich)
   {

-       // Have to enable events
-       ::SendMessage(edit, EM_SETEVENTMASK, 0, ENM_CHANGE | ENM_DROPFILES | ENM_SELCHANGE | ENM_UPDATE);
+    // Have to enable events
+    ::SendMessage((HWND)m_hWnd, EM_SETEVENTMASK, 0,
+                  ENM_CHANGE | ENM_DROPFILES | ENM_SELCHANGE | ENM_UPDATE);

   }
 #endif
 
   SubclassWin(GetHWND());
 
   }
 #endif
 
   SubclassWin(GetHWND());
 

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

   {
   {

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

   }
   else
   {
   }
   else
   {

-       SetFont(wxSystemSettings::GetSystemFont(wxSYS_SYSTEM_FONT));
+    SetFont(wxSystemSettings::GetSystemFont(wxSYS_SYSTEM_FONT));

   }
 
   SetSize(x, y, width, height);
 
   // Causes a crash for Symantec C++ and WIN32 for some reason
 #if !(defined(__SC__) && defined(__WIN32__))
   }
 
   SetSize(x, y, width, height);
 
   // Causes a crash for Symantec C++ and WIN32 for some reason
 #if !(defined(__SC__) && defined(__WIN32__))

-  if (value != "")
-    SetWindowText(edit, (const char *)value);
+  if ( !value.IsEmpty() )
+  {
+    SetValue(value);
+  }

 #endif
 
   return TRUE;
 }
 
 // Make sure the window style (etc.) reflects the HWND style (roughly)
 #endif
 
   return TRUE;
 }
 
 // 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();
-       long style = GetWindowLong((HWND) hWnd, GWL_STYLE);
+  HWND hWnd = (HWND) GetHWND();
+  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
+  char buf[256];

 
 #ifndef __WIN32__
 
 #ifndef __WIN32__

-       GetClassName((HWND) hWnd, buf, 256);
+  GetClassName((HWND) hWnd, buf, 256);

 #else
 #ifdef UNICODE
 #else
 #ifdef UNICODE

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

 #else
 #else

-       GetClassNameA((HWND) hWnd, buf, 256);
+  GetClassNameA((HWND) hWnd, buf, 256);

 #endif
 #endif
 #endif
 #endif

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

 
 

-       wxString str(buf);
-       str.UpperCase();
-
-       if (str == "EDIT")
-               m_isRich = FALSE;
-       else
-               m_isRich = TRUE;
-
-       if (style & ES_MULTILINE)
-               m_windowStyle |= wxTE_MULTILINE;
-       if (style & ES_PASSWORD)
-               m_windowStyle |= wxTE_PASSWORD;
-       if (style & ES_READONLY)
-               m_windowStyle |= wxTE_READONLY;
-       if (style & ES_WANTRETURN)
-               m_windowStyle |= wxTE_PROCESS_ENTER;
+  if (str == "EDIT")
+    m_isRich = FALSE;
+  else
+    m_isRich = TRUE;
+#endif
+
+  if (style & ES_MULTILINE)
+    m_windowStyle |= wxTE_MULTILINE;
+  if (style & ES_PASSWORD)
+    m_windowStyle |= wxTE_PASSWORD;
+  if (style & ES_READONLY)
+    m_windowStyle |= wxTE_READONLY;
+  if (style & ES_WANTRETURN)
+    m_windowStyle |= wxTE_PROCESS_ENTER;

 }
 
 }
 

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

 {
   SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_WINDOW));
 {
   SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_WINDOW));

-  SetForegroundColour(GetParent()->GetDefaultForegroundColour());
+  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;
 {
     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 str;

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


@@ -300,7 +311,7 @@ void wxTextCtrl::SetValue(const wxString& value)
     SetWindowText((HWND) GetHWND(), (const char *)value);
 }
 
     SetWindowText((HWND) GetHWND(), (const char *)value);
 }
 

-void wxTextCtrl::SetSize(const int x, const int y, const int width, const int height, const 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);


@@ -314,12 +325,14 @@ void wxTextCtrl::SetSize(const int x, const int y, const int width, const int he
   if (y == -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
     y1 = currentY;
 
   if (y == -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
     y1 = currentY;
 

+  AdjustForParentClientOrigin(x1, y1, 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());

 
 

-  float control_width, control_height, control_x, control_y;
+  int control_width, control_height, control_x, control_y;

 
   // If we're prepared to use the existing size, then...
   if (width == -1 && height == -1 && ((sizeFlags & wxSIZE_AUTO) != wxSIZE_AUTO))
 
   // If we're prepared to use the existing size, then...
   if (width == -1 && height == -1 && ((sizeFlags & wxSIZE_AUTO) != wxSIZE_AUTO))


@@ -331,61 +344,52 @@ void wxTextCtrl::SetSize(const int x, const int y, const int width, const int he
   if (w1<=0)
     w1 = DEFAULT_ITEM_WIDTH;
 
   if (w1<=0)
     w1 = DEFAULT_ITEM_WIDTH;
 

-  control_x = (float)x1;
-  control_y = (float)y1;
-  control_width = (float)w1;
-  control_height = (float)h1;
+  control_x = x1;
+  control_y = y1;
+  control_width = w1;
+  control_height = h1;

 
   // Calculations may have made text size too small
   if (control_height <= 0)
 
   // Calculations may have made text size too small
   if (control_height <= 0)

-    control_height = (float)(int)(cy*EDIT_CONTROL_FACTOR) ;
+    control_height = EDIT_HEIGHT_FROM_CHAR_HEIGHT(cy);

 
   if (control_width <= 0)
 
   if (control_width <= 0)

-    control_width = (float)DEFAULT_ITEM_WIDTH;
+    control_width = DEFAULT_ITEM_WIDTH;

 
   MoveWindow((HWND) GetHWND(), (int)control_x, (int)control_y,
                               (int)control_width, (int)control_height, TRUE);
 
   MoveWindow((HWND) GetHWND(), (int)control_x, (int)control_y,
                               (int)control_width, (int)control_height, TRUE);

-/*
-#if WXWIN_COMPATIBILITY
-  GetEventHandler()->OldOnSize(width, height);
-#else
-  wxSizeEvent event(wxSize(width, height), m_windowId);
-  event.eventObject = this;
-  GetEventHandler()->ProcessEvent(event);
-#endif
-*/

 }
 
 // Clipboard operations
 }
 
 // Clipboard operations

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

 {
   HWND hWnd = (HWND) GetHWND();
   SendMessage(hWnd, WM_COPY, 0, 0L);
 }
 
 {
   HWND 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);
 }
 
 {
   HWND 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);
 }
 
 {
   HWND hWnd = (HWND) GetHWND();
   SendMessage(hWnd, WM_PASTE, 0, 0L);
 }
 

-void wxTextCtrl::SetEditable(const bool editable)
+void wxTextCtrl::SetEditable(bool editable)

 {
   HWND hWnd = (HWND) GetHWND();
   SendMessage(hWnd, EM_SETREADONLY, (WPARAM)!editable, (LPARAM)0L);
 }
 
 {
   HWND hWnd = (HWND) GetHWND();
   SendMessage(hWnd, EM_SETREADONLY, (WPARAM)!editable, (LPARAM)0L);
 }
 

-void wxTextCtrl::SetInsertionPoint(const long pos)
+void wxTextCtrl::SetInsertionPoint(long pos)

 {
   HWND hWnd = (HWND) GetHWND();
 #ifdef __WIN32__
 {
   HWND hWnd = (HWND) GetHWND();
 #ifdef __WIN32__

-#if defined(__WIN95__)
+#if wxUSE_RICHEDIT

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


@@ -407,15 +411,15 @@ void wxTextCtrl::SetInsertionPoint(const 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;
   if (m_isRich)
   {
     CHARRANGE range;


@@ -430,7 +434,7 @@ long wxTextCtrl::GetInsertionPoint(void) const
   return Pos&0xFFFF;
 }
 
   return Pos&0xFFFF;
 }
 

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

 {
     HWND hWnd = (HWND) GetHWND();
 
 {
     HWND hWnd = (HWND) GetHWND();
 


@@ -447,8 +451,9 @@ long wxTextCtrl::GetLastPosition(void) const
     return (long)(charIndex + lineLength);
 }
 
     return (long)(charIndex + lineLength);
 }
 

-void wxTextCtrl::Replace(const long from, const long to, const wxString& value)
+void wxTextCtrl::Replace(long from, long to, const wxString& value)

 {
 {

+#if wxUSE_CLIPBOARD

     HWND hWnd = (HWND) GetHWND();
     long fromChar = from;
     long toChar = to;
     HWND hWnd = (HWND) GetHWND();
     long fromChar = from;
     long toChar = to;


@@ -462,13 +467,16 @@ void wxTextCtrl::Replace(const long from, const 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(wxCF_TEXT, (wxObject *) (const char *)value, 0, 0);
+    wxSetClipboardData(wxDF_TEXT, (wxObject *) (const char *)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(const long from, const long to)
+void wxTextCtrl::Remove(long from, long to)

 {
     HWND hWnd = (HWND) GetHWND();
     long fromChar = from;
 {
     HWND hWnd = (HWND) GetHWND();
     long fromChar = from;


@@ -483,7 +491,7 @@ void wxTextCtrl::Remove(const long from, const long to)
     SendMessage(hWnd, WM_CUT, (WPARAM)0, (LPARAM)0);
 }
 
     SendMessage(hWnd, WM_CUT, (WPARAM)0, (LPARAM)0);
 }
 

-void wxTextCtrl::SetSelection(const long from, const long to)
+void wxTextCtrl::SetSelection(long from, long to)

 {
     HWND hWnd = (HWND) GetHWND();
     long fromChar = from;
 {
     HWND hWnd = (HWND) GetHWND();
     long fromChar = from;


@@ -508,14 +516,15 @@ void wxTextCtrl::SetSelection(const long from, const long to)
 
 bool wxTextCtrl::LoadFile(const wxString& file)
 {
 
 bool wxTextCtrl::LoadFile(const wxString& file)
 {

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

     return FALSE;
 
     return FALSE;
 

-  fileName = file;
+  m_fileName = file;

 
   Clear();
 
 
   Clear();
 

-  ifstream input(WXSTRINGCAST file, ios::nocreate | ios::in);
+//  ifstream input(WXSTRINGCAST file, ios::nocreate | ios::in);
+  ifstream input(WXSTRINGCAST file, ios::in);

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


@@ -525,9 +534,16 @@ 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((char*) (const char*) file, &stat_buf) < 0)
+        return FALSE;
+#else

       struct stat stat_buf;
       if (stat(file, &stat_buf) < 0)
         return FALSE;
       struct stat stat_buf;
       if (stat(file, &stat_buf) < 0)
         return FALSE;

+#endif
+

 //      char *tmp_buffer = (char*)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.
 //      char *tmp_buffer = (char*)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.


@@ -537,13 +553,13 @@ bool wxTextCtrl::LoadFile(const wxString& file)
       while (!input.eof() && input.peek() != EOF)
       {
         input.getline(wxBuffer, 500);
       while (!input.eof() && input.peek() != EOF)
       {
         input.getline(wxBuffer, 500);

-       int len = strlen(wxBuffer);
-       wxBuffer[len] = 13;
-       wxBuffer[len+1] = 10;
-       wxBuffer[len+2] = 0;
-       strcpy(tmp_buffer+pos, wxBuffer);
-       pos += strlen(wxBuffer);
-       no_lines++;
+  int len = strlen(wxBuffer);
+  wxBuffer[len] = 13;
+  wxBuffer[len+1] = 10;
+  wxBuffer[len+2] = 0;
+  strcpy(tmp_buffer+pos, wxBuffer);
+  pos += strlen(wxBuffer);
+  no_lines++;

       }
 
 //      SendMessage((HWND) GetHWND(), WM_SETTEXT, 0, (LPARAM)tmp_buffer);
       }
 
 //      SendMessage((HWND) GetHWND(), WM_SETTEXT, 0, (LPARAM)tmp_buffer);


@@ -560,16 +576,19 @@ 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;
-  if (file == "")
-    theFile = fileName;
-  if (file == "")
-    return FALSE;
-  fileName = theFile;
+    wxString theFile(file);
+
+    if (theFile == "")
+        theFile = m_fileName;
+
+    if (theFile == "")
+        return FALSE;

 
 

-  ofstream output(WXSTRINGCAST file);
-  if (output.bad())
-       return FALSE;
+    m_fileName = theFile;
+
+    ofstream output((char*) (const char*) theFile);
+    if (output.bad())
+        return FALSE;

 
     // This will only save 64K max
     unsigned long nbytes = SendMessage((HWND) GetHWND(), WM_GETTEXTLENGTH, 0, 0);
 
     // This will only save 64K max
     unsigned long nbytes = SendMessage((HWND) GetHWND(), WM_GETTEXTLENGTH, 0, 0);


@@ -577,13 +596,13 @@ bool wxTextCtrl::SaveFile(const wxString& file)
     SendMessage((HWND) GetHWND(), WM_GETTEXT, (WPARAM)(nbytes+1), (LPARAM)tmp_buffer);
     char *pstr = tmp_buffer;
 
     SendMessage((HWND) GetHWND(), WM_GETTEXT, (WPARAM)(nbytes+1), (LPARAM)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);
     SendMessage((HWND) GetHWND(), EM_SETMODIFY, FALSE, 0L);
 
     farfree(tmp_buffer);
     SendMessage((HWND) GetHWND(), EM_SETMODIFY, FALSE, 0L);


@@ -614,19 +633,24 @@ void wxTextCtrl::WriteText(const wxString& text)
     delete[] newtext;
 }
 
     delete[] newtext;
 }
 

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

 {
 {

-//    SendMessage((HWND) GetHWND(), WM_SETTEXT, 0, (LPARAM)"");

     SetWindowText((HWND) GetHWND(), "");
 }
 
     SetWindowText((HWND) GetHWND(), "");
 }
 

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

 {
     return (SendMessage((HWND) GetHWND(), EM_GETMODIFY, 0, 0) != 0);
 }
 
 // Makes 'unmodified'
 {
     return (SendMessage((HWND) GetHWND(), EM_GETMODIFY, 0, 0) != 0);
 }
 
 // Makes 'unmodified'

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

 {
   SendMessage((HWND) GetHWND(), EM_SETMODIFY, FALSE, 0L);
 }
 {
   SendMessage((HWND) GetHWND(), EM_SETMODIFY, FALSE, 0L);
 }


@@ -636,12 +660,12 @@ void wxTextCtrl::DiscardEdits(void)
  *
  */
  
  *
  */
  

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

 {
     return (int)SendMessage((HWND) GetHWND(), EM_GETLINECOUNT, (WPARAM)0, (LPARAM)0);
 }
 
 {
     return (int)SendMessage((HWND) GetHWND(), EM_GETLINECOUNT, (WPARAM)0, (LPARAM)0);
 }
 

-long wxTextCtrl::XYToPosition(const long x, const long y) const
+long wxTextCtrl::XYToPosition(long x, long y) const

 {
     HWND hWnd = (HWND) GetHWND();
 
 {
     HWND hWnd = (HWND) GetHWND();
 


@@ -650,7 +674,7 @@ long wxTextCtrl::XYToPosition(const long x, const long y) const
     return (long)(x + charIndex);
 }
 
     return (long)(x + charIndex);
 }
 

-void wxTextCtrl::PositionToXY(const long pos, long *x, long *y) const
+void wxTextCtrl::PositionToXY(long pos, long *x, long *y) const

 {
     HWND hWnd = (HWND) GetHWND();
 
 {
     HWND hWnd = (HWND) GetHWND();
 


@@ -663,7 +687,7 @@ void wxTextCtrl::PositionToXY(const long pos, long *x, long *y) const
     *y = (long)lineNo;
 }
 
     *y = (long)lineNo;
 }
 

-void wxTextCtrl::ShowPosition(const long pos)
+void wxTextCtrl::ShowPosition(long pos)

 {
     HWND hWnd = (HWND) GetHWND();
 
 {
     HWND hWnd = (HWND) GetHWND();
 


@@ -684,16 +708,11 @@ void wxTextCtrl::ShowPosition(const long pos)
     
     int linesToScroll = specifiedLineLineNo - currentLineLineNo;
 
     
     int linesToScroll = specifiedLineLineNo - currentLineLineNo;
 

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

     if (linesToScroll != 0)
       (void)SendMessage(hWnd, EM_LINESCROLL, (WPARAM)0, (LPARAM)MAKELPARAM(linesToScroll, 0));
 }
 
     if (linesToScroll != 0)
       (void)SendMessage(hWnd, EM_LINESCROLL, (WPARAM)0, (LPARAM)MAKELPARAM(linesToScroll, 0));
 }
 

-int wxTextCtrl::GetLineLength(const long lineNo) const
+int wxTextCtrl::GetLineLength(long lineNo) const

 {
     long charIndex = XYToPosition(0, lineNo);
     HWND hWnd = (HWND) GetHWND();
 {
     long charIndex = XYToPosition(0, lineNo);
     HWND hWnd = (HWND) GetHWND();


@@ -701,13 +720,13 @@ int wxTextCtrl::GetLineLength(const long lineNo) const
     return len;
 }
 
     return len;
 }
 

-wxString wxTextCtrl::GetLineText(const long lineNo) const
+wxString wxTextCtrl::GetLineText(long lineNo) const

 {
     HWND hWnd = (HWND) GetHWND();
     *(WORD *)wxBuffer = 512;
     int noChars = (int)SendMessage(hWnd, EM_GETLINE, (WPARAM)lineNo, (LPARAM)wxBuffer);
     wxBuffer[noChars] = 0;
 {
     HWND hWnd = (HWND) GetHWND();
     *(WORD *)wxBuffer = 512;
     int noChars = (int)SendMessage(hWnd, EM_GETLINE, (WPARAM)lineNo, (LPARAM)wxBuffer);
     wxBuffer[noChars] = 0;

-       return wxString(wxBuffer);
+  return wxString(wxBuffer);

 }
 
 /*
 }
 
 /*


@@ -737,16 +756,20 @@ void wxTextCtrl::OnDropFiles(wxDropFilesEvent& event)
 // 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)
 {
   // Make sure there is a holding area
 #ifndef NO_TEXT_WINDOW_STREAM
 int wxTextCtrl::overflow(int c)
 {
   // Make sure there is a holding area

+  // this is not needed in <iostream> usage as it automagically allocates
+  // it, but does someone want to emulate it for safety's sake?
+#if wxUSE_IOSTREAMH

   if ( allocate()==EOF )
   {
   if ( allocate()==EOF )
   {

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

     return EOF;
   }
     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() )


@@ -763,7 +786,12 @@ int wxTextCtrl::overflow(int c)
   {
 /* This doesn't seem to be fatal so comment out error message */
 //    wxError("Put area not opened","Internal error");
   {
 /* This doesn't seem to be fatal so comment out error message */
 //    wxError("Put area not opened","Internal error");

-    setp( base(), base() );
+
+#if wxUSE_IOSTREAMH
+         setp( base(), base() );
+#else
+         setp( pbase(), pbase() );
+#endif

   }
 
   // Determine how many characters have been inserted but no consumed
   }
 
   // Determine how many characters have been inserted but no consumed


@@ -784,7 +812,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;
   }
 


@@ -814,7 +842,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() )


@@ -841,7 +869,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;
 }


@@ -849,57 +877,56 @@ 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<<(const float f)
+wxTextCtrl& wxTextCtrl::operator<<(float f)

 {
 {

-  static char buf[100];
-  sprintf(buf, "%.2f", f);
-  WriteText(buf);
-  return *this;
+    wxString str;
+    str.Printf("%.2f", f);
+    AppendText(str);
+    return *this;

 }
 
 }
 

-wxTextCtrl& wxTextCtrl::operator<<(const double d)
+wxTextCtrl& wxTextCtrl::operator<<(double d)

 {
 {

-  static char buf[100];
-  sprintf(buf, "%.2f", d);
-  WriteText(buf);
-  return *this;
+    wxString str;
+    str.Printf("%.2f", d);
+    AppendText(str);
+    return *this;

 }
 
 }
 

-wxTextCtrl& wxTextCtrl::operator<<(const int i)
+wxTextCtrl& wxTextCtrl::operator<<(int i)

 {
 {

-  static char buf[100];
-  sprintf(buf, "%i", i);
-  WriteText(buf);
-  return *this;
+    wxString str;
+    str.Printf("%d", i);
+    AppendText(str);
+    return *this;

 }
 
 }
 

-wxTextCtrl& wxTextCtrl::operator<<(const long i)
+wxTextCtrl& wxTextCtrl::operator<<(long i)

 {
 {

-  static char buf[100];
-  sprintf(buf, "%ld", i);
-  WriteText(buf);
-  return *this;
+    wxString str;
+    str.Printf("%ld", i);
+    AppendText(str);
+    return *this;

 }
 
 wxTextCtrl& wxTextCtrl::operator<<(const char c)
 {
 }
 
 wxTextCtrl& wxTextCtrl::operator<<(const char c)
 {

-  char buf[2];
+    char buf[2];

 
 

-  buf[0] = c;
-  buf[1] = 0;
-  WriteText(buf);
-  return *this;
+    buf[0] = c;
+    buf[1] = 0;
+    AppendText(buf);
+    return *this;

 }
 
 }
 

-
-WXHBRUSH wxTextCtrl::OnCtlColor(const WXHDC pDC, const WXHWND pWnd, const WXUINT nCtlColor,
-                       WXUINT message, WXWPARAM wParam, WXLPARAM lParam)
+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);


@@ -926,48 +953,85 @@ WXHBRUSH wxTextCtrl::OnCtlColor(const WXHDC pDC, const WXHWND pWnd, const WXUINT
 
 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) )
-                       event.Skip();
-       }
-       else
-               event.Skip();
-}
-
-long wxTextCtrl::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
-{
-    switch (nMsg)
+    switch( event.KeyCode() )

     {
     {

-/*
-      case WM_GETDLGCODE:
-      {
-        if (GetWindowStyleFlag() & wxPROCESS_ENTER)
-          return DLGC_WANTALLKEYS;
-        break;
-      }
-*/
-/*
-      case WM_CHAR: // Always an ASCII character
-      {
-        if (wParam == VK_RETURN)
+        // Fix by Marcel Rasche to allow Alt-Ctrl insertion of special characters
+        case '{':
+        case '}':
+        case '[':
+        case ']':
+        case '|':
+        case '~':
+        case '\\':
+            {
+                char c = (char)event.KeyCode();
+                WriteText(c);
+            }
+            break;
+
+        case WXK_RETURN:

         {
         {

-          wxCommandEvent event(wxEVENT_TYPE_TEXT_ENTER_COMMAND);
-          event.commandString = ((wxTextCtrl *)item)->GetValue();
-          event.eventObject = item;
-          item->ProcessCommand(event);
-          return FALSE;
-        }
-        break;
-      }
+/* Oh yes it will, because we also specify DLGC_WANTCHARS
+            wxASSERT_MSG( m_windowStyle & wxTE_PROCESS_ENTER,
+                          "this text ctrl should never receive return" );

 */
 */

-    default:
-        break;
+
+            if ( (m_windowStyle & wxTE_MULTILINE) == 0 )
+            {
+                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;

     }
     }

+    
+    // 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
+    Default();
+//    event.Skip();
+}

 
 

-  return wxWindow::MSWWindowProc(nMsg, wParam, lParam);
+long wxTextCtrl::MSWGetDlgCode()
+{
+    // 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)
 }
 
 void wxTextCtrl::OnEraseBackground(wxEraseEvent& event)


@@ -991,7 +1055,7 @@ void wxTextCtrl::OnEraseBackground(wxEraseEvent& event)
 //        wxWindow::OnEraseBackground(event);
 }
 
 //        wxWindow::OnEraseBackground(event);
 }
 

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

 {
 /*
   // Debugging
 {
 /*
   // Debugging


@@ -1027,70 +1091,68 @@ bool wxTextCtrl::MSWCommand(const WXUINT param, const WXWORD WXUNUSED(id))
       break;
   }
 */
       break;
   }
 */

-  WXTYPE eventTyp = 0;

   switch (param)
   {
     case EN_SETFOCUS:
   switch (param)
   {
     case EN_SETFOCUS:

-      eventTyp = wxEVENT_TYPE_SET_FOCUS;
-      break;

     case EN_KILLFOCUS:
     case EN_KILLFOCUS:

-      eventTyp = wxEVENT_TYPE_KILL_FOCUS;
+      {
+        wxFocusEvent event(param == EN_KILLFOCUS ? wxEVT_KILL_FOCUS
+                                                 : wxEVT_SET_FOCUS,
+                           m_windowId);
+        event.SetEventObject( this );
+        GetEventHandler()->ProcessEvent(event);
+      }

       break;
       break;

-    case EN_UPDATE:
-         break;
+

     case EN_CHANGE:
     case EN_CHANGE:

-      eventTyp = wxEVENT_TYPE_TEXT_COMMAND;
+      {
+        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;
       break;

+
+    // the other notification messages are not processed
+    case EN_UPDATE:

     case EN_ERRSPACE:
     case EN_ERRSPACE:

-      break;

     case EN_MAXTEXT:
     case EN_MAXTEXT:

-      break;

     case EN_HSCROLL:
     case EN_HSCROLL:

-       break;

     case EN_VSCROLL:
     case EN_VSCROLL:

-      break;

     default:
     default:

-      break;
+      return FALSE;

   }
   }

-  if (eventTyp != 0)
-  {
-    wxCommandEvent event(eventTyp, m_windowId);
-       wxString val(GetValue());
-       if ( !val.IsNull() )
-      event.m_commandString = WXSTRINGCAST val;
-    event.SetEventObject( this );
-    ProcessCommand(event);

 
 

-    return TRUE;
-  }
-  else
-    return FALSE;
+  // processed
+  return TRUE;

 }
 
 
 // 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(const WXWPARAM wParam, const WXLPARAM lParam)
+#if wxUSE_RICHEDIT
+bool wxTextCtrl::MSWNotify(WXWPARAM wParam, WXLPARAM lParam)

 {
 {

-       wxCommandEvent event(0, m_windowId);
-       int eventType = 0;
-       NMHDR *hdr1 = (NMHDR *) lParam;
-       switch ( hdr1->code )
-       {
-               // Insert case code here
-               default :
-                       return wxControl::MSWNotify(wParam, lParam);
-                       break;
-       }
-
-       event.SetEventObject( this );
-       event.SetEventType(eventType);
-
-       if ( !ProcessEvent(event) )
-               return FALSE;
-
-       return TRUE;
+  wxCommandEvent event(0, m_windowId);
+  int eventType = 0;
+  NMHDR *hdr1 = (NMHDR *) lParam;
+  switch ( hdr1->code )
+  {
+    // Insert case code here
+    default :
+      return wxControl::MSWNotify(wParam, lParam);
+      break;
+  }
+
+  event.SetEventObject( this );
+  event.SetEventType(eventType);
+
+  if ( !GetEventHandler()->ProcessEvent(event) )
+    return FALSE;
+
+    return TRUE;

 }
 #endif
 #endif
 }
 #endif
 #endif