/////////////////////////////////////////////////////////////////////////////
-// Name: textctrl.cpp
+// Name: src/motif/textctrl.cpp
// Purpose: wxTextCtrl
// Author: Julian Smart
// Modified by:
// headers
// ----------------------------------------------------------------------------
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
- #pragma implementation "textctrl.h"
-#endif
-
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#define XtParent XTPARENT
#endif
-#include "wx/defs.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/utils.h"
#ifdef __VMS__
#pragma message disable nosimpint
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)
{
if( !CreateControl( parent, id, pos, size, style, validator, name ) )
return false;
+ PreCreation();
m_tempCallbackStruct = (void*) NULL;
m_modified = false;
m_processedDefault = false;
- m_backgroundColour = *wxWHITE;
-
Widget parentWidget = (Widget) parent->GetClientWidget();
Bool wantHorizScroll = (m_windowStyle & wxHSCROLL) != 0 ? True : False;
Arg args[8];
int count = 0;
XtSetArg (args[count], XmNscrollHorizontal, wantHorizScroll); ++count;
- XtSetArg (args[count], (String) wxFont::GetFontTag(),
- m_font.GetFontType( XtDisplay(parentWidget) ) ); ++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, value.c_str()); ++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,
- wxConstCast(name.c_str(), char),
+ name.char_str(),
args, count);
XtManageChild ((Widget) m_mainWidget);
{
m_mainWidget = (WXWidget)XtVaCreateManagedWidget
(
- wxConstCast(name.c_str(), char),
+ name.mb_str(),
xmTextWidgetClass,
parentWidget,
wxFont::GetFontTag(), m_font.GetFontType( XtDisplay(parentWidget) ),
- XmNvalue, value.c_str(),
+ 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);
XtAddCallback((Widget) m_mainWidget, XmNlosingFocusCallback, (XtCallbackProc)wxTextWindowLoseFocusProc, (XtPointer)this);
+ PostCreation();
AttachWidget (parent, m_mainWidget, (WXWidget) NULL,
pos.x, pos.y, size.x, size.y);
- ChangeBackgroundColour();
-
return true;
}
return str;
}
-void wxTextCtrl::SetValue(const wxString& text)
+void wxTextCtrl::DoSetValue(const wxString& text, int flags)
{
m_inSetValue = true;
- XmTextSetString ((Widget) m_mainWidget, wxConstCast(text.c_str(), char));
+ XmTextSetString ((Widget) m_mainWidget, text.char_str());
XtVaSetValues ((Widget) m_mainWidget,
XmNcursorPosition, text.length(),
NULL);
SetInsertionPoint(text.length());
XmTextShowPosition ((Widget) m_mainWidget, text.length());
- m_modified = TRUE;
+ m_modified = true;
m_inSetValue = false;
+
+ if ( flags & SetValue_SendEvent )
+ SendTextUpdatedEvent();
}
// Clipboard operations
void wxTextCtrl::Replace(long from, long to, const wxString& value)
{
XmTextReplace ((Widget) m_mainWidget, (XmTextPosition) from, (XmTextPosition) to,
- wxConstCast(value.c_str(), char));
+ value.char_str());
}
void wxTextCtrl::Remove(long from, long to)
{
long textPosition = GetInsertionPoint() + text.length();
XmTextInsert ((Widget) m_mainWidget, GetInsertionPoint(),
- wxConstCast(text.c_str(), char));
+ text.char_str());
XtVaSetValues ((Widget) m_mainWidget, XmNcursorPosition, textPosition, NULL);
SetInsertionPoint(textPosition);
XmTextShowPosition ((Widget) m_mainWidget, textPosition);
{
wxTextPos textPosition = GetLastPosition() + text.length();
XmTextInsert ((Widget) m_mainWidget, GetLastPosition(),
- wxConstCast(text.c_str(), char));
+ text.char_str());
XtVaSetValues ((Widget) m_mainWidget, XmNcursorPosition, textPosition, NULL);
SetInsertionPoint(textPosition);
XmTextShowPosition ((Widget) m_mainWidget, textPosition);
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++ )
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);
}
}
}
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?
if( IsSingleLine() )
{
wxSize best = wxControl::DoGetBestSize();
-
- if( best.x < 110 ) best.x = 110;
+#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();