projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added a trivial test for wxString stream insertion operators
[wxWidgets.git]
/
src
/
motif
/
textctrl.cpp
diff --git
a/src/motif/textctrl.cpp
b/src/motif/textctrl.cpp
index ef011a5056cb6e140e087dc82b23b38a477a35a8..82624d53e85b0aab7b74c088733c95a0f5279125 100644
(file)
--- a/
src/motif/textctrl.cpp
+++ b/
src/motif/textctrl.cpp
@@
-24,16
+24,18
@@
#define XtParent XTPARENT
#endif
#define XtParent XTPARENT
#endif
-#include "wx/defs.h"
-
#include <sys/types.h>
#include <sys/stat.h>
#include <ctype.h>
#include "wx/textctrl.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/filefn.h"
-#include "wx/utils.h"
#ifdef __VMS__
#pragma message disable nosimpint
#ifdef __VMS__
#pragma message disable nosimpint
@@
-61,9
+63,9
@@
static void wxTextWindowGainFocusProc(Widget w, XtPointer clientData, XmAnyCallb
static void wxTextWindowLoseFocusProc(Widget w, XtPointer clientData, XmAnyCallbackStruct *cbs);
static void wxTextWindowActivateProc(Widget w, XtPointer clientData, XmAnyCallbackStruct *ptr);
static void wxTextWindowLoseFocusProc(Widget w, XtPointer clientData, XmAnyCallbackStruct *cbs);
static void wxTextWindowActivateProc(Widget w, XtPointer clientData, XmAnyCallbackStruct *ptr);
- IMPLEMENT_DYNAMIC_CLASS(wxTextCtrl, wx
Control
)
+ IMPLEMENT_DYNAMIC_CLASS(wxTextCtrl, wx
TextCtrlBase
)
- BEGIN_EVENT_TABLE(wxTextCtrl, wx
Control
)
+ BEGIN_EVENT_TABLE(wxTextCtrl, wx
TextCtrlBase
)
EVT_DROP_FILES(wxTextCtrl::OnDropFiles)
EVT_CHAR(wxTextCtrl::OnChar)
EVT_DROP_FILES(wxTextCtrl::OnDropFiles)
EVT_CHAR(wxTextCtrl::OnChar)
@@
-108,13
+110,12
@@
bool wxTextCtrl::Create(wxWindow *parent,
{
if( !CreateControl( parent, id, pos, size, style, validator, name ) )
return false;
{
if( !CreateControl( parent, id, pos, size, style, validator, name ) )
return false;
+ PreCreation();
m_tempCallbackStruct = (void*) NULL;
m_modified = false;
m_processedDefault = false;
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;
Widget parentWidget = (Widget) parent->GetClientWidget();
Bool wantHorizScroll = (m_windowStyle & wxHSCROLL) != 0 ? True : False;
@@
-133,17
+134,18
@@
bool wxTextCtrl::Create(wxWindow *parent,
Arg args[8];
int count = 0;
XtSetArg (args[count], XmNscrollHorizontal, wantHorizScroll); ++count;
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], 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,
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);
args, count);
XtManageChild ((Widget) m_mainWidget);
@@
-152,11
+154,11
@@
bool wxTextCtrl::Create(wxWindow *parent,
{
m_mainWidget = (WXWidget)XtVaCreateManagedWidget
(
{
m_mainWidget = (WXWidget)XtVaCreateManagedWidget
(
-
wxConstCast(name.c_str(), char
),
+
name.mb_str(
),
xmTextWidgetClass,
parentWidget,
wxFont::GetFontTag(), m_font.GetFontType( XtDisplay(parentWidget) ),
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
XmNeditable, (style & wxTE_READONLY) ?
False : True,
NULL
@@
-165,8
+167,8
@@
bool wxTextCtrl::Create(wxWindow *parent,
#if 0
// TODO: Is this relevant? What does it do?
int noCols = 2;
#if 0
// TODO: Is this relevant? What does it do?
int noCols = 2;
- if (!value.IsNull() && (value.
L
ength() > (unsigned int) noCols))
- noCols = value.
L
ength();
+ if (!value.IsNull() && (value.
l
ength() > (unsigned int) noCols))
+ noCols = value.
l
ength();
XtVaSetValues((Widget) m_mainWidget,
XmNcolumns, noCols,
NULL);
XtVaSetValues((Widget) m_mainWidget,
XmNcolumns, noCols,
NULL);
@@
-192,11
+194,10
@@
bool wxTextCtrl::Create(wxWindow *parent,
XtAddCallback((Widget) m_mainWidget, XmNlosingFocusCallback, (XtCallbackProc)wxTextWindowLoseFocusProc, (XtPointer)this);
XtAddCallback((Widget) m_mainWidget, XmNlosingFocusCallback, (XtCallbackProc)wxTextWindowLoseFocusProc, (XtPointer)this);
+ PostCreation();
AttachWidget (parent, m_mainWidget, (WXWidget) NULL,
pos.x, pos.y, size.x, size.y);
AttachWidget (parent, m_mainWidget, (WXWidget) NULL,
pos.x, pos.y, size.x, size.y);
- ChangeBackgroundColour();
-
return true;
}
return true;
}
@@
-238,11
+239,11
@@
wxString wxTextCtrl::GetValue() const
return str;
}
return str;
}
-void wxTextCtrl::
SetValue(const wxString& text
)
+void wxTextCtrl::
DoSetValue(const wxString& text, int flags
)
{
m_inSetValue = true;
{
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);
XtVaSetValues ((Widget) m_mainWidget,
XmNcursorPosition, text.length(),
NULL);
@@
-252,6
+253,9
@@
void wxTextCtrl::SetValue(const wxString& text)
m_modified = true;
m_inSetValue = false;
m_modified = true;
m_inSetValue = false;
+
+ if ( flags & SetValue_SendEvent )
+ SendTextUpdatedEvent();
}
// Clipboard operations
}
// Clipboard operations
@@
-360,7
+364,7
@@
wxTextPos wxTextCtrl::GetLastPosition() const
void wxTextCtrl::Replace(long from, long to, const wxString& value)
{
XmTextReplace ((Widget) m_mainWidget, (XmTextPosition) from, (XmTextPosition) to,
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)
}
void wxTextCtrl::Remove(long from, long to)
@@
-383,7
+387,7
@@
void wxTextCtrl::WriteText(const wxString& text)
{
long textPosition = GetInsertionPoint() + text.length();
XmTextInsert ((Widget) m_mainWidget, GetInsertionPoint(),
{
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);
XtVaSetValues ((Widget) m_mainWidget, XmNcursorPosition, textPosition, NULL);
SetInsertionPoint(textPosition);
XmTextShowPosition ((Widget) m_mainWidget, textPosition);
@@
-394,7
+398,7
@@
void wxTextCtrl::AppendText(const wxString& text)
{
wxTextPos textPosition = GetLastPosition() + text.length();
XmTextInsert ((Widget) m_mainWidget, GetLastPosition(),
{
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);
XtVaSetValues ((Widget) m_mainWidget, XmNcursorPosition, textPosition, NULL);
SetInsertionPoint(textPosition);
XmTextShowPosition ((Widget) m_mainWidget, textPosition);
@@
-488,7
+492,7
@@
void wxTextCtrl::ShowPosition(long pos)
int wxTextCtrl::GetLineLength(long lineNo) const
{
wxString str = GetLineText (lineNo);
int wxTextCtrl::GetLineLength(long lineNo) const
{
wxString str = GetLineText (lineNo);
- return (int) str.
L
ength();
+ return (int) str.
l
ength();
}
wxString wxTextCtrl::GetLineText(long lineNo) const
}
wxString wxTextCtrl::GetLineText(long lineNo) const
@@
-662,8
+666,8
@@
wxSize wxDoGetSingleTextCtrlBestSize( Widget textWidget,
int x, y;
window->GetTextExtent( value, &x, &y );
int x, y;
window->GetTextExtent( value, &x, &y );
- if( x <
10
0 )
- x =
10
0;
+ if( x <
9
0 )
+ x =
9
0;
return wxSize( x + 2 * xmargin + 2 * highlight + 2 * shadow,
// MBN: +2 necessary: Lesstif bug or mine?
return wxSize( x + 2 * xmargin + 2 * highlight + 2 * shadow,
// MBN: +2 necessary: Lesstif bug or mine?
@@
-675,10
+679,16
@@
wxSize wxTextCtrl::DoGetBestSize() const
if( IsSingleLine() )
{
wxSize best = wxControl::DoGetBestSize();
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;
return best;
+#endif
}
else
return wxWindow::DoGetBestSize();
}
else
return wxWindow::DoGetBestSize();
projects / wxWidgets.git / blobdiff