Better fix

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

diff --git a/src/motif/textctrl.cpp b/src/motif/textctrl.cpp
index 53f5a047ca7556212b55d43ca87ec06d42a3a89e..666da47caac2f98ac1d1954909aeb54dc7dda4af 100644 (file)
--- a/src/motif/textctrl.cpp
+++ b/src/motif/textctrl.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        textctrl.cpp
+// Name:        src/motif/textctrl.cpp

 // Purpose:     wxTextCtrl
 // Author:      Julian Smart
 // Modified by:
 // Purpose:     wxTextCtrl
 // Author:      Julian Smart
 // Modified by:


@@ -17,24 +17,21 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma implementation "textctrl.h"
-#endif
-
-#ifdef __VMS
-#define XtParent XTPARENT
-#endif
-
-#include "wx/defs.h"
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"

 
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <ctype.h>
 
 #include "wx/textctrl.h"
 
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <ctype.h>
 
 #include "wx/textctrl.h"

-#include "wx/settings.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/utils.h"
+    #include "wx/settings.h"
+#endif
+

 #include "wx/filefn.h"
 #include "wx/filefn.h"

-#include "wx/utils.h"

 
 #ifdef __VMS__
 #pragma message disable nosimpint
 
 #ifdef __VMS__
 #pragma message disable nosimpint


@@ -62,9 +59,9 @@ static void wxTextWindowGainFocusProc(Widget w, XtPointer clientData, XmAnyCallb
 static void wxTextWindowLoseFocusProc(Widget w, XtPointer clientData, XmAnyCallbackStruct *cbs);
 static void wxTextWindowActivateProc(Widget w, XtPointer clientData, XmAnyCallbackStruct *ptr);
 
 static void wxTextWindowLoseFocusProc(Widget w, XtPointer clientData, XmAnyCallbackStruct *cbs);
 static void wxTextWindowActivateProc(Widget w, XtPointer clientData, XmAnyCallbackStruct *ptr);
 

-    IMPLEMENT_DYNAMIC_CLASS(wxTextCtrl, wxControl)
+    IMPLEMENT_DYNAMIC_CLASS(wxTextCtrl, wxTextCtrlBase)

 
 

-    BEGIN_EVENT_TABLE(wxTextCtrl, wxControl)
+    BEGIN_EVENT_TABLE(wxTextCtrl, wxTextCtrlBase)

         EVT_DROP_FILES(wxTextCtrl::OnDropFiles)
         EVT_CHAR(wxTextCtrl::OnChar)
 
         EVT_DROP_FILES(wxTextCtrl::OnDropFiles)
         EVT_CHAR(wxTextCtrl::OnChar)
 


@@ -94,8 +91,8 @@ static void wxTextWindowActivateProc(Widget w, XtPointer clientData, XmAnyCallba
 wxTextCtrl::wxTextCtrl()
 {
     m_tempCallbackStruct = (void*) NULL;
 wxTextCtrl::wxTextCtrl()
 {
     m_tempCallbackStruct = (void*) NULL;

-    m_modified = FALSE;
-    m_processedDefault = FALSE;
+    m_modified = false;
+    m_processedDefault = false;

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


@@ -109,57 +106,69 @@ bool wxTextCtrl::Create(wxWindow *parent,
 {
     if( !CreateControl( parent, id, pos, size, style, validator, name ) )
         return false;
 {
     if( !CreateControl( parent, id, pos, size, style, validator, name ) )
         return false;

+    PreCreation();

 
     m_tempCallbackStruct = (void*) NULL;
 
     m_tempCallbackStruct = (void*) NULL;

-    m_modified = FALSE;
-    m_processedDefault = FALSE;
-
-    m_backgroundColour = *wxWHITE;
+    m_modified = false;
+    m_processedDefault = false;

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

-    bool wantHorizScrolling = ((m_windowStyle & wxHSCROLL) != 0);
-
+    Bool wantHorizScroll = (m_windowStyle & wxHSCROLL) != 0 ? True : False;

     // If we don't have horizontal scrollbars, we want word wrap.
     // If we don't have horizontal scrollbars, we want word wrap.

-    bool wantWordWrap = !wantHorizScrolling;
+    // OpenMotif 2.1 crashes if wantWordWrap is True in Japanese
+    // locale (and probably other multibyte locales). The check might be
+    // more precise
+#if wxCHECK_LESSTIF() || wxCHECK_MOTIF_VERSION( 2, 2 )
+    Bool wantWordWrap = wantHorizScroll == True ? False : True;
+#else
+    Bool wantWordWrap = False;
+#endif

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

-        Arg args[2];
-        XtSetArg (args[0], XmNscrollHorizontal, wantHorizScrolling ? True : False);
-        XtSetArg (args[1], XmNwordWrap, wantWordWrap ? True : False);
-
-        m_mainWidget = (WXWidget) XmCreateScrolledText(parentWidget,
-                                                       wxConstCast(name.c_str(), char),
-                                                       args, 2);
-
-        XtVaSetValues ((Widget) m_mainWidget,
-                        XmNeditable, ((style & wxTE_READONLY) ? False : True),
-                        XmNeditMode, XmMULTI_LINE_EDIT,
-                        NULL);
+        Arg args[8];
+        int count = 0;
+        XtSetArg (args[count], XmNscrollHorizontal, wantHorizScroll); ++count;
+        if( m_font.IsOk() )
+            XtSetArg (args[count], (String) wxFont::GetFontTag(),
+                      m_font.GetFontType( XtDisplay(parentWidget) ) ); ++count;
+        XtSetArg (args[count], XmNwordWrap, wantWordWrap); ++count;
+        XtSetArg (args[count], XmNvalue, (const char*)value.mb_str()); ++count;
+        XtSetArg (args[count], XmNeditable,
+                  style & wxTE_READONLY ? False : True); ++count;
+        XtSetArg (args[count], XmNeditMode, XmMULTI_LINE_EDIT ); ++count;
+
+        m_mainWidget =
+            (WXWidget) XmCreateScrolledText(parentWidget,
+                                            name.char_str(),
+                                            args, count);
+

         XtManageChild ((Widget) m_mainWidget);
     }
     else
     {
         m_mainWidget = (WXWidget)XtVaCreateManagedWidget
                                  (
         XtManageChild ((Widget) m_mainWidget);
     }
     else
     {
         m_mainWidget = (WXWidget)XtVaCreateManagedWidget
                                  (

-                                  wxConstCast(name.c_str(), char),
+                                  name.mb_str(),

                                   xmTextWidgetClass,
                                   parentWidget,
                                   xmTextWidgetClass,
                                   parentWidget,

+                                  wxFont::GetFontTag(), m_font.GetFontType( XtDisplay(parentWidget) ),
+                                  XmNvalue, (const char*)value.mb_str(),
+                                  XmNeditable, (style & wxTE_READONLY) ?
+                                      False : True,

                                   NULL
                                  );
 
                                   NULL
                                  );
 

-        XtVaSetValues ((Widget) m_mainWidget,
-                        XmNeditable, ((style & wxTE_READONLY) ? False : True),
-                        NULL);
-
+#if 0

         // TODO: Is this relevant? What does it do?
         int noCols = 2;
         // TODO: Is this relevant? What does it do?
         int noCols = 2;

-        if (!value.IsNull() && (value.Length() > (unsigned int) noCols))
-            noCols = value.Length();
+        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);

+#endif

     }
 
     // remove border if asked for
     }
 
     // remove border if asked for


@@ -170,15 +179,6 @@ bool wxTextCtrl::Create(wxWindow *parent,
                       NULL);
     }
 
                       NULL);
     }
 

-    if ( !value.empty() )
-    {
-        // do this instead... MB
-        //
-        XtVaSetValues( (Widget) m_mainWidget,
-                       XmNvalue, wxConstCast(value.c_str(), char),
-                       NULL);
-    }
-    

     // install callbacks
     XtAddCallback((Widget) m_mainWidget, XmNvalueChangedCallback, (XtCallbackProc)wxTextWindowChangedProc, (XtPointer)this);
 
     // install callbacks
     XtAddCallback((Widget) m_mainWidget, XmNvalueChangedCallback, (XtCallbackProc)wxTextWindowChangedProc, (XtPointer)this);
 


@@ -190,19 +190,11 @@ bool wxTextCtrl::Create(wxWindow *parent,
 
     XtAddCallback((Widget) m_mainWidget, XmNlosingFocusCallback, (XtCallbackProc)wxTextWindowLoseFocusProc, (XtPointer)this);
 
 
     XtAddCallback((Widget) m_mainWidget, XmNlosingFocusCallback, (XtCallbackProc)wxTextWindowLoseFocusProc, (XtPointer)this);
 

-    // font
-    ChangeFont(FALSE);
-
-    wxSize best = GetBestSize();
-    if( size.x != -1 ) best.x = size.x;
-    if( size.y != -1 ) best.y = size.y;
-
+    PostCreation();

     AttachWidget (parent, m_mainWidget, (WXWidget) NULL,
     AttachWidget (parent, m_mainWidget, (WXWidget) NULL,

-                  pos.x, pos.y, best.x, best.y);
-
-    ChangeBackgroundColour();
+                  pos.x, pos.y, size.x, size.y);

 
 

-    return TRUE;
+    return true;

 }
 
 WXWidget wxTextCtrl::GetTopWidget() const
 }
 
 WXWidget wxTextCtrl::GetTopWidget() const


@@ -223,14 +215,7 @@ wxString wxTextCtrl::GetValue() const
     }
     else
     {
     }
     else
     {

-        // just get the string from Motif
-        char *s = XmTextGetString ((Widget) m_mainWidget);
-        if ( s )
-        {
-            str = s;
-            XtFree (s);
-        }
-        //else: return empty string
+        str = wxTextEntry::GetValue();

 
         if ( m_tempCallbackStruct )
         {
 
         if ( m_tempCallbackStruct )
         {


@@ -243,176 +228,23 @@ wxString wxTextCtrl::GetValue() const
     return str;
 }
 
     return str;
 }
 

-void wxTextCtrl::SetValue(const wxString& value)
+void wxTextCtrl::DoSetValue(const wxString& text, int flags)

 {
 {

-    m_inSetValue = TRUE;
+    m_inSetValue = true;

 
 

-    // do this instead... MB
-    //
-    // with (at least) OpenMotif 2.1 this causes a lot of flicker
-#if 0
-    XtVaSetValues( (Widget) m_mainWidget,
-                   XmNvalue, wxConstCast(value.c_str(), char),
+    XmTextSetString ((Widget) m_mainWidget, text.char_str());
+    XtVaSetValues ((Widget) m_mainWidget,
+                   XmNcursorPosition, text.length(),

                    NULL);
                    NULL);

-#endif

 
 

-    Clear();
-    AppendText( value );
+    SetInsertionPoint(text.length());
+    XmTextShowPosition ((Widget) m_mainWidget, text.length());
+    m_modified = true;

 
 

-    m_inSetValue = FALSE;
-}
+    m_inSetValue = false;

 
 

-// Clipboard operations
-void wxTextCtrl::Copy()
-{
-    XmTextCopy((Widget) m_mainWidget, CurrentTime);
-}
-
-void wxTextCtrl::Cut()
-{
-    XmTextCut((Widget) m_mainWidget, CurrentTime);
-}
-
-void wxTextCtrl::Paste()
-{
-    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) && (IsEditable());
-}
-
-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::SetInsertionPoint(long pos)
-{
-    XmTextSetInsertionPosition ((Widget) m_mainWidget, (XmTextPosition) pos);
-}
-
-void wxTextCtrl::SetInsertionPointEnd()
-{
-    long pos = GetLastPosition();
-    SetInsertionPoint(pos);
-}
-
-long wxTextCtrl::GetInsertionPoint() const
-{
-    return (long) XmTextGetInsertionPosition ((Widget) m_mainWidget);
-}
-
-long wxTextCtrl::GetLastPosition() const
-{
-    return (long) XmTextGetLastPosition ((Widget) m_mainWidget);
-}
-
-void wxTextCtrl::Replace(long from, long to, const wxString& value)
-{
-    XmTextReplace ((Widget) m_mainWidget, (XmTextPosition) from, (XmTextPosition) to,
-        wxConstCast(value.c_str(), char));
-}
-
-void wxTextCtrl::Remove(long from, long to)
-{
-    XmTextSetSelection ((Widget) m_mainWidget, (XmTextPosition) from, (XmTextPosition) to,
-                      (Time) 0);
-    XmTextRemove ((Widget) m_mainWidget);
-}
-
-void wxTextCtrl::SetSelection(long from, long to)
-{
-    if( to == -1 )
-        to = GetLastPosition();
-
-    XmTextSetSelection ((Widget) m_mainWidget, (XmTextPosition) from, (XmTextPosition) to,
-                      (Time) 0);
-}
-
-void wxTextCtrl::WriteText(const wxString& text)
-{
-    long textPosition = GetInsertionPoint() + strlen (text);
-    XmTextInsert ((Widget) m_mainWidget, GetInsertionPoint(),
-                  wxConstCast(text.c_str(), char));
-    XtVaSetValues ((Widget) m_mainWidget, XmNcursorPosition, textPosition, NULL);
-    SetInsertionPoint(textPosition);
-    XmTextShowPosition ((Widget) m_mainWidget, textPosition);
-    m_modified = TRUE;
-}
-
-void wxTextCtrl::AppendText(const wxString& text)
-{
-    long textPosition = GetLastPosition() + text.length();
-    XmTextInsert ((Widget) m_mainWidget, GetLastPosition(),
-                  wxConstCast(text.c_str(), char));
-    XtVaSetValues ((Widget) m_mainWidget, XmNcursorPosition, textPosition, NULL);
-    SetInsertionPoint(textPosition);
-    XmTextShowPosition ((Widget) m_mainWidget, textPosition);
-    m_modified = TRUE;
-}
-
-void wxTextCtrl::Clear()
-{
-    XmTextSetString ((Widget) m_mainWidget, "");
-    m_modified = FALSE;
+    if ( flags & SetValue_SendEvent )
+        SendTextUpdatedEvent();

 }
 
 bool wxTextCtrl::IsModified() const
 }
 
 bool wxTextCtrl::IsModified() const


@@ -423,12 +255,12 @@ bool wxTextCtrl::IsModified() const
 // Makes modified or unmodified
 void wxTextCtrl::MarkDirty()
 {
 // Makes modified or unmodified
 void wxTextCtrl::MarkDirty()
 {

-    m_modified = TRUE;
+    m_modified = true;

 }
 
 void wxTextCtrl::DiscardEdits()
 {
 }
 
 void wxTextCtrl::DiscardEdits()
 {

-    m_modified = FALSE;
+    m_modified = false;

 }
 
 int wxTextCtrl::GetNumberOfLines() const
 }
 
 int wxTextCtrl::GetNumberOfLines() const


@@ -439,7 +271,7 @@ int wxTextCtrl::GetNumberOfLines() const
     {
         long i = 0;
         int currentLine = 0;
     {
         long i = 0;
         int currentLine = 0;

-        bool finished = FALSE;
+        bool finished = false;

         while (!finished)
         {
             int ch = s[i];
         while (!finished)
         {
             int ch = s[i];


@@ -450,7 +282,7 @@ int wxTextCtrl::GetNumberOfLines() const
             }
             else if (ch == 0)
             {
             }
             else if (ch == 0)
             {

-                finished = TRUE;
+                finished = true;

             }
             else
                 i++;
             }
             else
                 i++;


@@ -485,7 +317,7 @@ bool wxTextCtrl::PositionToXY(long pos, long *x, long *y) const
     if ( y )
         *y = yy;
 
     if ( y )
         *y = yy;
 

-    return TRUE;
+    return true;

 }
 
 void wxTextCtrl::ShowPosition(long pos)
 }
 
 void wxTextCtrl::ShowPosition(long pos)


@@ -496,7 +328,7 @@ void wxTextCtrl::ShowPosition(long pos)
 int wxTextCtrl::GetLineLength(long lineNo) const
 {
     wxString str = GetLineText (lineNo);
 int wxTextCtrl::GetLineLength(long lineNo) const
 {
     wxString str = GetLineText (lineNo);

-    return (int) str.Length();
+    return (int) str.length();

 }
 
 wxString wxTextCtrl::GetLineText(long lineNo) const
 }
 
 wxString wxTextCtrl::GetLineText(long lineNo) const


@@ -506,7 +338,7 @@ wxString wxTextCtrl::GetLineText(long lineNo) const
 
     if (s)
     {
 
     if (s)
     {

-        wxString buf("");
+        wxString buf;

         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++ )


@@ -548,7 +380,7 @@ 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)
     // 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;
+    m_processedDefault = true;

 
     if (m_tempCallbackStruct)
     {
 
     if (m_tempCallbackStruct)
     {


@@ -557,7 +389,7 @@ void wxTextCtrl::OnChar(wxKeyEvent& event)
         textStruct->doit = True;
         if (isascii(event.m_keyCode) && (textStruct->text->length == 1))
         {
         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);
+            textStruct->text->ptr[0] = (char)((event.m_keyCode == WXK_RETURN) ? 10 : event.m_keyCode);

         }
     }
 }
         }
     }
 }


@@ -585,12 +417,12 @@ void wxTextCtrl::ChangeBackgroundColour()
             NULL);
         wxColour backgroundColour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE);
         if (hsb)
             NULL);
         wxColour backgroundColour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE);
         if (hsb)

-            wxDoChangeBackgroundColour((WXWidget) hsb, backgroundColour, TRUE);
+            wxDoChangeBackgroundColour((WXWidget) hsb, backgroundColour, true);

         if (vsb)
         if (vsb)

-            wxDoChangeBackgroundColour((WXWidget) vsb, backgroundColour, TRUE);
+            wxDoChangeBackgroundColour((WXWidget) vsb, backgroundColour, true);

 
         // MBN: why change parent background?
 
         // MBN: why change parent background?

-        // DoChangeBackgroundColour((WXWidget) parent, m_backgroundColour, TRUE);
+        // DoChangeBackgroundColour((WXWidget) parent, m_backgroundColour, true);

     }
 }
 
     }
 }
 


@@ -635,7 +467,7 @@ void wxTextCtrl::DoSendEvents(void *wxcbs, long keycode)
     // the character passed through)
     cbs->doit = False;
 
     // the character passed through)
     cbs->doit = False;
 

-    GetEventHandler()->ProcessEvent(event);
+    HandleWindowEvent(event);

 
     if ( !InSetValue() && m_processedDefault )
     {
 
     if ( !InSetValue() && m_processedDefault )
     {


@@ -665,22 +497,35 @@ wxSize wxDoGetSingleTextCtrlBestSize( Widget textWidget,
                    NULL );
 
     if( !value )
                    NULL );
 
     if( !value )

-        value = "|";
+        value = wxMOTIF_STR("|");

 
     int x, y;
     window->GetTextExtent( value, &x, &y );
 
 
     int x, y;
     window->GetTextExtent( value, &x, &y );
 

-    if( x < 100 ) x = 100;
+    if( x < 90 )
+        x = 90;

 
     return wxSize( x + 2 * xmargin + 2 * highlight + 2 * shadow,
                    // MBN: +2 necessary: Lesstif bug or mine?
 
     return wxSize( x + 2 * xmargin + 2 * highlight + 2 * shadow,
                    // MBN: +2 necessary: Lesstif bug or mine?

-                   y + 2 * ymargin + 2 * highlight + 2 * shadow + 2 ); 
+                   y + 2 * ymargin + 2 * highlight + 2 * shadow + 2 );

 }
 
 wxSize wxTextCtrl::DoGetBestSize() const
 {
     if( IsSingleLine() )
 }
 
 wxSize wxTextCtrl::DoGetBestSize() const
 {
     if( IsSingleLine() )

-        return wxDoGetSingleTextCtrlBestSize( (Widget)m_mainWidget, this );
+    {
+        wxSize best = wxControl::DoGetBestSize();
+#if wxCHECK_MOTIF_VERSION( 2, 3 )
+        // OpenMotif 2.3 gives way too big X sizes
+        wxSize other_best = wxDoGetSingleTextCtrlBestSize
+                                ( (Widget) GetTopWidget(), this );
+        return wxSize( other_best.x, best.y );
+#else
+        if( best.x < 90 ) best.x = 90;
+
+        return best;
+#endif
+    }

     else
         return wxWindow::DoGetBestSize();
 }
     else
         return wxWindow::DoGetBestSize();
 }


@@ -753,14 +598,14 @@ wxTextWindowChangedProc (Widget w, XtPointer clientData, XtPointer WXUNUSED(ptr)
         return;
 
     wxTextCtrl *tw = (wxTextCtrl *) clientData;
         return;
 
     wxTextCtrl *tw = (wxTextCtrl *) clientData;

-    tw->SetModified(TRUE);
+    tw->SetModified(true);

 }
 
 static void
 wxTextWindowModifyProc (Widget WXUNUSED(w), XtPointer clientData, XmTextVerifyCallbackStruct *cbs)
 {
     wxTextCtrl *tw = (wxTextCtrl *) clientData;
 }
 
 static void
 wxTextWindowModifyProc (Widget WXUNUSED(w), XtPointer clientData, XmTextVerifyCallbackStruct *cbs)
 {
     wxTextCtrl *tw = (wxTextCtrl *) clientData;

-    tw->m_processedDefault = FALSE;
+    tw->m_processedDefault = false;

 
     // 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
 
     // 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


@@ -818,7 +663,7 @@ wxTextWindowGainFocusProc (Widget w, XtPointer clientData, XmAnyCallbackStruct *
     wxTextCtrl *tw = (wxTextCtrl *) clientData;
     wxFocusEvent event(wxEVT_SET_FOCUS, tw->GetId());
     event.SetEventObject(tw);
     wxTextCtrl *tw = (wxTextCtrl *) clientData;
     wxFocusEvent event(wxEVT_SET_FOCUS, tw->GetId());
     event.SetEventObject(tw);

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

 }
 
 static void
 }
 
 static void


@@ -830,7 +675,7 @@ wxTextWindowLoseFocusProc (Widget w, XtPointer clientData, XmAnyCallbackStruct *
     wxTextCtrl *tw = (wxTextCtrl *) clientData;
     wxFocusEvent event(wxEVT_KILL_FOCUS, tw->GetId());
     event.SetEventObject(tw);
     wxTextCtrl *tw = (wxTextCtrl *) clientData;
     wxFocusEvent event(wxEVT_KILL_FOCUS, tw->GetId());
     event.SetEventObject(tw);

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

 }
 
 static void wxTextWindowActivateProc(Widget w, XtPointer clientData,
 }
 
 static void wxTextWindowActivateProc(Widget w, XtPointer clientData,