wxNO_BORDER honoured by wxTextCtrl

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1974 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/motif/textctrl.cpp b/src/motif/textctrl.cpp
index 845019c5257434d20fba0542efb58e81bde7fe3f..d5a0d021b1a860f5111c75062c84bac8192e89ec 100644 (file)
--- a/src/motif/textctrl.cpp
+++ b/src/motif/textctrl.cpp
@@ -6,152 +6,175 @@
 // 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
+// ----------------------------------------------------------------------------
+
+// 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)
-END_EVENT_TABLE()
+    BEGIN_EVENT_TABLE(wxTextCtrl, wxControl)
+        EVT_DROP_FILES(wxTextCtrl::OnDropFiles)
+        EVT_CHAR(wxTextCtrl::OnChar)
+    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,
+bool wxTextCtrl::Create(wxWindow *parent,
+                        wxWindowID id,

                         const wxString& value,
                         const wxPoint& pos,
                         const wxString& value,
                         const wxPoint& pos,

-                        const wxSize& size, long style,
+                        const wxSize& size,
+                        long style,

                         const wxValidator& validator,
                         const wxString& name)
 {
     m_tempCallbackStruct = (void*) NULL;
     m_modified = FALSE;
     m_processedDefault = FALSE;
                         const wxValidator& validator,
                         const wxString& name)
 {
     m_tempCallbackStruct = (void*) NULL;
     m_modified = FALSE;
     m_processedDefault = FALSE;

-    m_fileName = "";

     //    m_backgroundColour = parent->GetBackgroundColour();
     m_backgroundColour = * wxWHITE;
     m_foregroundColour = parent->GetForegroundColour();
     //    m_backgroundColour = parent->GetBackgroundColour();
     m_backgroundColour = * wxWHITE;
     m_foregroundColour = parent->GetForegroundColour();

-    
+

     SetName(name);
     SetValidator(validator);
     SetName(name);
     SetValidator(validator);

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

     m_windowStyle = style;
     m_windowStyle = style;

-    
+

     if ( id == -1 )
         m_windowId = (int)NewControlId();
     else
         m_windowId = id;
     if ( id == -1 )
         m_windowId = (int)NewControlId();
     else
         m_windowId = id;

-    
+

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

-    
+

     bool wantHorizScrolling = ((m_windowStyle & wxHSCROLL) != 0);
     bool wantHorizScrolling = ((m_windowStyle & wxHSCROLL) != 0);

-    
+

     // If we don't have horizontal scrollbars, we want word wrap.
     bool wantWordWrap = !wantHorizScrolling;
     // If we don't have horizontal scrollbars, we want word wrap.
     bool wantWordWrap = !wantHorizScrolling;

-    
+

     if (m_windowStyle & wxTE_MULTILINE)
     {
         Arg args[2];
         XtSetArg (args[0], XmNscrollHorizontal, wantHorizScrolling ? True : False);
         XtSetArg (args[1], XmNwordWrap, wantWordWrap ? True : False);
     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, (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);

     }
     }

-    
-    if (!value.IsNull())
-        XmTextSetString ((Widget) m_mainWidget, (char*) (const char*) value);
-    
+
+    // remove border if asked for
+    if ( style & wxNO_BORDER )
+    {
+        XtVaSetValues((Widget)m_mainWidget,
+                      XmNshadowThickness, 0,
+                      NULL);
+    }
+
+    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, XmNvalueChangedCallback, (XtCallbackProc)wxTextWindowChangedProc, (XtPointer)this);

-    
+

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

-    
+

     XtAddCallback((Widget) m_mainWidget, XmNactivateCallback, (XtCallbackProc)wxTextWindowActivateProc, (XtPointer)this);
     XtAddCallback((Widget) m_mainWidget, XmNactivateCallback, (XtCallbackProc)wxTextWindowActivateProc, (XtPointer)this);

-    
+

     XtAddCallback((Widget) m_mainWidget, XmNfocusCallback, (XtCallbackProc)wxTextWindowGainFocusProc, (XtPointer)this);
     XtAddCallback((Widget) m_mainWidget, XmNfocusCallback, (XtCallbackProc)wxTextWindowGainFocusProc, (XtPointer)this);

-    
+

     XtAddCallback((Widget) m_mainWidget, XmNlosingFocusCallback, (XtCallbackProc)wxTextWindowLoseFocusProc, (XtPointer)this);
     XtAddCallback((Widget) m_mainWidget, XmNlosingFocusCallback, (XtCallbackProc)wxTextWindowLoseFocusProc, (XtPointer)this);

-    
+
+    // font

     m_windowFont = parent->GetFont();
     ChangeFont(FALSE);
     m_windowFont = parent->GetFont();
     ChangeFont(FALSE);

-    
+

     SetCanAddEventHandler(TRUE);
     AttachWidget (parent, m_mainWidget, (WXWidget) NULL, pos.x, pos.y, size.x, size.y);
     SetCanAddEventHandler(TRUE);
     AttachWidget (parent, m_mainWidget, (WXWidget) NULL, pos.x, pos.y, size.x, size.y);

-    
+

     ChangeBackgroundColour();
     ChangeBackgroundColour();

-    
+

     return TRUE;
 }
 
     return TRUE;
 }
 


@@ -182,13 +205,10 @@ wxString wxTextCtrl::GetValue() const
 
 void wxTextCtrl::SetValue(const wxString& value)
 {
 
 void wxTextCtrl::SetValue(const wxString& value)
 {

-    // This assert is wrong -- means that you can't set an empty
-    // string (IsNull == IsEmpty).
-    //    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;
 }
 


@@ -243,28 +263,28 @@ void wxTextCtrl::Replace(long from, long to, const wxString& 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)
 {
     if (!wxFileExists(file))
         return FALSE;
 }
 
 bool wxTextCtrl::LoadFile(const wxString& file)
 {
     if (!wxFileExists(file))
         return FALSE;

-    
+

     m_fileName = file;
     m_fileName = file;

-    
+

     Clear();
     Clear();

-    
+

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

-    
+

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


@@ -284,7 +304,7 @@ bool wxTextCtrl::LoadFile(const wxString& file)
         {
         }
         fclose (fp);
         {
         }
         fclose (fp);

-        
+

         text[len] = 0;
         XmTextSetString (textWidget, text);
         //      m_textPosition = len;
         text[len] = 0;
         XmTextSetString (textWidget, text);
         //      m_textPosition = len;


@@ -304,10 +324,10 @@ bool wxTextCtrl::SaveFile(const wxString& file)
     if (theFile == "")
         return FALSE;
     m_fileName = theFile;
     if (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")))
     {
         return FALSE;
     if (!(fp = fopen ((char*) (const char*) theFile, "w")))
     {
         return FALSE;


@@ -316,7 +336,7 @@ bool wxTextCtrl::SaveFile(const wxString& file)
     {
         char *text = XmTextGetString (textWidget);
         long len = XmTextGetLastPosition (textWidget);
     {
         char *text = XmTextGetString (textWidget);
         long len = XmTextGetLastPosition (textWidget);

-        
+

         if (fwrite (text, sizeof (char), len, fp) != (size_t) len)
         {
             // Did not write whole file
         if (fwrite (text, sizeof (char), len, fp) != (size_t) len)
         {
             // Did not write whole file


@@ -324,7 +344,7 @@ bool wxTextCtrl::SaveFile(const wxString& file)
         // Make sure newline terminates the file
         if (text[len - 1] != '\n')
             fputc ('\n', fp);
         // Make sure newline terminates the file
         if (text[len - 1] != '\n')
             fputc ('\n', fp);

-        
+

         fclose (fp);
         XtFree (text);
         m_modified = FALSE;
         fclose (fp);
         XtFree (text);
         m_modified = FALSE;


@@ -394,7 +414,7 @@ int wxTextCtrl::GetNumberOfLines() const
             else
                 i++;
         }
             else
                 i++;
         }

-        
+

         XtFree (s);
         return currentLine;
     }
         XtFree (s);
         return currentLine;
     }


@@ -412,7 +432,7 @@ long wxTextCtrl::XYToPosition(long x, long y) const
     /* 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


@@ -437,7 +457,7 @@ wxString wxTextCtrl::GetLineText(long lineNo) const
 {
     // HIDEOUSLY inefficient, but we have no choice.
     char *s = XmTextGetString ((Widget) m_mainWidget);
 {
     // HIDEOUSLY inefficient, but we have no choice.
     char *s = XmTextGetString ((Widget) m_mainWidget);

-    
+

     if (s)
     {
         wxString buf("");
     if (s)
     {
         wxString buf("");


@@ -450,7 +470,7 @@ wxString wxTextCtrl::GetLineText(long lineNo) const
             int j;
             for (j = 0; s[i] && s[i] != '\n'; i++, j++ )
                 buf += s[i];
             int j;
             for (j = 0; s[i] && s[i] != '\n'; i++, j++ )
                 buf += s[i];

-            
+

             XtFree(s);
             return buf;
     }
             XtFree(s);
             return buf;
     }


@@ -481,7 +501,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


@@ -495,17 +515,17 @@ int wxTextCtrl::overflow(int c)
         wxError("Streambuf allocation failed","Internal error");
         return 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;
     }
     // 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 get area
     setg(0,0,0);
     // Reset get area
     setg(0,0,0);

-    
+

     // Make sure there is a put area
     if ( ! pptr() )
     {
     // Make sure there is a put area
     if ( ! pptr() )
     {


@@ -513,18 +533,18 @@ int wxTextCtrl::overflow(int c)
         //    wxError("Put area not opened","Internal error");
         setp( base(), base() );
     }
         //    wxError("Put area not opened","Internal error");
         setp( base(), base() );
     }

-    
+

     // Determine how many characters have been inserted but no consumed
     int plen = pptr() - pbase();
     // 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.
     // 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;
     // 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];
     // Write temporary C-string to wxTextWindow
     {
         char *txt = new char[plen+xtra+1];


@@ -535,10 +555,10 @@ int wxTextCtrl::overflow(int c)
         WriteText(txt);
         delete[] txt;
     }
         WriteText(txt);
         delete[] txt;
     }

-    
+

     // Reset put area
     setp(pbase(), epptr());
     // Reset put area
     setp(pbase(), epptr());

-    
+

 #if defined(__WATCOMC__)
     return __NOT_EOF;
 #elif defined(zapeof)     // HP-UX (all cfront based?)
 #if defined(__WATCOMC__)
     return __NOT_EOF;
 #elif defined(zapeof)     // HP-UX (all cfront based?)


@@ -559,9 +579,9 @@ int wxTextCtrl::sync()
         wxError("Who's trespassing my get area?","Internal error");
         return EOF;
     }
         wxError("Who's trespassing my get area?","Internal error");
         return EOF;
     }

-    
+

     if ( pptr() && pptr() > pbase() ) return overflow(EOF);
     if ( pptr() && pptr() > pbase() ) return overflow(EOF);

-    
+

     return 0;
     /* OLD CODE
     int len = pptr() - pbase();
     return 0;
     /* OLD CODE
     int len = pptr() - pbase();


@@ -625,7 +645,7 @@ wxTextCtrl& wxTextCtrl::operator<<(long i)
 wxTextCtrl& wxTextCtrl::operator<<(const char c)
 {
     char buf[2];
 wxTextCtrl& wxTextCtrl::operator<<(const char c)
 {
     char buf[2];

-    
+

     buf[0] = c;
     buf[1] = 0;
     AppendText(buf);
     buf[0] = c;
     buf[1] = 0;
     AppendText(buf);


@@ -638,7 +658,7 @@ void wxTextCtrl::OnChar(wxKeyEvent& event)
     // we're letting default behaviour happen (otherwise it's vetoed
     // by virtue of overriding OnChar)
     m_processedDefault = TRUE;
     // we're letting default behaviour happen (otherwise it's vetoed
     // by virtue of overriding OnChar)
     m_processedDefault = TRUE;

-    
+

     if (m_tempCallbackStruct)
     {
         XmTextVerifyCallbackStruct *textStruct =
     if (m_tempCallbackStruct)
     {
         XmTextVerifyCallbackStruct *textStruct =


@@ -659,7 +679,7 @@ 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)
     */
     /* TODO: should scrollbars be affected? Should probably have separate
     * function to change them (by default, taken from wxSystemSettings)
     */


@@ -667,7 +687,7 @@ void wxTextCtrl::ChangeBackgroundColour()
     {
         Widget parent = XtParent ((Widget) m_mainWidget);
         Widget hsb, vsb;
     {
         Widget parent = XtParent ((Widget) m_mainWidget);
         Widget hsb, vsb;

-        
+

         XtVaGetValues (parent,
             XmNhorizontalScrollBar, &hsb,
             XmNverticalScrollBar, &vsb,
         XtVaGetValues (parent,
             XmNhorizontalScrollBar, &hsb,
             XmNverticalScrollBar, &vsb,


@@ -677,7 +697,7 @@ void wxTextCtrl::ChangeBackgroundColour()
             DoChangeBackgroundColour((WXWidget) hsb, backgroundColour, TRUE);
         if (vsb)
             DoChangeBackgroundColour((WXWidget) vsb, backgroundColour, TRUE);
             DoChangeBackgroundColour((WXWidget) hsb, backgroundColour, TRUE);
         if (vsb)
             DoChangeBackgroundColour((WXWidget) vsb, backgroundColour, TRUE);

-        
+

         DoChangeBackgroundColour((WXWidget) parent, m_backgroundColour, TRUE);
     }
 }
         DoChangeBackgroundColour((WXWidget) parent, m_backgroundColour, TRUE);
     }
 }


@@ -685,17 +705,17 @@ void wxTextCtrl::ChangeBackgroundColour()
 void wxTextCtrl::ChangeForegroundColour()
 {
     wxWindow::ChangeForegroundColour();
 void wxTextCtrl::ChangeForegroundColour()
 {
     wxWindow::ChangeForegroundColour();

-    
+

     if (m_windowStyle & wxTE_MULTILINE)
     {
         Widget parent = XtParent ((Widget) m_mainWidget);
         Widget hsb, vsb;
     if (m_windowStyle & wxTE_MULTILINE)
     {
         Widget parent = XtParent ((Widget) m_mainWidget);
         Widget hsb, vsb;

-        
+

         XtVaGetValues (parent,
             XmNhorizontalScrollBar, &hsb,
             XmNverticalScrollBar, &vsb,
             NULL);
         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)
             /* TODO: should scrollbars be affected? Should probably have separate
             * function to change them (by default, taken from wxSystemSettings)
             if (hsb)


@@ -712,33 +732,33 @@ static void wxTextWindowChangedProc (Widget w, XtPointer clientData, XtPointer p
     if (!wxGetWindowFromTable(w))
         // Widget has been deleted!
         return;
     if (!wxGetWindowFromTable(w))
         // Widget has been deleted!
         return;

-    
+

     wxTextCtrl *tw = (wxTextCtrl *) clientData;
     tw->SetModified(TRUE);
 }
 
     wxTextCtrl *tw = (wxTextCtrl *) clientData;
     tw->SetModified(TRUE);
 }
 

-static void 
+static void

 wxTextWindowModifyProc (Widget w, XtPointer clientData, XmTextVerifyCallbackStruct *cbs)
 {
     wxTextCtrl *tw = (wxTextCtrl *) clientData;
     tw->m_processedDefault = FALSE;
 wxTextWindowModifyProc (Widget w, XtPointer clientData, XmTextVerifyCallbackStruct *cbs)
 {
     wxTextCtrl *tw = (wxTextCtrl *) clientData;
     tw->m_processedDefault = FALSE;

-    
+

     // First, do some stuff if it's a password control.
     // (What does this do exactly?)
     // First, do some stuff if it's a password control.
     // (What does this do exactly?)

-    
+

     if (tw->GetWindowStyleFlag() & wxTE_PASSWORD)
     {
     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.
+        /* _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;
         if (tw->m_value.IsNull())
         {
             tw->m_value = cbs->text->ptr;


@@ -746,33 +766,33 @@ wxTextWindowModifyProc (Widget w, XtPointer clientData, XmTextVerifyCallbackStru
         else
         {
             char * passwd = (char*) (const char*) tw->m_value;  // Set up a more convenient alias.
         else
         {
             char * passwd = (char*) (const char*) tw->m_value;  // Set up a more convenient alias.

-            
+

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

-            
+

             char * newS = new char [len];
             char * p = passwd, * dest = newS, * insert = cbs->text->ptr;
             char * newS = new char [len];
             char * p = passwd, * dest = newS, * insert = cbs->text->ptr;

-            
+

             // Copy (old) text from passwd, up to the start posn of the change.
             int i;
             for (i = 0; i < cbs->startPos; ++i)
                 *dest++ = *p++;
             // Copy (old) text from passwd, up to the start posn of the change.
             int i;
             for (i = 0; i < cbs->startPos; ++i)
                 *dest++ = *p++;

-            
+

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

-            
+

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

-            
+

             tw->m_value = newS;
             tw->m_value = newS;

-            
+

             delete[] newS;
         }
             delete[] newS;
         }

-        
+

         if (cbs->text->length>0)
         {
             int i;
         if (cbs->text->length>0)
         {
             int i;


@@ -781,34 +801,34 @@ wxTextWindowModifyProc (Widget w, XtPointer clientData, XmTextVerifyCallbackStru
             cbs->text->ptr[i] = 0;
         }
     }
             cbs->text->ptr[i] = 0;
         }
     }

-    
+

     // If we're already within an OnChar, return: probably
     // a programmatic insertion.
     if (tw->m_tempCallbackStruct)
         return;
     // 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))
     {
         tw->m_tempCallbackStruct = (void*) cbs;
     // 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);
         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;
         // 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->GetEventHandler()->ProcessEvent(event);

-        
+

         tw->m_tempCallbackStruct = NULL;
         tw->m_tempCallbackStruct = NULL;

-        
+

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

-        
+

         if (tw->m_processedDefault)
         {
             // Can generate a command
         if (tw->m_processedDefault)
         {
             // Can generate a command


@@ -816,38 +836,38 @@ wxTextWindowModifyProc (Widget w, XtPointer clientData, XmTextVerifyCallbackStru
             commandEvent.SetEventObject(tw);
             tw->ProcessCommand(commandEvent);
         }
             commandEvent.SetEventObject(tw);
             tw->ProcessCommand(commandEvent);
         }

-        
+

         return;
     }
         return;
     }

-    
+

     // Pasting operation: let it through without
     // calling OnChar
     if (cbs->text->length > 1)
         return;
     // Pasting operation: let it through without
     // calling OnChar
     if (cbs->text->length > 1)
         return;

-    
+

     // Something other than text
     if (cbs->text->ptr == NULL)
         return;
     // Something other than text
     if (cbs->text->ptr == NULL)
         return;

-    
+

     tw->m_tempCallbackStruct = (void*) cbs;
     tw->m_tempCallbackStruct = (void*) cbs;

-    
+

     wxKeyEvent event (wxEVT_CHAR);
     event.SetId(tw->GetId());
     event.SetEventObject(tw);
     event.m_keyCode = (cbs->text->ptr[0] == 10 ? 13 : cbs->text->ptr[0]);
     wxKeyEvent event (wxEVT_CHAR);
     event.SetId(tw->GetId());
     event.SetEventObject(tw);
     event.m_keyCode = (cbs->text->ptr[0] == 10 ? 13 : cbs->text->ptr[0]);

-    
+

     // Only if wxTextCtrl::OnChar is called
     // will this be set to True (and the character
     // passed through)
     cbs->doit = False;
     // 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->GetEventHandler()->ProcessEvent(event);

-    
+

     tw->m_tempCallbackStruct = NULL;
     tw->m_tempCallbackStruct = NULL;

-    
+

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

-    
+

     if (tw->m_processedDefault)
     {
         // Can generate a command
     if (tw->m_processedDefault)
     {
         // Can generate a command


@@ -857,24 +877,28 @@ wxTextWindowModifyProc (Widget w, XtPointer clientData, XmTextVerifyCallbackStru
     }
 }
 
     }
 }
 

-static void 
+// ----------------------------------------------------------------------------
+// callbacks
+// ----------------------------------------------------------------------------
+
+static void

 wxTextWindowGainFocusProc (Widget w, XtPointer clientData, XmAnyCallbackStruct *cbs)
 {
     if (!wxGetWindowFromTable(w))
         return;
 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);
     tw->GetEventHandler()->ProcessEvent(event);
 }
 
     wxTextCtrl *tw = (wxTextCtrl *) clientData;
     wxFocusEvent event(wxEVT_SET_FOCUS, tw->GetId());
     event.SetEventObject(tw);
     tw->GetEventHandler()->ProcessEvent(event);
 }
 

-static void 
+static void

 wxTextWindowLoseFocusProc (Widget w, XtPointer clientData, XmAnyCallbackStruct *cbs)
 {
     if (!wxGetWindowFromTable(w))
         return;
 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);
     wxTextCtrl *tw = (wxTextCtrl *) clientData;
     wxFocusEvent event(wxEVT_KILL_FOCUS, tw->GetId());
     event.SetEventObject(tw);


@@ -886,21 +910,12 @@ static void wxTextWindowActivateProc(Widget w, XtPointer clientData,
 {
     if (!wxGetWindowFromTable(w))
         return;
 {
     if (!wxGetWindowFromTable(w))
         return;

-    
+

     wxTextCtrl *tw = (wxTextCtrl *) clientData;
     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;
     if (tw->InSetValue())
         return;

-    
+

     wxCommandEvent event(wxEVT_COMMAND_TEXT_ENTER);
     event.SetId(tw->GetId());
     event.SetEventObject(tw);
     wxCommandEvent event(wxEVT_COMMAND_TEXT_ENTER);
     event.SetId(tw->GetId());
     event.SetEventObject(tw);