/////////////////////////////////////////////////////////////////////////////
-// Name: textctrl.cpp
+// Name: src/motif/textctrl.cpp
// Purpose: wxTextCtrl
// Author: Julian Smart
// Modified by:
// headers
// ----------------------------------------------------------------------------
-#ifdef __GNUG__
- #pragma implementation "textctrl.h"
-#endif
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
#include <sys/types.h>
#include <sys/stat.h>
-#include <fstream.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/utils.h"
+#ifdef __VMS__
+#pragma message disable nosimpint
+#endif
#include <Xm/Text.h>
+#ifdef __VMS__
+#pragma message enable nosimpint
+#endif
#include "wx/motif/private.h"
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, wxTextCtrlBase)
- BEGIN_EVENT_TABLE(wxTextCtrl, wxControl)
+ BEGIN_EVENT_TABLE(wxTextCtrl, wxTextCtrlBase)
EVT_DROP_FILES(wxTextCtrl::OnDropFiles)
EVT_CHAR(wxTextCtrl::OnChar)
EVT_UPDATE_UI(wxID_REDO, wxTextCtrl::OnUpdateRedo)
END_EVENT_TABLE()
-#endif
// ============================================================================
// implementation
// Text item
wxTextCtrl::wxTextCtrl()
-#ifndef NO_TEXT_WINDOW_STREAM
- : streambuf()
-#endif
{
m_tempCallbackStruct = (void*) NULL;
- m_modified = FALSE;
- m_processedDefault = FALSE;
+ m_modified = false;
+ m_processedDefault = false;
}
bool wxTextCtrl::Create(wxWindow *parent,
const wxValidator& validator,
const wxString& name)
{
- m_tempCallbackStruct = (void*) NULL;
- m_modified = FALSE;
- m_processedDefault = FALSE;
- // m_backgroundColour = parent->GetBackgroundColour();
- m_backgroundColour = * wxWHITE;
- m_foregroundColour = parent->GetForegroundColour();
-
- SetName(name);
- SetValidator(validator);
- if (parent)
- parent->AddChild(this);
+ if( !CreateControl( parent, id, pos, size, style, validator, name ) )
+ return false;
+ PreCreation();
- m_windowStyle = style;
-
- if ( id == -1 )
- m_windowId = (int)NewControlId();
- else
- m_windowId = id;
+ m_tempCallbackStruct = (void*) NULL;
+ m_modified = false;
+ m_processedDefault = false;
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.
- 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)
{
- Arg args[2];
- XtSetArg (args[0], XmNscrollHorizontal, wantHorizScrolling ? True : False);
- XtSetArg (args[1], XmNwordWrap, wantWordWrap ? True : False);
-
- 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);
+ 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
(
- (char*)name.c_str(),
+ name.mb_str(),
xmTextWidgetClass,
parentWidget,
+ wxFont::GetFontTag(), m_font.GetFontType( XtDisplay(parentWidget) ),
+ XmNvalue, (const char*)value.mb_str(),
+ XmNeditable, (style & wxTE_READONLY) ?
+ False : True,
NULL
);
+#if 0
// 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);
+#endif
}
// remove border if asked for
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, XmNlosingFocusCallback, (XtCallbackProc)wxTextWindowLoseFocusProc, (XtPointer)this);
- // font
- m_windowFont = parent->GetFont();
- ChangeFont(FALSE);
+ PostCreation();
+ 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();
-
- return TRUE;
+ return true;
}
WXWidget wxTextCtrl::GetTopWidget() const
{
- return ((m_windowStyle & wxTE_MULTILINE) ? (WXWidget) XtParent((Widget) m_mainWidget) : m_mainWidget);
+ return IsMultiLine() ? (WXWidget)XtParent((Widget)m_mainWidget)
+ : m_mainWidget;
}
wxString wxTextCtrl::GetValue() const
}
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 )
{
return str;
}
-void wxTextCtrl::SetValue(const wxString& value)
-{
- m_inSetValue = TRUE;
-
- XmTextSetString ((Widget) m_mainWidget, (char*)value.c_str());
-
- m_inSetValue = FALSE;
-}
-
-// Clipboard operations
-void wxTextCtrl::Copy()
+void wxTextCtrl::DoSetValue(const wxString& text, int flags)
{
- XmTextCopy((Widget) m_mainWidget, CurrentTime);
-}
+ m_inSetValue = true;
-void wxTextCtrl::Cut()
-{
- XmTextCut((Widget) m_mainWidget, CurrentTime);
-}
+ XmTextSetString ((Widget) m_mainWidget, text.char_str());
+ XtVaSetValues ((Widget) m_mainWidget,
+ XmNcursorPosition, text.length(),
+ NULL);
-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) ;
-}
+ SetInsertionPoint(text.length());
+ XmTextShowPosition ((Widget) m_mainWidget, text.length());
+ m_modified = true;
-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;
-}
+ m_inSetValue = 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,
- (char*) (const char*) value);
-}
-
-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)
-{
- XmTextSetSelection ((Widget) m_mainWidget, (XmTextPosition) from, (XmTextPosition) to,
- (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")))
- {
- return FALSE;
- }
- 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;
- }
+ if ( flags & SetValue_SendEvent )
+ SendTextUpdatedEvent();
}
-// If file is null, try saved file name first
-// Returns TRUE if succeeds.
-bool wxTextCtrl::SaveFile(const wxString& file)
-{
- wxString theFile(file);
- if (theFile == "")
- theFile = m_fileName;
- if (theFile == "")
- return FALSE;
- m_fileName = theFile;
-
- Widget textWidget = (Widget) m_mainWidget;
- FILE *fp;
-
- if (!(fp = fopen ((char*) (const char*) theFile, "w")))
- {
- return FALSE;
- }
- 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;
- }
-}
-
-void wxTextCtrl::WriteText(const wxString& text)
-{
- long textPosition = GetInsertionPoint() + strlen (text);
- XmTextInsert ((Widget) m_mainWidget, GetInsertionPoint(), (char*) (const char*) text);
- 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() + 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()
+bool wxTextCtrl::IsModified() const
{
- XmTextSetString ((Widget) m_mainWidget, "");
- m_modified = FALSE;
+ return m_modified;
}
-bool wxTextCtrl::IsModified() const
+// Makes modified or unmodified
+void wxTextCtrl::MarkDirty()
{
- return m_modified;
+ m_modified = true;
}
-// Makes 'unmodified'
void wxTextCtrl::DiscardEdits()
{
- m_modified = FALSE;
+ m_modified = false;
}
int wxTextCtrl::GetNumberOfLines() const
{
long i = 0;
int currentLine = 0;
- bool finished = FALSE;
+ bool finished = false;
while (!finished)
{
int ch = s[i];
}
else if (ch == 0)
{
- finished = TRUE;
+ finished = true;
}
else
i++;
return r+x;
}
-void wxTextCtrl::PositionToXY(long pos, long *x, long *y) const
+bool wxTextCtrl::PositionToXY(long pos, long *x, long *y) const
{
Position xx, yy;
XmTextPosToXY((Widget) m_mainWidget, pos, &xx, &yy);
- *x = xx; *y = yy;
+ if ( x )
+ *x = xx;
+ if ( y )
+ *y = yy;
+
+ return true;
}
void wxTextCtrl::ShowPosition(long pos)
int wxTextCtrl::GetLineLength(long lineNo) const
{
wxString str = GetLineText (lineNo);
- return (int) str.Length();
+ return (int) str.length();
}
wxString wxTextCtrl::GetLineText(long lineNo) const
if (s)
{
- wxString buf("");
+ wxString buf;
long i;
int currentLine = 0;
for (i = 0; currentLine != lineNo && s[i]; i++ )
}
}
-// The streambuf code was partly taken from chapter 3 by Jerry Schwarz of
-// AT&T's "C++ Lanuage System Release 3.0 Library Manual" - Stein Somers
-
-//=========================================================================
-// 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
-// Borland. See note in wb_text.h.
-#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("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() )
- {
- /* 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__)
- return __NOT_EOF;
-#elif defined(zapeof) // HP-UX (all cfront based?)
- return zapeof(c);
-#else
- return c!=EOF ? c : 0; // this should make everybody happy
-#endif
-}
-
-//=========================================================================
-// called then "endl" is output (gcc) or then explicit sync is done (Borland)
-//=========================================================================
-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;
- */
-}
-
-//=========================================================================
-// Should not be called by a "ostream". Used by a "istream"
-//=========================================================================
-int wxTextCtrl::underflow()
-{
- return EOF;
-}
-#endif
-
-wxTextCtrl& wxTextCtrl::operator<<(const wxString& s)
-{
- AppendText(s);
- return *this;
-}
-
-wxTextCtrl& wxTextCtrl::operator<<(float f)
-{
- wxString str;
- str.Printf("%.2f", f);
- AppendText(str);
- return *this;
-}
-
-wxTextCtrl& wxTextCtrl::operator<<(double d)
-{
- wxString str;
- str.Printf("%.2f", d);
- AppendText(str);
- return *this;
-}
-
-wxTextCtrl& wxTextCtrl::operator<<(int i)
-{
- wxString str;
- str.Printf("%d", i);
- AppendText(str);
- return *this;
-}
-
-wxTextCtrl& wxTextCtrl::operator<<(long i)
-{
- wxString str;
- str.Printf("%ld", i);
- AppendText(str);
- return *this;
-}
-
-wxTextCtrl& wxTextCtrl::operator<<(const char c)
-{
- char buf[2];
-
- buf[0] = c;
- buf[1] = 0;
- AppendText(buf);
- 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;
+ m_processedDefault = true;
if (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);
+ textStruct->text->ptr[0] = (char)((event.m_keyCode == WXK_RETURN) ? 10 : event.m_keyCode);
}
}
}
XmNhorizontalScrollBar, &hsb,
XmNverticalScrollBar, &vsb,
NULL);
- wxColour backgroundColour = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE);
+ wxColour backgroundColour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE);
if (hsb)
- DoChangeBackgroundColour((WXWidget) hsb, backgroundColour, TRUE);
+ wxDoChangeBackgroundColour((WXWidget) hsb, backgroundColour, true);
if (vsb)
- DoChangeBackgroundColour((WXWidget) vsb, backgroundColour, TRUE);
+ wxDoChangeBackgroundColour((WXWidget) vsb, backgroundColour, true);
- DoChangeBackgroundColour((WXWidget) parent, m_backgroundColour, TRUE);
+ // MBN: why change parent background?
+ // DoChangeBackgroundColour((WXWidget) parent, m_backgroundColour, true);
}
}
if (vsb)
DoChangeForegroundColour((WXWidget) vsb, m_foregroundColour);
*/
- DoChangeForegroundColour((WXWidget) parent, m_foregroundColour);
+ wxDoChangeForegroundColour((WXWidget) parent, m_foregroundColour);
}
}
// the character passed through)
cbs->doit = False;
- GetEventHandler()->ProcessEvent(event);
+ HandleWindowEvent(event);
if ( !InSetValue() && m_processedDefault )
{
m_tempCallbackStruct = NULL;
}
+wxSize wxDoGetSingleTextCtrlBestSize( Widget textWidget,
+ const wxWindow* window )
+{
+ Dimension xmargin, ymargin, highlight, shadow;
+ char* value;
+
+ XtVaGetValues( textWidget,
+ XmNmarginWidth, &xmargin,
+ XmNmarginHeight, &ymargin,
+ XmNvalue, &value,
+ XmNhighlightThickness, &highlight,
+ XmNshadowThickness, &shadow,
+ NULL );
+
+ if( !value )
+ value = wxMOTIF_STR("|");
+
+ int x, y;
+ window->GetTextExtent( value, &x, &y );
+
+ if( x < 90 )
+ x = 90;
+
+ return wxSize( x + 2 * xmargin + 2 * highlight + 2 * shadow,
+ // MBN: +2 necessary: Lesstif bug or mine?
+ y + 2 * ymargin + 2 * highlight + 2 * shadow + 2 );
+}
+
+wxSize wxTextCtrl::DoGetBestSize() const
+{
+ if( IsSingleLine() )
+ {
+ 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();
+}
+
// ----------------------------------------------------------------------------
// helpers and Motif callbacks
// ----------------------------------------------------------------------------
const char * const passwd = value;
int len = value.length();
- len += strlen(cbs->text->ptr) + 1; // + new text (if any) + NUL
+ len += ( cbs->text->ptr ?
+ strlen(cbs->text->ptr) :
+ 0 ) + 1; // + new text (if any) + NUL
len -= cbs->endPos - cbs->startPos; // - text from affected region.
char * newS = new char [len];
*dest++ = *p++;
// Copy the text to be inserted).
- while (*insert)
- *dest++ = *insert++;
+ if (insert)
+ while (*insert)
+ *dest++ = *insert++;
// Finally, copy into newS any remaining text from passwd[endPos] on.
for (p = passwd + cbs->endPos; *p; )
}
static void
-wxTextWindowChangedProc (Widget w, XtPointer clientData, XtPointer ptr)
+wxTextWindowChangedProc (Widget w, XtPointer clientData, XtPointer WXUNUSED(ptr))
{
if (!wxGetWindowFromTable(w))
// Widget has been deleted!
return;
wxTextCtrl *tw = (wxTextCtrl *) clientData;
- tw->SetModified(TRUE);
+ tw->SetModified(true);
}
static void
-wxTextWindowModifyProc (Widget w, XtPointer clientData, XmTextVerifyCallbackStruct *cbs)
+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
}
}
+ if(tw->InSetValue())
+ return;
+
// If we're already within an OnChar, return: probably a programmatic
// insertion.
if (tw->m_tempCallbackStruct)
}
static void
-wxTextWindowGainFocusProc (Widget w, XtPointer clientData, XmAnyCallbackStruct *cbs)
+wxTextWindowGainFocusProc (Widget w, XtPointer clientData, XmAnyCallbackStruct *WXUNUSED(cbs))
{
if (!wxGetWindowFromTable(w))
return;
wxTextCtrl *tw = (wxTextCtrl *) clientData;
wxFocusEvent event(wxEVT_SET_FOCUS, tw->GetId());
event.SetEventObject(tw);
- tw->GetEventHandler()->ProcessEvent(event);
+ tw->HandleWindowEvent(event);
}
static void
-wxTextWindowLoseFocusProc (Widget w, XtPointer clientData, XmAnyCallbackStruct *cbs)
+wxTextWindowLoseFocusProc (Widget w, XtPointer clientData, XmAnyCallbackStruct *WXUNUSED(cbs))
{
if (!wxGetWindowFromTable(w))
return;
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,
- XmAnyCallbackStruct *ptr)
+ XmAnyCallbackStruct *WXUNUSED(ptr))
{
if (!wxGetWindowFromTable(w))
return;
projects / wxWidgets.git / blobdiff