/////////////////////////////////////////////////////////////////////////////
-// 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)
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,
- 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;
+ 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], 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),
+ args, count);
+
XtManageChild ((Widget) m_mainWidget);
}
else
wxConstCast(name.c_str(), char),
xmTextWidgetClass,
parentWidget,
+ wxFont::GetFontTag(), m_font.GetFontType( XtDisplay(parentWidget) ),
+ XmNvalue, value.c_str(),
+ XmNeditable, (style & wxTE_READONLY) ?
+ False : True,
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;
- 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.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);
XtAddCallback((Widget) m_mainWidget, XmNlosingFocusCallback, (XtCallbackProc)wxTextWindowLoseFocusProc, (XtPointer)this);
- // font
- ChangeFont(false);
-
AttachWidget (parent, m_mainWidget, (WXWidget) NULL,
pos.x, pos.y, size.x, size.y);
return str;
}
-void wxTextCtrl::SetValue(const wxString& value)
+void wxTextCtrl::SetValue(const wxString& text)
{
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, wxConstCast(text.c_str(), char));
+ XtVaSetValues ((Widget) m_mainWidget,
+ XmNcursorPosition, text.length(),
NULL);
-#endif
- Clear();
- AppendText( value );
+ SetInsertionPoint(text.length());
+ XmTextShowPosition ((Widget) m_mainWidget, text.length());
+ m_modified = true;
m_inSetValue = false;
}
void wxTextCtrl::Clear()
{
- XmTextSetString ((Widget) m_mainWidget, "");
+ XmTextSetString ((Widget) m_mainWidget, wxMOTIF_STR(""));
m_modified = false;
}
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);
}
}
}
NULL );
if( !value )
- value = "|";
+ value = wxMOTIF_STR("|");
int x, y;
window->GetTextExtent( value, &x, &y );
- if( x < 100 ) x = 100;
+ if( x < 100 )
+ x = 100;
return wxSize( x + 2 * xmargin + 2 * highlight + 2 * shadow,
// MBN: +2 necessary: Lesstif bug or mine?
projects / wxWidgets.git / blobdiff