Changed a few true -> TRUE

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

diff --git a/src/motif/textctrl.cpp b/src/motif/textctrl.cpp
index ba5066934a1cd270f076e048b638e905fb664619..9668a888a848b800b03c8ea20c74bfd714609319 100644 (file)
--- a/src/motif/textctrl.cpp
+++ b/src/motif/textctrl.cpp
@@ -6,93 +6,119 @@
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+

 #ifdef __GNUG__
 #ifdef __GNUG__

-#pragma implementation "textctrl.h"
+    #pragma implementation "textctrl.h"

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

+#include <ctype.h>

 
 #include "wx/textctrl.h"
 #include "wx/settings.h"
 #include "wx/filefn.h"
 #include "wx/utils.h"
 
 
 #include "wx/textctrl.h"
 #include "wx/settings.h"
 #include "wx/filefn.h"
 #include "wx/utils.h"
 

-#if defined(__BORLANDC__) && !defined(__WIN32__)
-#include <alloc.h>
-#else
-#ifndef __GNUWIN32__
-#include <malloc.h>
-#endif
-#endif
-

 #include <Xm/Text.h>
 #include <Xm/Text.h>

-#include <sys/types.h>
-#include <sys/stat.h>
-#include <ctype.h>

 
 #include "wx/motif/private.h"
 
 
 #include "wx/motif/private.h"
 

-static void 
-wxTextWindowChangedProc (Widget w, XtPointer clientData, XtPointer ptr);
-static void 
-wxTextWindowModifyProc (Widget w, XtPointer clientData, XmTextVerifyCallbackStruct *cbs);
-static void 
-wxTextWindowGainFocusProc (Widget w, XtPointer clientData, XmAnyCallbackStruct *cbs);
-static void 
-wxTextWindowLoseFocusProc (Widget w, XtPointer clientData, XmAnyCallbackStruct *cbs);
-static void wxTextWindowActivateProc(Widget w, XtPointer clientData,
-                      XmAnyCallbackStruct *ptr);
+// ----------------------------------------------------------------------------
+// private functions
+// ----------------------------------------------------------------------------
+
+// helper: inserts the new text in the value of the text ctrl and returns the
+// result in place
+static void MergeChangesIntoString(wxString& value,
+                                   XmTextVerifyCallbackStruct *textStruct);
+
+// callbacks
+static void wxTextWindowChangedProc(Widget w, XtPointer clientData, XtPointer ptr);
+static void wxTextWindowModifyProc(Widget w, XtPointer clientData, XmTextVerifyCallbackStruct *cbs);
+static void wxTextWindowGainFocusProc(Widget w, XtPointer clientData, XmAnyCallbackStruct *cbs);
+static void wxTextWindowLoseFocusProc(Widget w, XtPointer clientData, XmAnyCallbackStruct *cbs);
+static void wxTextWindowActivateProc(Widget w, XtPointer clientData, XmAnyCallbackStruct *ptr);

 
 #if !USE_SHARED_LIBRARY
 
 #if !USE_SHARED_LIBRARY

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

 
 

-BEGIN_EVENT_TABLE(wxTextCtrl, wxControl)
-       EVT_DROP_FILES(wxTextCtrl::OnDropFiles)
-       EVT_CHAR(wxTextCtrl::OnChar)
-END_EVENT_TABLE()
+    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()

 #endif
 
 #endif
 

+// ============================================================================
+// implementation
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// wxTextCtrl
+// ----------------------------------------------------------------------------
+

 // Text item
 wxTextCtrl::wxTextCtrl()
 #ifndef NO_TEXT_WINDOW_STREAM
 // Text item
 wxTextCtrl::wxTextCtrl()
 #ifndef NO_TEXT_WINDOW_STREAM

- :streambuf()
+          : streambuf()

 #endif
 {
 #endif
 {

-    m_fileName = "";

     m_tempCallbackStruct = (void*) NULL;
     m_modified = FALSE;
     m_processedDefault = FALSE;
 }
 
     m_tempCallbackStruct = (void*) NULL;
     m_modified = FALSE;
     m_processedDefault = FALSE;
 }
 

-bool wxTextCtrl::Create(wxWindow *parent, wxWindowID id,
-                  const wxString& value,
-           const wxPoint& pos,
-           const wxSize& size, 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)

 {
     m_tempCallbackStruct = (void*) NULL;
     m_modified = FALSE;
     m_processedDefault = FALSE;
 {
     m_tempCallbackStruct = (void*) NULL;
     m_modified = FALSE;
     m_processedDefault = FALSE;

-    m_fileName = "";
-    m_backgroundColour = parent->GetBackgroundColour();
+    //    m_backgroundColour = parent->GetBackgroundColour();
+    m_backgroundColour = * wxWHITE;

     m_foregroundColour = parent->GetForegroundColour();
 
     SetName(name);
     SetValidator(validator);
     m_foregroundColour = parent->GetForegroundColour();
 
     SetName(name);
     SetValidator(validator);

-    if (parent) parent->AddChild(this);
+    if (parent)
+        parent->AddChild(this);

 
     m_windowStyle = style;
 
     if ( id == -1 )
 
     m_windowStyle = style;
 
     if ( id == -1 )

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

     else
     else

-           m_windowId = id;
+        m_windowId = id;

 
     Widget parentWidget = (Widget) parent->GetClientWidget();
 
 
     Widget parentWidget = (Widget) parent->GetClientWidget();
 


@@ -107,32 +133,47 @@ bool wxTextCtrl::Create(wxWindow *parent, wxWindowID id,
         XtSetArg (args[0], XmNscrollHorizontal, wantHorizScrolling ? True : False);
         XtSetArg (args[1], XmNwordWrap, wantWordWrap ? True : False);
 
         XtSetArg (args[0], XmNscrollHorizontal, wantHorizScrolling ? True : False);
         XtSetArg (args[1], XmNwordWrap, wantWordWrap ? True : False);
 

-        m_mainWidget = (WXWidget) XmCreateScrolledText (parentWidget, (char*) (const char*) name, args, 2);
+        m_mainWidget = (WXWidget) XmCreateScrolledText(parentWidget,
+                                                       (char*)name.c_str(),
+                                                       args, 2);

 
         XtVaSetValues ((Widget) m_mainWidget,
 
         XtVaSetValues ((Widget) m_mainWidget,

-                XmNeditable, ((style & wxTE_READONLY) ? False : True),
-                XmNeditMode, XmMULTI_LINE_EDIT,
-                NULL);
+                        XmNeditable, ((style & wxTE_READONLY) ? False : True),
+                        XmNeditMode, XmMULTI_LINE_EDIT,
+                        NULL);

         XtManageChild ((Widget) m_mainWidget);
     }
     else
     {
         XtManageChild ((Widget) m_mainWidget);
     }
     else
     {

-        m_mainWidget = (WXWidget) XtVaCreateManagedWidget ((char*) (const char*) name,
-                 xmTextWidgetClass, parentWidget,
-                NULL);
+        m_mainWidget = (WXWidget)XtVaCreateManagedWidget
+                                 (
+                                  (char*)name.c_str(),
+                                  xmTextWidgetClass,
+                                  parentWidget,
+                                  NULL
+                                 );

 
         // TODO: Is this relevant? What does it do?
         int noCols = 2;
         if (!value.IsNull() && (value.Length() > (unsigned int) noCols))
             noCols = value.Length();
 
         // TODO: Is this relevant? What does it do?
         int noCols = 2;
         if (!value.IsNull() && (value.Length() > (unsigned int) noCols))
             noCols = value.Length();

-        XtVaSetValues ((Widget) m_mainWidget,
-                XmNcolumns, noCols,
-                NULL);
+        XtVaSetValues((Widget) m_mainWidget,
+                      XmNcolumns, noCols,
+                      NULL);
+    }
+
+    // remove border if asked for
+    if ( style & wxNO_BORDER )
+    {
+        XtVaSetValues((Widget)m_mainWidget,
+                      XmNshadowThickness, 0,
+                      NULL);

     }
 
     }
 

-    if (!value.IsNull())
-        XmTextSetString ((Widget) m_mainWidget, (char*) (const char*) value);
+    if ( !!value )
+        XmTextSetString ((Widget) m_mainWidget, (char*)value.c_str());

 
 

+    // install callbacks

     XtAddCallback((Widget) m_mainWidget, XmNvalueChangedCallback, (XtCallbackProc)wxTextWindowChangedProc, (XtPointer)this);
 
     XtAddCallback((Widget) m_mainWidget, XmNmodifyVerifyCallback, (XtCallbackProc)wxTextWindowModifyProc, (XtPointer)this);
     XtAddCallback((Widget) m_mainWidget, XmNvalueChangedCallback, (XtCallbackProc)wxTextWindowChangedProc, (XtPointer)this);
 
     XtAddCallback((Widget) m_mainWidget, XmNmodifyVerifyCallback, (XtCallbackProc)wxTextWindowModifyProc, (XtPointer)this);


@@ -143,7 +184,8 @@ bool wxTextCtrl::Create(wxWindow *parent, wxWindowID id,
 
     XtAddCallback((Widget) m_mainWidget, XmNlosingFocusCallback, (XtCallbackProc)wxTextWindowLoseFocusProc, (XtPointer)this);
 
 
     XtAddCallback((Widget) m_mainWidget, XmNlosingFocusCallback, (XtCallbackProc)wxTextWindowLoseFocusProc, (XtPointer)this);
 

-    m_windowFont = parent->GetFont();
+    // font
+    m_font = parent->GetFont();

     ChangeFont(FALSE);
 
     SetCanAddEventHandler(TRUE);
     ChangeFont(FALSE);
 
     SetCanAddEventHandler(TRUE);


@@ -161,30 +203,41 @@ WXWidget wxTextCtrl::GetTopWidget() const
 
 wxString wxTextCtrl::GetValue() const
 {
 
 wxString wxTextCtrl::GetValue() const
 {

+    wxString str; // result
+

     if (m_windowStyle & wxTE_PASSWORD)
     if (m_windowStyle & wxTE_PASSWORD)

-        return m_value;
+    {
+        // the value is stored always in m_value because it can't be retrieved
+        // from the text control
+        str = m_value;
+    }

     else
     {
     else
     {

+        // just get the string from Motif

         char *s = XmTextGetString ((Widget) m_mainWidget);
         char *s = XmTextGetString ((Widget) m_mainWidget);

-        if (s)
+        if ( s )

         {
         {

-           wxString str(s);
+            str = s;

             XtFree (s);
             XtFree (s);

-           return str;
-       }
-       else
+        }
+        //else: return empty string
+
+        if ( m_tempCallbackStruct )

         {
         {

-            return wxEmptyString;
+            // the string in the control isn't yet updated, can't use it as is
+            MergeChangesIntoString(str, (XmTextVerifyCallbackStruct *)
+                                   m_tempCallbackStruct);

         }
     }
         }
     }

+
+    return str;

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

-    wxASSERT_MSG( (!value.IsNull()), "Must not pass a null string to wxTextCtrl::SetValue." ) ;

     m_inSetValue = TRUE;
 
     m_inSetValue = TRUE;
 

-    XmTextSetString ((Widget) m_mainWidget, (char*) (const char*) value);
+    XmTextSetString ((Widget) m_mainWidget, (char*)value.c_str());

 
     m_inSetValue = FALSE;
 }
 
     m_inSetValue = FALSE;
 }


@@ -205,6 +258,67 @@ void wxTextCtrl::Paste()
     XmTextPaste((Widget) m_mainWidget);
 }
 
     XmTextPaste((Widget) m_mainWidget);
 }
 

+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
+{
+    return IsEditable() ;
+}
+
+// Undo/redo
+void wxTextCtrl::Undo()
+{
+    // Not possible in Motif
+}
+
+void wxTextCtrl::Redo()
+{
+    // Not possible in Motif
+}
+
+bool wxTextCtrl::CanUndo() const
+{
+    // No Undo in Motif
+    return FALSE;
+}
+
+bool wxTextCtrl::CanRedo() const
+{
+    // No Redo in Motif
+    return FALSE;
+}
+
+// If the return values from and to are the same, there is no
+// selection.
+void wxTextCtrl::GetSelection(long* from, long* to) const
+{
+    XmTextPosition left, right;
+
+    XmTextGetSelectionPosition((Widget) m_mainWidget, & left, & right);
+
+    *from = (long) left;
+    *to = (long) right;
+}
+
+bool wxTextCtrl::IsEditable() const
+{
+    return (XmTextGetEditable((Widget) m_mainWidget) != 0);
+}
+

 void wxTextCtrl::SetEditable(bool editable)
 {
     XmTextSetEditable((Widget) m_mainWidget, (Boolean) editable);
 void wxTextCtrl::SetEditable(bool editable)
 {
     XmTextSetEditable((Widget) m_mainWidget, (Boolean) editable);


@@ -234,20 +348,20 @@ long wxTextCtrl::GetLastPosition() const
 void wxTextCtrl::Replace(long from, long to, const wxString& value)
 {
     XmTextReplace ((Widget) m_mainWidget, (XmTextPosition) from, (XmTextPosition) to,
 void wxTextCtrl::Replace(long from, long to, const wxString& value)
 {
     XmTextReplace ((Widget) m_mainWidget, (XmTextPosition) from, (XmTextPosition) to,

-                (char*) (const char*) value);
+        (char*) (const char*) value);

 }
 
 void wxTextCtrl::Remove(long from, long to)
 {
     XmTextSetSelection ((Widget) m_mainWidget, (XmTextPosition) from, (XmTextPosition) to,
 }
 
 void wxTextCtrl::Remove(long from, long to)
 {
     XmTextSetSelection ((Widget) m_mainWidget, (XmTextPosition) from, (XmTextPosition) to,

-                     (Time) 0);
+                      (Time) 0);

     XmTextRemove ((Widget) m_mainWidget);
 }
 
 void wxTextCtrl::SetSelection(long from, long to)
 {
     XmTextSetSelection ((Widget) m_mainWidget, (XmTextPosition) from, (XmTextPosition) to,
     XmTextRemove ((Widget) m_mainWidget);
 }
 
 void wxTextCtrl::SetSelection(long from, long to)
 {
     XmTextSetSelection ((Widget) m_mainWidget, (XmTextPosition) from, (XmTextPosition) to,

-                     (Time) 0);
+                      (Time) 0);

 }
 
 bool wxTextCtrl::LoadFile(const wxString& file)
 }
 
 bool wxTextCtrl::LoadFile(const wxString& file)


@@ -264,30 +378,30 @@ bool wxTextCtrl::LoadFile(const wxString& file)
 
     struct stat statb;
     if ((stat ((char*) (const char*) file, &statb) == -1) || (statb.st_mode & S_IFMT) != S_IFREG ||
 
     struct stat statb;
     if ((stat ((char*) (const char*) file, &statb) == -1) || (statb.st_mode & S_IFMT) != S_IFREG ||

-      !(fp = fopen ((char*) (const char*) file, "r")))
+        !(fp = fopen ((char*) (const char*) file, "r")))

     {
     {

-      return FALSE;
+        return FALSE;

     }
     else
     {
     }
     else
     {

-      long len = statb.st_size;
-      char *text;
-      if (!(text = XtMalloc ((unsigned) (len + 1))))
-       {
-         fclose (fp);
-         return FALSE;
-       }
-      if (fread (text, sizeof (char), len, fp) != (size_t) len)
-       {
-       }
-      fclose (fp);
-
-      text[len] = 0;
-      XmTextSetString (textWidget, text);
-      //      m_textPosition = len;
-      XtFree (text);
-      m_modified = FALSE;
-      return TRUE;
+        long len = statb.st_size;
+        char *text;
+        if (!(text = XtMalloc ((unsigned) (len + 1))))
+        {
+            fclose (fp);
+            return FALSE;
+        }
+        if (fread (text, sizeof (char), len, fp) != (size_t) len)
+        {
+        }
+        fclose (fp);
+
+        text[len] = 0;
+        XmTextSetString (textWidget, text);
+        //      m_textPosition = len;
+        XtFree (text);
+        m_modified = FALSE;
+        return TRUE;

     }
 }
 
     }
 }
 


@@ -302,30 +416,30 @@ bool wxTextCtrl::SaveFile(const wxString& file)
         return FALSE;
     m_fileName = theFile;
 
         return FALSE;
     m_fileName = theFile;
 

-  Widget textWidget = (Widget) m_mainWidget;
-  FILE *fp;
+    Widget textWidget = (Widget) m_mainWidget;
+    FILE *fp;

 
 

-  if (!(fp = fopen ((char*) (const char*) theFile, "w")))
+    if (!(fp = fopen ((char*) (const char*) theFile, "w")))

     {
     {

-      return FALSE;
+        return FALSE;

     }
     }

-  else
+    else

     {
     {

-      char *text = XmTextGetString (textWidget);
-      long len = XmTextGetLastPosition (textWidget);
-
-      if (fwrite (text, sizeof (char), len, fp) != (size_t) len)
-       {
-         // Did not write whole file
-       }
-      // Make sure newline terminates the file
-      if (text[len - 1] != '\n')
-       fputc ('\n', fp);
-
-      fclose (fp);
-      XtFree (text);
-      m_modified = FALSE;
-      return TRUE;
+        char *text = XmTextGetString (textWidget);
+        long len = XmTextGetLastPosition (textWidget);
+
+        if (fwrite (text, sizeof (char), len, fp) != (size_t) len)
+        {
+            // Did not write whole file
+        }
+        // Make sure newline terminates the file
+        if (text[len - 1] != '\n')
+            fputc ('\n', fp);
+
+        fclose (fp);
+        XtFree (text);
+        m_modified = FALSE;
+        return TRUE;

     }
 }
 
     }
 }
 


@@ -339,6 +453,16 @@ void wxTextCtrl::WriteText(const wxString& text)
     m_modified = TRUE;
 }
 
     m_modified = TRUE;
 }
 

+void wxTextCtrl::AppendText(const wxString& text)
+{
+    long textPosition = GetLastPosition() + strlen(text);
+    XmTextInsert ((Widget) m_mainWidget, GetLastPosition(), (char*) (const char*) text);
+    XtVaSetValues ((Widget) m_mainWidget, XmNcursorPosition, textPosition, NULL);
+    SetInsertionPoint(textPosition);
+    XmTextShowPosition ((Widget) m_mainWidget, textPosition);
+    m_modified = TRUE;
+}
+

 void wxTextCtrl::Clear()
 {
     XmTextSetString ((Widget) m_mainWidget, "");
 void wxTextCtrl::Clear()
 {
     XmTextSetString ((Widget) m_mainWidget, "");


@@ -353,7 +477,6 @@ bool wxTextCtrl::IsModified() const
 // Makes 'unmodified'
 void wxTextCtrl::DiscardEdits()
 {
 // Makes 'unmodified'
 void wxTextCtrl::DiscardEdits()
 {

-    XmTextSetString ((Widget) m_mainWidget, "");

     m_modified = FALSE;
 }
 
     m_modified = FALSE;
 }
 


@@ -363,27 +486,27 @@ int wxTextCtrl::GetNumberOfLines() const
     char *s = XmTextGetString ((Widget) m_mainWidget);
     if (s)
     {
     char *s = XmTextGetString ((Widget) m_mainWidget);
     if (s)
     {

-      long i = 0;
-      int currentLine = 0;
-      bool finished = FALSE;
-      while (!finished)
-       {
-         int ch = s[i];
-         if (ch == '\n')
-           {
-             currentLine++;
-             i++;
-           }
-         else if (ch == 0)
-           {
-             finished = TRUE;
-           }
-         else
-           i++;
-       }
-
-      XtFree (s);
-      return currentLine;
+        long i = 0;
+        int currentLine = 0;
+        bool finished = FALSE;
+        while (!finished)
+        {
+            int ch = s[i];
+            if (ch == '\n')
+            {
+                currentLine++;
+                i++;
+            }
+            else if (ch == 0)
+            {
+                finished = TRUE;
+            }
+            else
+                i++;
+        }
+
+        XtFree (s);
+        return currentLine;

     }
     return 0;
 }
     }
     return 0;
 }


@@ -391,15 +514,15 @@ int wxTextCtrl::GetNumberOfLines() const
 long wxTextCtrl::XYToPosition(long x, long y) const
 {
 /* It seems, that there is a bug in some versions of the Motif library,
 long wxTextCtrl::XYToPosition(long x, long y) const
 {
 /* It seems, that there is a bug in some versions of the Motif library,

-   so the original wxWin-Code doesn't work. */
-/*
-  Widget textWidget = (Widget) handle;
-  return (long) XmTextXYToPos (textWidget, (Position) x, (Position) y);
-*/
+    so the original wxWin-Code doesn't work. */
+    /*
+    Widget textWidget = (Widget) handle;
+    return (long) XmTextXYToPos (textWidget, (Position) x, (Position) y);
+    */

     /* Now a little workaround: */
     long r=0;
     for (int i=0; i<y; i++) r+=(GetLineLength(i)+1);
     /* Now a little workaround: */
     long r=0;
     for (int i=0; i<y; i++) r+=(GetLineLength(i)+1);

-    return r+x; 
+    return r+x;

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


@@ -431,24 +554,24 @@ wxString wxTextCtrl::GetLineText(long lineNo) const
         long i;
         int currentLine = 0;
         for (i = 0; currentLine != lineNo && s[i]; i++ )
         long i;
         int currentLine = 0;
         for (i = 0; currentLine != lineNo && s[i]; i++ )

-        if (s[i] == '\n')
-          currentLine++;
-        // Now get the text
-        int j;
-        for (j = 0; s[i] && s[i] != '\n'; i++, j++ )
-            buf += s[i];
-    
-        XtFree(s);
-        return buf;
-  }
-  else
-    return wxEmptyString;
+            if (s[i] == '\n')
+                currentLine++;
+            // Now get the text
+            int j;
+            for (j = 0; s[i] && s[i] != '\n'; i++, j++ )
+                buf += s[i];
+
+            XtFree(s);
+            return buf;
+    }
+    else
+        return wxEmptyString;

 }
 
 /*
 }
 
 /*

- * Text item
- */
- 
+* Text item
+*/
+

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


@@ -468,7 +591,7 @@ 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


@@ -476,62 +599,62 @@ void wxTextCtrl::OnDropFiles(wxDropFilesEvent& event)
 #ifndef NO_TEXT_WINDOW_STREAM
 int wxTextCtrl::overflow(int c)
 {
 #ifndef NO_TEXT_WINDOW_STREAM
 int wxTextCtrl::overflow(int c)
 {

-  // Make sure there is a holding area
-  if ( allocate()==EOF )
-  {
-    wxError("Streambuf allocation failed","Internal error");
-    return EOF;
-  }
-  
-  // Verify that there are no characters in get area
-  if ( gptr() && gptr() < egptr() )
-  {
-     wxError("Who's trespassing my get area?","Internal error");
-     return EOF;
-  }
-
-  // Reset get area
-  setg(0,0,0);
-
-  // Make sure there is a put area
-  if ( ! pptr() )
-  {
-/* This doesn't seem to be fatal so comment out error message */
-//    wxError("Put area not opened","Internal error");
-    setp( base(), base() );
-  }
-
-  // Determine how many characters have been inserted but no consumed
-  int plen = pptr() - pbase();
-
-  // Now Jerry relies on the fact that the buffer is at least 2 chars
-  // long, but the holding area "may be as small as 1" ???
-  // And we need an additional \0, so let's keep this inefficient but
-  // safe copy.
-
-  // If c!=EOF, it is a character that must also be comsumed
-  int xtra = c==EOF? 0 : 1;
-
-  // Write temporary C-string to wxTextWindow
-  {
-  char *txt = new char[plen+xtra+1];
-  memcpy(txt, pbase(), plen);
-  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);
-    delete[] txt;
-  }
+    // Make sure there is a holding area
+    if ( allocate()==EOF )
+    {
+        wxError("Streambuf allocation failed","Internal error");
+        return EOF;
+    }
+
+    // Verify that there are no characters in get area
+    if ( gptr() && gptr() < egptr() )
+    {
+        wxError("wxTextCtrl::overflow: Who's trespassing my get area?","Internal error");
+        return EOF;
+    }

 
 

-  // Reset put area
-  setp(pbase(), epptr());
+    // Reset get area
+    setg(0,0,0);
+
+    // Make sure there is a put area
+    if ( ! pptr() )
+    {
+        /* This doesn't seem to be fatal so comment out error message */
+        //    wxError("Put area not opened","Internal error");
+        setp( base(), base() );
+    }
+
+    // Determine how many characters have been inserted but no consumed
+    int plen = pptr() - pbase();
+
+    // Now Jerry relies on the fact that the buffer is at least 2 chars
+    // long, but the holding area "may be as small as 1" ???
+    // And we need an additional \0, so let's keep this inefficient but
+    // safe copy.
+
+    // If c!=EOF, it is a character that must also be comsumed
+    int xtra = c==EOF? 0 : 1;
+
+    // Write temporary C-string to wxTextWindow
+    {
+        char *txt = new char[plen+xtra+1];
+        memcpy(txt, pbase(), plen);
+        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);
+        delete[] txt;
+    }
+
+    // Reset put area
+    setp(pbase(), epptr());

 
 #if defined(__WATCOMC__)
 
 #if defined(__WATCOMC__)

-  return __NOT_EOF;
+    return __NOT_EOF;

 #elif defined(zapeof)     // HP-UX (all cfront based?)
 #elif defined(zapeof)     // HP-UX (all cfront based?)

-  return zapeof(c);
+    return zapeof(c);

 #else
 #else

-  return c!=EOF ? c : 0;  // this should make everybody happy
+    return c!=EOF ? c : 0;  // this should make everybody happy

 #endif
 }
 
 #endif
 }
 


@@ -540,26 +663,26 @@ int wxTextCtrl::overflow(int c)
 //=========================================================================
 int wxTextCtrl::sync()
 {
 //=========================================================================
 int wxTextCtrl::sync()
 {

-  // Verify that there are no characters in get area
-  if ( gptr() && gptr() < egptr() )
-  {
-     wxError("Who's trespassing my get area?","Internal error");
-     return EOF;
-  }
-
-  if ( pptr() && pptr() > pbase() ) return overflow(EOF);
-
-  return 0;
-/* OLD CODE
-  int len = pptr() - pbase();
-  char *txt = new char[len+1];
-  strncpy(txt, pbase(), len);
-  txt[len] = '\0';
-  (*this) << txt;
-  setp(pbase(), epptr());
-  delete[] txt;
-  return 0;
-*/
+    // Verify that there are no characters in get area
+    if ( gptr() && gptr() < egptr() )
+    {
+        wxError("Who's trespassing my get area?","Internal error");
+        return EOF;
+    }
+
+    if ( pptr() && pptr() > pbase() ) return overflow(EOF);
+
+    return 0;
+    /* OLD CODE
+    int len = pptr() - pbase();
+    char *txt = new char[len+1];
+    strncpy(txt, pbase(), len);
+    txt[len] = '\0';
+    (*this) << txt;
+    setp(pbase(), epptr());
+    delete[] txt;
+    return 0;
+    */

 }
 
 //=========================================================================
 }
 
 //=========================================================================


@@ -567,13 +690,13 @@ int wxTextCtrl::sync()
 //=========================================================================
 int wxTextCtrl::underflow()
 {
 //=========================================================================
 int wxTextCtrl::underflow()
 {

-  return EOF;
+    return EOF;

 }
 #endif
 
 wxTextCtrl& wxTextCtrl::operator<<(const wxString& s)
 {
 }
 #endif
 
 wxTextCtrl& wxTextCtrl::operator<<(const wxString& s)
 {

-    WriteText(s);
+    AppendText(s);

     return *this;
 }
 
     return *this;
 }
 


@@ -581,7 +704,7 @@ wxTextCtrl& wxTextCtrl::operator<<(float f)
 {
     wxString str;
     str.Printf("%.2f", f);
 {
     wxString str;
     str.Printf("%.2f", f);

-    WriteText(str);
+    AppendText(str);

     return *this;
 }
 
     return *this;
 }
 


@@ -589,7 +712,7 @@ wxTextCtrl& wxTextCtrl::operator<<(double d)
 {
     wxString str;
     str.Printf("%.2f", d);
 {
     wxString str;
     str.Printf("%.2f", d);

-    WriteText(str);
+    AppendText(str);

     return *this;
 }
 
     return *this;
 }
 


@@ -597,7 +720,7 @@ wxTextCtrl& wxTextCtrl::operator<<(int i)
 {
     wxString str;
     str.Printf("%d", i);
 {
     wxString str;
     str.Printf("%d", i);

-    WriteText(str);
+    AppendText(str);

     return *this;
 }
 
     return *this;
 }
 


@@ -605,7 +728,7 @@ wxTextCtrl& wxTextCtrl::operator<<(long i)
 {
     wxString str;
     str.Printf("%ld", i);
 {
     wxString str;
     str.Printf("%ld", i);

-    WriteText(str);
+    AppendText(str);

     return *this;
 }
 
     return *this;
 }
 


@@ -615,27 +738,27 @@ wxTextCtrl& wxTextCtrl::operator<<(const char c)
 
     buf[0] = c;
     buf[1] = 0;
 
     buf[0] = c;
     buf[1] = 0;

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

     return *this;
 }
 
 void wxTextCtrl::OnChar(wxKeyEvent& event)
 {
     return *this;
 }
 
 void wxTextCtrl::OnChar(wxKeyEvent& event)
 {

-  // Indicates that we should generate a normal command, because
-  // we're letting default behaviour happen (otherwise it's vetoed
-  // by virtue of overriding OnChar)
-  m_processedDefault = TRUE;
-
-  if (m_tempCallbackStruct)
-  {
-    XmTextVerifyCallbackStruct *textStruct =
-        (XmTextVerifyCallbackStruct *) m_tempCallbackStruct;
-    textStruct->doit = True;
-    if (isascii(event.m_keyCode) && (textStruct->text->length == 1))
+    // Indicates that we should generate a normal command, because
+    // we're letting default behaviour happen (otherwise it's vetoed
+    // by virtue of overriding OnChar)
+    m_processedDefault = TRUE;
+
+    if (m_tempCallbackStruct)

     {
     {

-      textStruct->text->ptr[0] = ((event.m_keyCode == WXK_RETURN) ? 10 : event.m_keyCode);
+        XmTextVerifyCallbackStruct *textStruct =
+            (XmTextVerifyCallbackStruct *) m_tempCallbackStruct;
+        textStruct->doit = True;
+        if (isascii(event.m_keyCode) && (textStruct->text->length == 1))
+        {
+            textStruct->text->ptr[0] = ((event.m_keyCode == WXK_RETURN) ? 10 : event.m_keyCode);
+        }

     }
     }

-  }

 }
 
 void wxTextCtrl::ChangeFont(bool keepOriginalSize)
 }
 
 void wxTextCtrl::ChangeFont(bool keepOriginalSize)


@@ -646,128 +769,191 @@ void wxTextCtrl::ChangeFont(bool keepOriginalSize)
 void wxTextCtrl::ChangeBackgroundColour()
 {
     wxWindow::ChangeBackgroundColour();
 void wxTextCtrl::ChangeBackgroundColour()
 {
     wxWindow::ChangeBackgroundColour();

+
+    /* TODO: should scrollbars be affected? Should probably have separate
+    * function to change them (by default, taken from wxSystemSettings)
+    */
+    if (m_windowStyle & wxTE_MULTILINE)
+    {
+        Widget parent = XtParent ((Widget) m_mainWidget);
+        Widget hsb, vsb;
+
+        XtVaGetValues (parent,
+            XmNhorizontalScrollBar, &hsb,
+            XmNverticalScrollBar, &vsb,
+            NULL);
+        wxColour backgroundColour = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE);
+        if (hsb)
+            DoChangeBackgroundColour((WXWidget) hsb, backgroundColour, TRUE);
+        if (vsb)
+            DoChangeBackgroundColour((WXWidget) vsb, backgroundColour, TRUE);
+
+        DoChangeBackgroundColour((WXWidget) parent, m_backgroundColour, TRUE);
+    }

 }
 
 void wxTextCtrl::ChangeForegroundColour()
 {
     wxWindow::ChangeForegroundColour();
 }
 
 void wxTextCtrl::ChangeForegroundColour()
 {
     wxWindow::ChangeForegroundColour();

+
+    if (m_windowStyle & wxTE_MULTILINE)
+    {
+        Widget parent = XtParent ((Widget) m_mainWidget);
+        Widget hsb, vsb;
+
+        XtVaGetValues (parent,
+            XmNhorizontalScrollBar, &hsb,
+            XmNverticalScrollBar, &vsb,
+            NULL);
+
+            /* TODO: should scrollbars be affected? Should probably have separate
+            * function to change them (by default, taken from wxSystemSettings)
+            if (hsb)
+            DoChangeForegroundColour((WXWidget) hsb, m_foregroundColour);
+            if (vsb)
+            DoChangeForegroundColour((WXWidget) vsb, m_foregroundColour);
+        */
+        DoChangeForegroundColour((WXWidget) parent, m_foregroundColour);
+    }

 }
 
 }
 

-static void wxTextWindowChangedProc (Widget w, XtPointer clientData, XtPointer ptr)
+void wxTextCtrl::DoSendEvents(void *wxcbs, long keycode)

 {
 {

-  if (!wxGetWindowFromTable(w))
-    // Widget has been deleted!
-    return;
+    // we're in process of updating the text control
+    m_tempCallbackStruct = wxcbs;

 
 

-  wxTextCtrl *tw = (wxTextCtrl *) clientData;
-  tw->SetModified(TRUE);
+    XmTextVerifyCallbackStruct *cbs = (XmTextVerifyCallbackStruct *)wxcbs;
+
+    wxKeyEvent event (wxEVT_CHAR);
+    event.SetId(GetId());
+    event.m_keyCode = keycode;
+    event.SetEventObject(this);
+
+    // Only if wxTextCtrl::OnChar is called will this be set to True (and
+    // the character passed through)
+    cbs->doit = False;
+
+    GetEventHandler()->ProcessEvent(event);
+
+    if ( !InSetValue() && m_processedDefault )
+    {
+        // Can generate a command
+        wxCommandEvent commandEvent(wxEVT_COMMAND_TEXT_UPDATED, GetId());
+        commandEvent.SetEventObject(this);
+        ProcessCommand(commandEvent);
+    }
+
+    // do it after the (user) event handlers processed the events because
+    // otherwise GetValue() would return incorrect (not yet updated value)
+    m_tempCallbackStruct = NULL;

 }
 
 }
 

-static void 
-wxTextWindowModifyProc (Widget w, XtPointer clientData, XmTextVerifyCallbackStruct *cbs)
+// ----------------------------------------------------------------------------
+// helpers and Motif callbacks
+// ----------------------------------------------------------------------------
+
+static void MergeChangesIntoString(wxString& value,
+                                   XmTextVerifyCallbackStruct *cbs)

 {
 {

-    wxTextCtrl *tw = (wxTextCtrl *) clientData;
-    tw->m_processedDefault = FALSE;
+    /* _sm_
+     * At least on my system (SunOS 4.1.3 + Motif 1.2), you need to think of
+     * every event as a replace event.  cbs->text->ptr gives the replacement
+     * text, cbs->startPos gives the index of the first char affected by the
+     * replace, and cbs->endPos gives the index one more than the last char
+     * affected by the replace (startPos == endPos implies an empty range).
+     * Hence, a deletion is represented by replacing all input text with a
+     * blank string ("", *not* NULL!).  A simple insertion that does not
+     * overwrite any text has startPos == endPos.
+     */
+
+    if ( !value )
+    {
+        // easy case: the ol value was empty
+        value = cbs->text->ptr;
+    }
+    else
+    {
+        // merge the changes into the value
+        const char * const passwd = value;
+        int len = value.length();

 
 

-    // First, do some stuff if it's a password control.
-    // (What does this do exactly?)
+        len += strlen(cbs->text->ptr) + 1;     // + new text (if any) + NUL
+        len -= cbs->endPos - cbs->startPos;    // - text from affected region.

 
 

-    if (tw->GetWindowStyleFlag() & wxTE_PASSWORD)
-    {
-      /* _sm_
-       * At least on my system (SunOS 4.1.3 + Motif 1.2), you need to think of
-       * every event as a replace event.  cbs->text->ptr gives the replacement
-       * text, cbs->startPos gives the index of the first char affected by the
-       * replace, and cbs->endPos gives the index one more than the last char
-       * affected by the replace (startPos == endPos implies an empty range).
-       * Hence, a deletion is represented by replacing all input text with a
-       * blank string ("", *not* NULL!).  A simple insertion that does not
-       * overwrite any text has startPos == endPos.
-       */
-
-        if (tw->m_value.IsNull())
-        {
-            tw->m_value = cbs->text->ptr;
-        }
-        else
-        {
-            char * passwd = (char*) (const char*) tw->m_value;  // Set up a more convenient alias.
+        char * newS = new char [len];
+        char * dest = newS,
+             * insert = cbs->text->ptr;

 
 

-            int len = passwd ? strlen(passwd) : 0; // Enough room for old text
-            len += strlen(cbs->text->ptr) + 1;     // + new text (if any) + NUL
-            len -= cbs->endPos - cbs->startPos;    // - text from affected region.
+        // Copy (old) text from passwd, up to the start posn of the change.
+        int i;
+        const char * p = passwd;
+        for (i = 0; i < cbs->startPos; ++i)
+            *dest++ = *p++;

 
 

-            char * newS = new char [len];
-            char * p = passwd, * dest = newS, * insert = cbs->text->ptr;
+        // Copy the text to be inserted).
+        while (*insert)
+            *dest++ = *insert++;

 
 

-            // Copy (old) text from passwd, up to the start posn of the change.
-            int i;
-            for (i = 0; i < cbs->startPos; ++i)
-                *dest++ = *p++;
+        // Finally, copy into newS any remaining text from passwd[endPos] on.
+        for (p = passwd + cbs->endPos; *p; )
+            *dest++ = *p++;
+        *dest = 0;

 
 

-            // Copy the text to be inserted).
-            while (*insert)
-               *dest++ = *insert++;
+        value = newS;

 
 

-            // Finally, copy into newS any remaining text from passwd[endPos] on.
-            for (p = passwd + cbs->endPos; *p; )
-                *dest++ = *p++;
-            *dest = 0;
+        delete[] newS;
+    }
+}

 
 

-            tw->m_value = newS;
+static void
+wxTextWindowChangedProc (Widget w, XtPointer clientData, XtPointer ptr)
+{
+    if (!wxGetWindowFromTable(w))
+        // Widget has been deleted!
+        return;

 
 

-            delete[] newS;
-        }
+    wxTextCtrl *tw = (wxTextCtrl *) clientData;
+    tw->SetModified(TRUE);
+}
+
+static void
+wxTextWindowModifyProc (Widget w, XtPointer clientData, XmTextVerifyCallbackStruct *cbs)
+{
+    wxTextCtrl *tw = (wxTextCtrl *) clientData;
+    tw->m_processedDefault = FALSE;

 
 

-        if (cbs->text->length>0)
+    // First, do some stuff if it's a password control: in this case, we need
+    // to store the string inside the class because GetValue() can't retrieve
+    // it from the text ctrl. We do *not* do it in other circumstances because
+    // it would double the amount of memory needed.
+
+    if ( tw->GetWindowStyleFlag() & wxTE_PASSWORD )
+    {
+        MergeChangesIntoString(tw->m_value, cbs);
+
+        if ( cbs->text->length > 0 )

         {
             int i;
             for (i = 0; i < cbs->text->length; ++i)
                 cbs->text->ptr[i] = '*';
         {
             int i;
             for (i = 0; i < cbs->text->length; ++i)
                 cbs->text->ptr[i] = '*';

-            cbs->text->ptr[i] = 0;
+            cbs->text->ptr[i] = '\0';

         }
     }
 
         }
     }
 

-    // If we're already within an OnChar, return: probably
-    // a programmatic insertion.
+    // If we're already within an OnChar, return: probably a programmatic
+    // insertion.

     if (tw->m_tempCallbackStruct)
         return;
 
     // Check for a backspace
     if (cbs->startPos == (cbs->currInsert - 1))
     {
     if (tw->m_tempCallbackStruct)
         return;
 
     // Check for a backspace
     if (cbs->startPos == (cbs->currInsert - 1))
     {

-        tw->m_tempCallbackStruct = (void*) cbs;
-
-        wxKeyEvent event (wxEVT_CHAR);
-        event.SetId(tw->GetId());
-        event.m_keyCode = WXK_DELETE;
-        event.SetEventObject(tw);
-
-        // Only if wxTextCtrl::OnChar is called
-        // will this be set to True (and the character
-        // passed through)
-        cbs->doit = False;
-
-        tw->GetEventHandler()->ProcessEvent(event);
-
-        tw->m_tempCallbackStruct = NULL;
-
-        if (tw->InSetValue())
-            return;
-    
-        if (tw->m_processedDefault)
-        {
-            // Can generate a command
-            wxCommandEvent commandEvent(wxEVT_COMMAND_TEXT_UPDATED, tw->GetId());
-           commandEvent.SetEventObject(tw);
-            tw->ProcessCommand(commandEvent);
-       }
+        tw->DoSendEvents((void *)cbs, WXK_DELETE);

 
         return;
     }
 
 
         return;
     }
 

-    // Pasting operation: let it through without
-    // calling OnChar
+    // Pasting operation: let it through without calling OnChar

     if (cbs->text->length > 1)
         return;
 
     if (cbs->text->length > 1)
         return;
 


@@ -775,80 +961,98 @@ wxTextWindowModifyProc (Widget w, XtPointer clientData, XmTextVerifyCallbackStru
     if (cbs->text->ptr == NULL)
         return;
 
     if (cbs->text->ptr == NULL)
         return;
 

-    tw->m_tempCallbackStruct = (void*) cbs;
+    // normal key press
+    char ch = cbs->text->ptr[0];
+    tw->DoSendEvents((void *)cbs, ch == '\n' ? '\r' : ch);
+}

 
 

-    wxKeyEvent event (wxEVT_CHAR);
-    event.SetId(tw->GetId());
+static void
+wxTextWindowGainFocusProc (Widget w, XtPointer clientData, XmAnyCallbackStruct *cbs)
+{
+    if (!wxGetWindowFromTable(w))
+        return;
+
+    wxTextCtrl *tw = (wxTextCtrl *) clientData;
+    wxFocusEvent event(wxEVT_SET_FOCUS, tw->GetId());

     event.SetEventObject(tw);
     event.SetEventObject(tw);

-    event.m_keyCode = (cbs->text->ptr[0] == 10 ? 13 : cbs->text->ptr[0]);
+    tw->GetEventHandler()->ProcessEvent(event);
+}

 
 

-    // Only if wxTextCtrl::OnChar is called
-    // will this be set to True (and the character
-    // passed through)
-    cbs->doit = False;
+static void
+wxTextWindowLoseFocusProc (Widget w, XtPointer clientData, XmAnyCallbackStruct *cbs)
+{
+    if (!wxGetWindowFromTable(w))
+        return;

 
 

+    wxTextCtrl *tw = (wxTextCtrl *) clientData;
+    wxFocusEvent event(wxEVT_KILL_FOCUS, tw->GetId());
+    event.SetEventObject(tw);

     tw->GetEventHandler()->ProcessEvent(event);
     tw->GetEventHandler()->ProcessEvent(event);

+}

 
 

-    tw->m_tempCallbackStruct = NULL;
+static void wxTextWindowActivateProc(Widget w, XtPointer clientData,
+                                     XmAnyCallbackStruct *ptr)
+{
+    if (!wxGetWindowFromTable(w))
+        return;
+
+    wxTextCtrl *tw = (wxTextCtrl *) clientData;

 
     if (tw->InSetValue())
         return;
 
     if (tw->InSetValue())
         return;

-    
-    if (tw->m_processedDefault)
-    {
-        // Can generate a command
-        wxCommandEvent commandEvent(wxEVT_COMMAND_TEXT_UPDATED, tw->GetId());
-        commandEvent.SetEventObject(tw);
-        tw->ProcessCommand(commandEvent);
-    }
+
+    wxCommandEvent event(wxEVT_COMMAND_TEXT_ENTER);
+    event.SetId(tw->GetId());
+    event.SetEventObject(tw);
+    tw->ProcessCommand(event);

 }
 
 }
 

-static void 
-wxTextWindowGainFocusProc (Widget w, XtPointer clientData, XmAnyCallbackStruct *cbs)
+void wxTextCtrl::OnCut(wxCommandEvent& WXUNUSED(event))
+{
+    Cut();
+}
+
+void wxTextCtrl::OnCopy(wxCommandEvent& WXUNUSED(event))

 {
 {

-  if (!wxGetWindowFromTable(w))
-    return;
+    Copy();
+}

 
 

-  wxTextCtrl *tw = (wxTextCtrl *) clientData;
-  wxFocusEvent event(wxEVT_SET_FOCUS, tw->GetId());
-  event.SetEventObject(tw);
-  tw->GetEventHandler()->ProcessEvent(event);
+void wxTextCtrl::OnPaste(wxCommandEvent& WXUNUSED(event))
+{
+    Paste();

 }
 
 }
 

-static void 
-wxTextWindowLoseFocusProc (Widget w, XtPointer clientData, XmAnyCallbackStruct *cbs)
+void wxTextCtrl::OnUndo(wxCommandEvent& WXUNUSED(event))

 {
 {

-  if (!wxGetWindowFromTable(w))
-    return;
+    Undo();
+}

 
 

-  wxTextCtrl *tw = (wxTextCtrl *) clientData;
-  wxFocusEvent event(wxEVT_KILL_FOCUS, tw->GetId());
-  event.SetEventObject(tw);
-  tw->GetEventHandler()->ProcessEvent(event);
+void wxTextCtrl::OnRedo(wxCommandEvent& WXUNUSED(event))
+{
+    Redo();

 }
 
 }
 

-static void wxTextWindowActivateProc(Widget w, XtPointer clientData,
-                      XmAnyCallbackStruct *ptr)
-{
-  if (!wxGetWindowFromTable(w))
-    return;
-
-  wxTextCtrl *tw = (wxTextCtrl *) clientData;
-  /*
-  case XmCR_ACTIVATE:
-    type_event = wxEVENT_TYPE_TEXT_ENTER_COMMAND ;
-    break;
-  default:
-    type_event = wxEVENT_TYPE_TEXT_COMMAND ;
-    break;
-  }
-  */
-
-  if (tw->InSetValue())
-    return;
-    
-  wxCommandEvent event(wxEVT_COMMAND_TEXT_ENTER);
-  event.SetId(tw->GetId());
-  event.SetEventObject(tw);
-  tw->ProcessCommand(event);
+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() );

 }
 }