// Created: 17/09/98
// RCS-ID: $Id$
// Copyright: (c) Julian Smart
-// Licence: wxWindows licence
+// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+
#ifdef __GNUG__
-#pragma implementation "textctrl.h"
+ #pragma implementation "textctrl.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"
-#if defined(__BORLANDC__) && !defined(__WIN32__)
-#include <alloc.h>
-#else
-#ifndef __GNUWIN32__
-#include <malloc.h>
-#endif
-#endif
-
#include <Xm/Text.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <ctype.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
-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
+// ============================================================================
+// implementation
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// wxTextCtrl
+// ----------------------------------------------------------------------------
+
// Text item
wxTextCtrl::wxTextCtrl()
#ifndef NO_TEXT_WINDOW_STREAM
-:streambuf()
+ : streambuf()
#endif
{
- m_fileName = "";
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 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;
- m_fileName = "";
// m_backgroundColour = parent->GetBackgroundColour();
m_backgroundColour = * wxWHITE;
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_windowId = (int)NewControlId();
else
m_windowId = id;
-
+
Widget parentWidget = (Widget) parent->GetClientWidget();
-
+
bool wantHorizScrolling = ((m_windowStyle & wxHSCROLL) != 0);
-
+
// 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);
-
- 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,
- 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
{
- 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();
- 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, XmNactivateCallback, (XtCallbackProc)wxTextWindowActivateProc, (XtPointer)this);
-
+
XtAddCallback((Widget) m_mainWidget, XmNfocusCallback, (XtCallbackProc)wxTextWindowGainFocusProc, (XtPointer)this);
-
+
XtAddCallback((Widget) m_mainWidget, XmNlosingFocusCallback, (XtCallbackProc)wxTextWindowLoseFocusProc, (XtPointer)this);
-
- m_windowFont = parent->GetFont();
+
+ // font
+ m_font = parent->GetFont();
ChangeFont(FALSE);
-
+
SetCanAddEventHandler(TRUE);
AttachWidget (parent, m_mainWidget, (WXWidget) NULL, pos.x, pos.y, size.x, size.y);
-
+
ChangeBackgroundColour();
-
+
return TRUE;
}
wxString wxTextCtrl::GetValue() const
{
+ wxString str; // result
+
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
{
+ // just get the string from Motif
char *s = XmTextGetString ((Widget) m_mainWidget);
- if (s)
+ if ( s )
{
- wxString str(s);
+ str = 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)
{
- // 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;
-
- XmTextSetString ((Widget) m_mainWidget, (char*) (const char*) value);
-
+
+ XmTextSetString ((Widget) m_mainWidget, (char*)value.c_str());
+
m_inSetValue = FALSE;
}
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::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,
- (Time) 0);
+ (Time) 0);
}
bool wxTextCtrl::LoadFile(const wxString& file)
{
if (!wxFileExists(file))
return FALSE;
-
+
m_fileName = file;
-
+
Clear();
-
+
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")))
{
}
fclose (fp);
-
+
text[len] = 0;
XmTextSetString (textWidget, text);
// m_textPosition = len;
if (theFile == "")
return FALSE;
m_fileName = theFile;
-
+
Widget textWidget = (Widget) m_mainWidget;
FILE *fp;
-
+
if (!(fp = fopen ((char*) (const char*) theFile, "w")))
{
return FALSE;
{
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;
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, "");
// Makes 'unmodified'
void wxTextCtrl::DiscardEdits()
{
- XmTextSetString ((Widget) m_mainWidget, "");
m_modified = FALSE;
}
else
i++;
}
-
+
XtFree (s);
return currentLine;
}
/* 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
{
// HIDEOUSLY inefficient, but we have no choice.
char *s = XmTextGetString ((Widget) m_mainWidget);
-
+
if (s)
{
wxString buf("");
int j;
for (j = 0; s[i] && s[i] != '\n'; i++, j++ )
buf += s[i];
-
+
XtFree(s);
return buf;
}
// 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
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 get area
setg(0,0,0);
-
+
// Make sure there is a put area
if ( ! pptr() )
{
// 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];
WriteText(txt);
delete[] txt;
}
-
+
// Reset put area
setp(pbase(), epptr());
-
+
#if defined(__WATCOMC__)
return __NOT_EOF;
#elif defined(zapeof) // HP-UX (all cfront based?)
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();
wxTextCtrl& wxTextCtrl::operator<<(const wxString& s)
{
- WriteText(s);
+ AppendText(s);
return *this;
}
{
wxString str;
str.Printf("%.2f", f);
- WriteText(str);
+ AppendText(str);
return *this;
}
{
wxString str;
str.Printf("%.2f", d);
- WriteText(str);
+ AppendText(str);
return *this;
}
{
wxString str;
str.Printf("%d", i);
- WriteText(str);
+ AppendText(str);
return *this;
}
{
wxString str;
str.Printf("%ld", i);
- WriteText(str);
+ AppendText(str);
return *this;
}
wxTextCtrl& wxTextCtrl::operator<<(const char c)
{
char buf[2];
-
+
buf[0] = c;
buf[1] = 0;
- WriteText(buf);
+ AppendText(buf);
return *this;
}
// we're letting default behaviour happen (otherwise it's vetoed
// by virtue of overriding OnChar)
m_processedDefault = TRUE;
-
+
if (m_tempCallbackStruct)
{
XmTextVerifyCallbackStruct *textStruct =
void wxTextCtrl::ChangeBackgroundColour()
{
wxWindow::ChangeBackgroundColour();
-
+
/* TODO: should scrollbars be affected? Should probably have separate
* function to change them (by default, taken from wxSystemSettings)
*/
{
Widget parent = XtParent ((Widget) m_mainWidget);
Widget hsb, vsb;
-
+
XtVaGetValues (parent,
XmNhorizontalScrollBar, &hsb,
XmNverticalScrollBar, &vsb,
DoChangeBackgroundColour((WXWidget) hsb, backgroundColour, TRUE);
if (vsb)
DoChangeBackgroundColour((WXWidget) vsb, backgroundColour, TRUE);
-
+
DoChangeBackgroundColour((WXWidget) parent, m_backgroundColour, TRUE);
}
}
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)
}
}
-static void wxTextWindowChangedProc (Widget w, XtPointer clientData, XtPointer ptr)
+void wxTextCtrl::DoSendEvents(void *wxcbs, long keycode)
+{
+ // we're in process of updating the text control
+ m_tempCallbackStruct = wxcbs;
+
+ 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;
+}
+
+// ----------------------------------------------------------------------------
+// helpers and Motif callbacks
+// ----------------------------------------------------------------------------
+
+static void MergeChangesIntoString(wxString& value,
+ XmTextVerifyCallbackStruct *cbs)
+{
+ /* _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();
+
+ 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 * dest = newS,
+ * insert = cbs->text->ptr;
+
+ // 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++;
+
+ // 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;
+
+ value = newS;
+
+ delete[] newS;
+ }
+}
+
+static void
+wxTextWindowChangedProc (Widget w, XtPointer clientData, XtPointer ptr)
{
if (!wxGetWindowFromTable(w))
// Widget has been deleted!
return;
-
+
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;
-
- // First, do some stuff if it's a password control.
- // (What does this do exactly?)
-
- if (tw->GetWindowStyleFlag() & wxTE_PASSWORD)
+
+ // 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 )
{
- /* _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.
-
- 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;
-
- // 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++;
-
- // 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;
-
- delete[] newS;
- }
-
- if (cbs->text->length>0)
+ MergeChangesIntoString(tw->m_value, cbs);
+
+ if ( cbs->text->length > 0 )
{
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))
{
- 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;
}
-
- // Pasting operation: let it through without
- // calling OnChar
+
+ // Pasting operation: let it through without calling OnChar
if (cbs->text->length > 1)
return;
-
+
// Something other than text
if (cbs->text->ptr == NULL)
return;
-
- 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]);
-
- // 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);
- }
+
+ // normal key press
+ char ch = cbs->text->ptr[0];
+ tw->DoSendEvents((void *)cbs, ch == '\n' ? '\r' : ch);
}
-static void
+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);
tw->GetEventHandler()->ProcessEvent(event);
}
-static void
+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);
{
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::OnCut(wxCommandEvent& WXUNUSED(event))
+{
+ Cut();
+}
+
+void wxTextCtrl::OnCopy(wxCommandEvent& WXUNUSED(event))
+{
+ Copy();
+}
+
+void wxTextCtrl::OnPaste(wxCommandEvent& WXUNUSED(event))
+{
+ Paste();
+}
+
+void wxTextCtrl::OnUndo(wxCommandEvent& WXUNUSED(event))
+{
+ Undo();
+}
+
+void wxTextCtrl::OnRedo(wxCommandEvent& WXUNUSED(event))
+{
+ Redo();
+}
+
+void wxTextCtrl::OnUpdateCut(wxUpdateUIEvent& event)
+{
+ event.Enable( CanCut() );
+}
+
+void wxTextCtrl::OnUpdateCopy(wxUpdateUIEvent& event)
+{
+ event.Enable( CanCopy() );
+}
+
+void wxTextCtrl::OnUpdatePaste(wxUpdateUIEvent& event)
+{
+ event.Enable( CanPaste() );
+}
+
+void wxTextCtrl::OnUpdateUndo(wxUpdateUIEvent& event)
+{
+ event.Enable( CanUndo() );
+}
+
+void wxTextCtrl::OnUpdateRedo(wxUpdateUIEvent& event)
+{
+ event.Enable( CanRedo() );
+}
projects / wxWidgets.git / blobdiff