/////////////////////////////////////////////////////////////////////////////
-// Name: textctrl.cpp
+// Name: src/os2/textctrl.cpp
// Purpose: wxTextCtrl
// Author: David Webster
// Modified by:
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
+#include "wx/textctrl.h"
+
#ifndef WX_PRECOMP
- #include "wx/textctrl.h"
#include "wx/scrolwin.h"
#include "wx/settings.h"
#include "wx/brush.h"
#include "wx/utils.h"
#include "wx/log.h"
+ #include "wx/app.h"
#endif
#if wxUSE_CLIPBOARD
- #include "wx/app.h"
#include "wx/clipbrd.h"
#endif
// event tables and other macros
// ----------------------------------------------------------------------------
-IMPLEMENT_DYNAMIC_CLASS(wxTextCtrl, wxControl)
+IMPLEMENT_DYNAMIC_CLASS(wxTextCtrl, wxTextCtrlBase)
-BEGIN_EVENT_TABLE(wxTextCtrl, wxControl)
+BEGIN_EVENT_TABLE(wxTextCtrl, wxTextCtrlBase)
EVT_CHAR(wxTextCtrl::OnChar)
EVT_DROP_FILES(wxTextCtrl::OnDropFiles)
, const wxString& rsName
)
{
- HWND hParent;
- int nTempy;
-
//
// Base initialization
//
,rValidator
,rsName
))
- return FALSE;
+ return false;
wxPoint vPos = rPos; // The OS/2 position
SWP vSwp;
}
m_windowStyle = lStyle;
- m_bIsMLE = FALSE;
+ m_bIsMLE = false;
+ m_bSkipUpdate = false;
long lSstyle = WS_VISIBLE | WS_TABSTOP;
if ( m_windowStyle & wxTE_MULTILINE )
{
lSstyle |= MLS_BORDER | MLS_WORDWRAP;
- m_bIsMLE = TRUE;
+ m_bIsMLE = true;
if ((m_windowStyle & wxTE_NO_VSCROLL) == 0)
lSstyle |= MLS_VSCROLL;
{
m_hWnd = (WXHWND)::WinCreateWindow( (HWND)GetHwndOf(pParent) // Parent window handle
,WC_MLE // Window class
- ,(PSZ)rsValue.c_str() // Initial Text
+ ,rsValue.c_str() // Initial Text
,(ULONG)lSstyle // Style flags
,(LONG)0 // X pos of origin
,(LONG)0 // Y pos of origin
{
m_hWnd = (WXHWND)::WinCreateWindow( (HWND)GetHwndOf(pParent) // Parent window handle
,WC_ENTRYFIELD // Window class
- ,(PSZ)rsValue.c_str() // Initial Text
+ ,rsValue.c_str() // Initial Text
,(ULONG)lSstyle // Style flags
,(LONG)0 // X pos of origin
,(LONG)0 // Y pos of origin
if (m_hWnd == 0)
{
- return FALSE;
+ return false;
}
SubclassWin(GetHWND());
,wxNORMAL
);
SetFont(*pTextFont);
- if (!rsValue.IsEmpty())
+ if (!rsValue.empty())
{
SetValue(rsValue);
}
,rSize.y
);
delete pTextFont;
- return TRUE;
+ return true;
} // end of wxTextCtrl::Create
//
wxString wxTextCtrl::GetValue() const
{
wxString sStr = wxGetWindowText(GetHWND());
- char* zStr = (char*)sStr.c_str();
+ wxCharBuffer buf(sStr.char_str());
+ char* zStr = buf.data();
for ( ; *zStr; zStr++ )
{
if (*zStr == '\r')
*zStr = '\n';
}
- return sStr;
+ return zStr;
} // end of wxTextCtrl::GetValue
-void wxTextCtrl::SetValue(
- const wxString& rsValue
+void wxTextCtrl::DoSetValue(
+ const wxString& rsValue,
+ int flags
)
{
//
//
if ((rsValue.length() > 0x400) || (rsValue != GetValue()))
{
+ if ( flags & SetValue_SendEvent )
+ m_bSkipUpdate = true;
+
::WinSetWindowText(GetHwnd(), rsValue.c_str());
AdjustSpaceLimit();
}
)
{
if (m_bIsMLE)
- ::WinSendMsg(GetHwnd(), MLM_INSERT, MPARAM((PCHAR)rsValue.c_str()), MPARAM(0));
+ ::WinSendMsg(GetHwnd(), MLM_INSERT, MPARAM(rsValue.wx_str()), MPARAM(0));
else
::WinSetWindowText(GetHwnd(), rsValue.c_str());
AdjustSpaceLimit();
bool wxTextCtrl::CanPaste() const
{
- bool bIsTextAvailable = FALSE;
+ bool bIsTextAvailable = false;
if (!IsEditable())
- return FALSE;
+ return false;
//
// Check for straight text on clipboard
void wxTextCtrl::SetInsertionPointEnd()
{
- long lPos = GetLastPosition();
+ wxTextPos lPos = GetLastPosition();
+ //
+ // We must not do anything if the caret is already there because calling
+ // SetInsertionPoint() thaws the controls if Freeze() had been called even
+ // if it doesn't actually move the caret anywhere and so the simple fact of
+ // doing it results in horrible flicker when appending big amounts of text
+ // to the control in a few chunks (see DoAddText() test in the text sample)
+ //
+ if (GetInsertionPoint() == GetLastPosition())
+ return;
SetInsertionPoint(lPos);
} // end of wxTextCtrl::SetInsertionPointEnd
return (dwPos & 0xFFFF);
} // end of wxTextCtrl::GetInsertionPoint
-long wxTextCtrl::GetLastPosition() const
+wxTextPos wxTextCtrl::GetLastPosition() const
{
HWND hWnd = GetHwnd();
long lCharIndex;
// Editing
// ----------------------------------------------------------------------------
-void wxTextCtrl::Replace(
- long lFrom
-, long lTo
-, const wxString& rsValue
-)
+void wxTextCtrl::Replace( long lFrom,
+ long lTo,
+ const wxString& rsValue )
{
#if wxUSE_CLIPBOARD
- HWND hWnd = GetHwnd();
- long lFromChar = lFrom;
- long lToChar = lTo;
+ HWND hWnd = GetHwnd();
//
// Set selection and remove it
else
::WinSendMsg(hWnd, EM_PASTE, (MPARAM)0, (MPARAM)0);
#else
+ wxUnusedVar(lFrom);
+ wxUnusedVar(lTo);
+ wxUnusedVar(rsValue);
wxFAIL_MSG("wxTextCtrl::Replace not implemented if wxUSE_CLIPBOARD is 0.");
#endif
} // end of wxTextCtrl::Replace
)
{
HWND hWnd = GetHwnd();
- long lFromChar = lFrom;
- long lToChar = lTo;
if (m_bIsMLE)
{
long lToChar = lTo;
//
- // If from and to are both -1, it means (in wxWindows) that all text should
+ // If from and to are both -1, it means (in wxWidgets) that all text should
// be selected. Translate into Windows convention
//
if ((lFrom == -1L) && (lTo == -1L))
::WinSendMsg(hWnd, EM_SETSEL, MPFROM2SHORT((USHORT)lFromChar, (USHORT)lToChar), (MPARAM)0);
} // end of wxTextCtrl::SetSelection
-bool wxTextCtrl::LoadFile(
- const wxString& rsFile
+bool wxTextCtrl::DoLoadFile(
+ const wxString& rsFile,
+ int fileType
)
{
- if ( wxTextCtrlBase::LoadFile(rsFile) )
+ if ( wxTextCtrlBase::DoLoadFile(rsFile, fileType) )
{
//
// Update the size limit if needed
//
AdjustSpaceLimit();
- return TRUE;
+ return true;
}
- return FALSE;
-} // end of wxTextCtrl::LoadFile
+ return false;
+} // end of wxTextCtrl::DoLoadFile
bool wxTextCtrl::IsModified() const
{
return bRc;
} // end of wxTextCtrl::IsModified
+void wxTextCtrl::MarkDirty()
+{
+ if (m_bIsMLE)
+ ::WinSendMsg(GetHwnd(), MLM_SETCHANGED, MPFROMLONG(TRUE), 0);
+ else
+ // EM controls do not have a SETCHANGED, what can we do??
+ wxFAIL_MSG( _T("not implemented") );
+}
+
//
// Makes 'unmodified'
//
, long lY
) const
{
- HWND hWnd = GetHwnd();
long lCharIndex = 0L;
long lLen;
if (nLineNo == -1)
{
// no such line
- return FALSE;
+ return false;
}
//
if (lCharIndex == -1)
{
- return FALSE;
+ return false;
}
//
if (plY)
*plY = nLineNo;
- return TRUE;
+ return true;
} // end of wxTextCtrl::PositionToXY
-void wxTextCtrl::ShowPosition(
- long lPos
-)
+void wxTextCtrl::ShowPosition( long WXUNUSED(lPos) )
{
- HWND hWnd = GetHwnd();
- long lCurrentLineLineNo = 0L;
+ HWND hWnd = GetHwnd();
+ long lCurrentLineLineNo = 0L;
// To scroll to a position, we pass the number of lines and characters
// to scroll *by*. This means that we need to:
}
} // end of wxTextCtrl::ShowPosition
-int wxTextCtrl::GetLineLength(
- long lLineNo
-) const
+int wxTextCtrl::GetLineLength( long WXUNUSED(lLineNo) ) const
{
- long lLen = 0L;
+ long lLen = 0L;
if (m_bIsMLE)
+ {
lLen = (long)::WinSendMsg(GetHwnd(), MLM_QUERYLINELENGTH, 0, 0);
+ }
else
{
- WNDPARAMS vParams;
+ WNDPARAMS vParams;
vParams.fsStatus = WPM_CCHTEXT;
if (::WinSendMsg( GetHwnd()
{
long lLen = (long)GetLineLength((long)lLineNo) + 1;
wxString sStr;
- char* zBuf;
+ wxChar* zBuf;
//
// There must be at least enough place for the length WORD in the
// buffer
//
lLen += sizeof(WORD);
- zBuf = new char[lLen];
+ zBuf = new wxChar[lLen];
if (m_bIsMLE)
{
long lIndex;
lIndex = lLen * lLineNo;
::WinSendMsg(GetHwnd(), MLM_SETSEL, (MPARAM)lIndex, (MPARAM)lIndex);
- ::WinSendMsg(GetHwnd(), MLM_SETIMPORTEXPORT, MPFROMP(zBuf), MPFROMSHORT((USHORT)sizeof(zBuf)));
+ ::WinSendMsg(GetHwnd(), MLM_SETIMPORTEXPORT, MPFROMP(zBuf), MPFROMSHORT((USHORT)WXSIZEOF(zBuf)));
lBuflen = (long)::WinSendMsg(GetHwnd(), MLM_QUERYFORMATTEXTLENGTH, MPFROMLONG(lIndex), MPFROMLONG(-1));
lCopied = (long)::WinSendMsg(GetHwnd(), MLM_EXPORT, MPFROMP(&lIndex), MPFROMP(&lBuflen));
zBuf[lCopied] = '\0';
,&vParams
,0
))
- memcpy(zBuf, vParams.pszText, vParams.cchText);
+ memcpy((char*)zBuf, vParams.pszText, vParams.cchText);
zBuf[vParams.cchText] = '\0';
}
sStr = zBuf;
if (m_bIsMLE)
bOk = (::WinSendMsg(GetHwnd(), MLM_QUERYUNDO, 0, 0) != 0);
else
- bOk = FALSE; // can't undo regular edit fields in PM
+ bOk = false; // can't undo regular edit fields in PM
return bOk;
} // end of wxTextCtrl::CanUndo
if (m_bIsMLE)
bOk = (::WinSendMsg(GetHwnd(), MLM_QUERYUNDO, 0, 0) != 0);
else
- bOk = FALSE; // can't undo regular edit fields in PM
+ bOk = false; // can't undo regular edit fields in PM
return bOk;
} // end of wxTextCtrl::CanRedo
}
} // end of wxTextCtrl::OnDropFiles
-WXHBRUSH wxTextCtrl::OnCtlColor(
- WXHDC hWxDC
-, WXHWND hWnd
-, WXUINT uCtlColor
-, WXUINT uMessage
-, WXWPARAM wParam
-, WXLPARAM lParam
-)
+WXHBRUSH wxTextCtrl::OnCtlColor( WXHDC hWxDC,
+ WXHWND WXUNUSED(hWnd),
+ WXUINT WXUNUSED(uCtlColor),
+ WXUINT WXUNUSED(uMessage),
+ WXWPARAM WXUNUSED(wParam),
+ WXLPARAM WXUNUSED(lParam) )
{
- HPS hPS = (HPS)hWxDC;
- wxBrush* pBrush = NULL;
- wxColour vColBack = GetBackgroundColour();
- wxColour vColFore = GetForegroundColour();
- wxBrush* pBackgroundBrush = wxTheBrushList->FindOrCreateBrush( GetBackgroundColour()
- ,wxSOLID
- );
+ HPS hPS = (HPS)hWxDC;
+ wxColour vColBack = GetBackgroundColour();
+ wxColour vColFore = GetForegroundColour();
+ wxBrush* pBackgroundBrush = wxTheBrushList->FindOrCreateBrush( vColBack, wxSOLID );
if (m_bUseCtl3D)
{
wxKeyEvent& rEvent
)
{
- switch (rEvent.KeyCode())
+ switch (rEvent.GetKeyCode())
{
case WXK_RETURN:
if ( !(m_windowStyle & wxTE_MULTILINE) )
wxNavigationKeyEvent vEventNav;
vEventNav.SetDirection(!rEvent.ShiftDown());
- vEventNav.SetWindowChange(FALSE);
+ vEventNav.SetWindowChange(false);
vEventNav.SetEventObject(this);
if ( GetEventHandler()->ProcessEvent(vEventNav) )
case EN_CHANGE:
{
+ if (m_bSkipUpdate)
+ {
+ m_bSkipUpdate = false;
+ break;
+ }
+
wxCommandEvent vEvent( wxEVT_COMMAND_TEXT_UPDATED
,m_windowId
);
InitCommandEvent(vEvent);
- vEvent.SetString((char*)GetValue().c_str());
ProcessCommand(vEvent);
}
break;
case EN_SCROLL:
case EN_INSERTMODETOGGLE:
case EN_MEMERROR:
- return FALSE;
+ return false;
default:
- return FALSE;
+ return false;
}
//
// Processed
//
- return TRUE;
+ return true;
} // end of wxTextCtrl::OS2Command
void wxTextCtrl::AdjustSpaceLimit()
}
else
{
- ENTRYFDATA* pEfd;
+ ENTRYFDATA Efd;
WNDPARAMS vParams;
vParams.fsStatus = WPM_CBCTLDATA;
+ vParams.pCtlData = &Efd;
vParams.cbCtlData = sizeof(ENTRYFDATA);
if (::WinSendMsg( GetHwnd()
,&vParams
,0
))
- {
- pEfd = (ENTRYFDATA*)vParams.pCtlData;
- uLimit = (unsigned int)pEfd->cchEditLimit;
- }
+ uLimit = (unsigned int)Efd.cchEditLimit;
else
uLimit = 32; //PM's default
}
if (uLen >= uLimit)
{
- uLimit = uLen + 0x8000; // 32Kb
- if (uLimit > 0xffff)
+ if (m_bIsMLE)
{
- uLimit = 0L;
+ uLimit = uLen + 0x8000; // 32Kb
+ if (uLimit > 0xffff)
+ {
+ uLimit = 0L;
+ }
}
+ else
+ uLimit = 0x7fff;
+
if (m_bIsMLE)
::WinSendMsg(GetHwnd(), MLM_SETTEXTLIMIT, MPFROMLONG(uLimit), 0);
else
- ::WinSendMsg(GetHwnd(), EM_SETTEXTLIMIT, MPFROMLONG(uLimit), 0);
+ ::WinSendMsg(GetHwnd(), EM_SETTEXTLIMIT, MPFROMSHORT(uLimit), 0);
}
} // end of wxTextCtrl::AdjustSpaceLimit
bool wxTextCtrl::AcceptsFocus() const
{
//
- // We don't want focus if we can't be edited
+ // We don't want focus if we can't be edited unless we're a multiline
+ // control because then it might be still nice to get focus from keyboard
+ // to be able to scroll it without mouse
//
- return IsEditable() && wxControl::AcceptsFocus();
+ return (IsEditable() || IsMultiLine()) && wxControl::AcceptsFocus();
} // end of wxTextCtrl::Command
wxSize wxTextCtrl::DoGetBestSize() const
{
int nCx;
int nCy;
+ wxFont vFont = (wxFont)GetFont();
- wxGetCharSize(GetHWND(), &nCx, &nCy, (wxFont*)&GetFont());
+ wxGetCharSize(GetHWND(), &nCx, &nCy, &vFont);
int wText = DEFAULT_ITEM_WIDTH;
- int hText = (EDIT_HEIGHT_FROM_CHAR_HEIGHT(nCy) * .8);
+ int hText = (int)(EDIT_HEIGHT_FROM_CHAR_HEIGHT(nCy) * .8);
if (m_windowStyle & wxTE_MULTILINE)
{
// standard handlers for standard edit menu events
// ----------------------------------------------------------------------------
-void wxTextCtrl::OnCut(
- wxCommandEvent& rEvent
-)
+void wxTextCtrl::OnCut( wxCommandEvent& WXUNUSED(rEvent) )
{
Cut();
} // end of wxTextCtrl::OnCut
-void wxTextCtrl::OnCopy(
- wxCommandEvent& rEvent
-)
+void wxTextCtrl::OnCopy( wxCommandEvent& WXUNUSED(rEvent) )
{
Copy();
} // end of wxTextCtrl::OnCopy
-void wxTextCtrl::OnPaste(
- wxCommandEvent& rEvent
-)
+void wxTextCtrl::OnPaste( wxCommandEvent& WXUNUSED(rEvent) )
{
Paste();
} // end of wxTextCtrl::OnPaste
-void wxTextCtrl::OnUndo(
- wxCommandEvent& rEvent
-)
+void wxTextCtrl::OnUndo( wxCommandEvent& WXUNUSED(rEvent) )
{
Undo();
} // end of wxTextCtrl::OnUndo
-void wxTextCtrl::OnRedo(
- wxCommandEvent& rEvent
-)
+void wxTextCtrl::OnRedo( wxCommandEvent& WXUNUSED(rEvent) )
{
Redo();
} // end of wxTextCtrl::OnRedo
-void wxTextCtrl::OnDelete(
- wxCommandEvent& rEvent
-)
+void wxTextCtrl::OnDelete( wxCommandEvent& WXUNUSED(rEvent) )
{
- long lFrom;
- long lTo;
+ long lFrom, lTo;
+
+ GetSelection( &lFrom, &lTo );
- GetSelection( &lFrom
- ,&lTo
- );
if (lFrom != -1 && lTo != -1)
- Remove( lFrom
- ,lTo
- );
+ Remove( lFrom, lTo );
} // end of wxTextCtrl::OnDelete
-void wxTextCtrl::OnSelectAll(
- wxCommandEvent& rEvent
-)
+void wxTextCtrl::OnSelectAll( wxCommandEvent& WXUNUSED(rEvent) )
{
SetSelection(-1, -1);
} // end of wxTextCtrl::OnSelectAll
-void wxTextCtrl::OnUpdateCut(
- wxUpdateUIEvent& rEvent
-)
+void wxTextCtrl::OnUpdateCut( wxUpdateUIEvent& rEvent )
{
rEvent.Enable(CanCut());
} // end of wxTextCtrl::OnUpdateCut
-void wxTextCtrl::OnUpdateCopy(
- wxUpdateUIEvent& rEvent
-)
+void wxTextCtrl::OnUpdateCopy( wxUpdateUIEvent& rEvent )
{
rEvent.Enable(CanCopy());
} // end of wxTextCtrl::OnUpdateCopy
-void wxTextCtrl::OnUpdatePaste(
- wxUpdateUIEvent& rEvent
-)
+void wxTextCtrl::OnUpdatePaste( wxUpdateUIEvent& rEvent )
{
rEvent.Enable(CanPaste());
} // end of wxTextCtrl::OnUpdatePaste
-void wxTextCtrl::OnUpdateUndo(
- wxUpdateUIEvent& rEvent
-)
+void wxTextCtrl::OnUpdateUndo( wxUpdateUIEvent& rEvent )
{
rEvent.Enable(CanUndo());
} // end of wxTextCtrl::OnUpdateUndo
-void wxTextCtrl::OnUpdateRedo(
- wxUpdateUIEvent& rEvent
-)
+void wxTextCtrl::OnUpdateRedo( wxUpdateUIEvent& rEvent )
{
rEvent.Enable(CanRedo());
} // end of wxTextCtrl::OnUpdateRedo
-void wxTextCtrl::OnUpdateDelete(
- wxUpdateUIEvent& rEvent
-)
+void wxTextCtrl::OnUpdateDelete( wxUpdateUIEvent& rEvent )
{
- long lFrom;
- long lTo;
+ long lFrom, lTo;
- GetSelection( &lFrom
- ,&lTo
- );
+ GetSelection( &lFrom, &lTo );
rEvent.Enable( lFrom != -1L && lTo != -1L && lFrom != lTo && IsEditable()) ;
} // end of wxTextCtrl::OnUpdateDelete
-void wxTextCtrl::OnUpdateSelectAll(
- wxUpdateUIEvent& rEvent
-)
+void wxTextCtrl::OnUpdateSelectAll( wxUpdateUIEvent& rEvent )
{
rEvent.Enable(GetLastPosition() > 0);
} // end of wxTextCtrl::OnUpdateSelectAll
-bool wxTextCtrl::SetBackgroundColour(
- const wxColour& rColour
-)
+bool wxTextCtrl::SetBackgroundColour( const wxColour& rColour )
{
if (m_bIsMLE)
::WinSendMsg(GetHwnd(), MLM_SETBACKCOLOR, (MPARAM)rColour.GetPixel(), MLE_INDEX);
- return TRUE;
+ return true;
} // end of wxTextCtrl::SetBackgroundColour
-bool wxTextCtrl::SetForegroundColour(
- const wxColour& rColour
-)
+bool wxTextCtrl::SetForegroundColour( const wxColour& rColour )
{
if (m_bIsMLE)
::WinSendMsg(GetHwnd(), MLM_SETTEXTCOLOR, (MPARAM)rColour.GetPixel(), MLE_INDEX);
- return TRUE;
+ return true;
} // end of wxTextCtrl::SetForegroundColour
-bool wxTextCtrl::SetStyle(
- long lStart
-, long lEnd
-, const wxTextAttr& rStyle
-)
+bool wxTextCtrl::SetStyle( long lStart,
+ long lEnd,
+ const wxTextAttr& WXUNUSED(rStyle) )
{
- HWND hWnd = GetHwnd();
+ HWND hWnd = GetHwnd();
if (lStart > lEnd)
{
- long lTmp = lStart;
+ long lTmp = lStart;
lStart = lEnd;
lEnd = lTmp;
// We can only change the format of the selection, so select the range we
// want and restore the old selection later
//
- long lStartOld;
- long lEndOld;
+ long lStartOld, lEndOld;
- GetSelection( &lStartOld
- ,&lEndOld
- );
+ GetSelection( &lStartOld, &lEndOld );
//
// But do we really have to change the selection?
//
- bool bChangeSel = lStart != lStartOld ||
- lEnd != lEndOld;
+ bool bChangeSel = lStart != lStartOld ||
+ lEnd != lEndOld;
if (bChangeSel)
{
//
// TODO:: finish this part
//
- return TRUE;
+ return true;
} // end of wxTextCtrl::SetStyle
-
projects / wxWidgets.git / blobdiff