// headers
// ----------------------------------------------------------------------------
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
#pragma implementation "textctrl.h"
#endif
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
#ifdef __VMS
#define XtParent XTPARENT
#endif
wxTextCtrl::wxTextCtrl()
{
m_tempCallbackStruct = (void*) NULL;
- m_modified = FALSE;
- m_processedDefault = FALSE;
+ m_modified = false;
+ m_processedDefault = false;
}
bool wxTextCtrl::Create(wxWindow *parent,
return false;
m_tempCallbackStruct = (void*) NULL;
- m_modified = FALSE;
- m_processedDefault = FALSE;
+ m_modified = false;
+ m_processedDefault = false;
m_backgroundColour = *wxWHITE;
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))
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);
-
- wxSize best = GetBestSize();
- if( size.x != -1 ) best.x = size.x;
- if( size.y != -1 ) best.y = size.y;
-
- SetCanAddEventHandler(TRUE);
AttachWidget (parent, m_mainWidget, (WXWidget) NULL,
- pos.x, pos.y, best.x, best.y);
+ pos.x, pos.y, size.x, size.y);
ChangeBackgroundColour();
- return TRUE;
+ return true;
}
WXWidget wxTextCtrl::GetTopWidget() const
return str;
}
-void wxTextCtrl::SetValue(const wxString& value)
+void wxTextCtrl::SetValue(const wxString& text)
{
- m_inSetValue = TRUE;
+ 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;
+ m_inSetValue = false;
}
// Clipboard operations
bool wxTextCtrl::CanUndo() const
{
// No Undo in Motif
- return FALSE;
+ return false;
}
bool wxTextCtrl::CanRedo() const
{
// No Redo in Motif
- return FALSE;
+ return false;
}
// If the return values from and to are the same, there is no
void wxTextCtrl::SetInsertionPointEnd()
{
- long pos = GetLastPosition();
+ wxTextPos pos = GetLastPosition();
SetInsertionPoint(pos);
}
return (long) XmTextGetInsertionPosition ((Widget) m_mainWidget);
}
-long wxTextCtrl::GetLastPosition() const
+wxTextPos wxTextCtrl::GetLastPosition() const
{
return (long) XmTextGetLastPosition ((Widget) m_mainWidget);
}
void wxTextCtrl::WriteText(const wxString& text)
{
- long textPosition = GetInsertionPoint() + strlen (text);
+ long textPosition = GetInsertionPoint() + text.length();
XmTextInsert ((Widget) m_mainWidget, GetInsertionPoint(),
wxConstCast(text.c_str(), char));
XtVaSetValues ((Widget) m_mainWidget, XmNcursorPosition, textPosition, NULL);
SetInsertionPoint(textPosition);
XmTextShowPosition ((Widget) m_mainWidget, textPosition);
- m_modified = TRUE;
+ m_modified = true;
}
void wxTextCtrl::AppendText(const wxString& text)
{
- long textPosition = GetLastPosition() + strlen(text);
+ wxTextPos textPosition = GetLastPosition() + text.length();
XmTextInsert ((Widget) m_mainWidget, GetLastPosition(),
wxConstCast(text.c_str(), char));
XtVaSetValues ((Widget) m_mainWidget, XmNcursorPosition, textPosition, NULL);
SetInsertionPoint(textPosition);
XmTextShowPosition ((Widget) m_mainWidget, textPosition);
- m_modified = TRUE;
+ m_modified = true;
}
void wxTextCtrl::Clear()
{
XmTextSetString ((Widget) m_mainWidget, "");
- m_modified = FALSE;
+ m_modified = false;
}
bool wxTextCtrl::IsModified() const
return m_modified;
}
-// Makes 'unmodified'
+// Makes modified or unmodified
+void wxTextCtrl::MarkDirty()
+{
+ m_modified = true;
+}
+
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++;
if ( y )
*y = yy;
- return TRUE;
+ return true;
}
void wxTextCtrl::ShowPosition(long pos)
// 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)
{
NULL);
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);
// MBN: why change parent background?
- // DoChangeBackgroundColour((WXWidget) parent, m_backgroundColour, TRUE);
+ // DoChangeBackgroundColour((WXWidget) parent, m_backgroundColour, true);
}
}
if (vsb)
DoChangeForegroundColour((WXWidget) vsb, m_foregroundColour);
*/
- DoChangeForegroundColour((WXWidget) parent, m_foregroundColour);
+ wxDoChangeForegroundColour((WXWidget) parent, m_foregroundColour);
}
}
return wxSize( x + 2 * xmargin + 2 * highlight + 2 * shadow,
// MBN: +2 necessary: Lesstif bug or mine?
- y + 2 * ymargin + 2 * highlight + 2 * shadow + 2 );
+ y + 2 * ymargin + 2 * highlight + 2 * shadow + 2 );
}
wxSize wxTextCtrl::DoGetBestSize() const
{
if( IsSingleLine() )
- return wxDoGetSingleTextCtrlBestSize( (Widget)m_mainWidget, this );
+ {
+ wxSize best = wxControl::DoGetBestSize();
+
+ if( best.x < 110 ) best.x = 110;
+
+ return best;
+ }
else
return wxWindow::DoGetBestSize();
}
return;
wxTextCtrl *tw = (wxTextCtrl *) clientData;
- tw->SetModified(TRUE);
+ tw->SetModified(true);
}
static void
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
projects / wxWidgets.git / blobdiff