{
}
+wxTextCtrl::~wxTextCtrl()
+{
+}
+
bool wxTextCtrl::Create(
wxWindow* pParent
, wxWindowID vId
, const wxPoint& rPos
, const wxSize& rSize
, long lStyle
-#if wxUSE_VALIDATORS
, const wxValidator& rValidator
-#endif
, const wxString& rsName
)
{
- HWND hParent;
- int nTempy;
//
// Base initialization
//
,rPos
,rSize
,lStyle
-#if wxUSE_VALIDATORS
,rValidator
-#endif
,rsName
))
- return FALSE;
+ return false;
wxPoint vPos = rPos; // The OS/2 position
SWP vSwp;
}
m_windowStyle = lStyle;
+ m_bIsMLE = 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;
if (m_hWnd == 0)
{
- return FALSE;
+ return false;
}
SubclassWin(GetHWND());
//
// Set font, position, size and initial value
//
- wxFont* pTextFont = new wxFont( 10
+ wxFont* pTextFont = new wxFont( 8
,wxMODERN
,wxNORMAL
,wxNORMAL
);
SetFont(*pTextFont);
- if (!rsValue.IsEmpty())
+ if (!rsValue.empty())
{
SetValue(rsValue);
}
::WinQueryWindowPos(m_hWnd, &vSwp);
SetXComp(vSwp.x);
SetYComp(vSwp.y);
- SetSize( vPos.x
- ,vPos.y
+ SetSize( vPos.x - GetXComp()
+ ,vPos.y - GetYComp()
,rSize.x
,rSize.y
);
delete pTextFont;
- return TRUE;
+ return true;
} // end of wxTextCtrl::Create
//
if (*zStr == '\r')
*zStr = '\n';
}
- sStr = zStr;
return sStr;
} // end of wxTextCtrl::GetValue
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;
{
#if wxUSE_CLIPBOARD
HWND hWnd = GetHwnd();
- long lFromChar = lFrom;
- long lToChar = lTo;
//
// Set selection and remove it
)
{
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))
// Update the size limit if needed
//
AdjustSpaceLimit();
- return TRUE;
+ return true;
}
- return FALSE;
+ return false;
} // end of wxTextCtrl::LoadFile
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(
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
)
{
HPS hPS = (HPS)hWxDC;
- wxBrush* pBrush = NULL;
wxColour vColBack = GetBackgroundColour();
wxColour vColFore = GetForegroundColour();
wxBrush* pBackgroundBrush = wxTheBrushList->FindOrCreateBrush( GetBackgroundColour()
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) )
);
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 (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)
{
Redo();
} // end of wxTextCtrl::OnRedo
+void wxTextCtrl::OnDelete(
+ wxCommandEvent& rEvent
+)
+{
+ long lFrom;
+ long lTo;
+
+ GetSelection( &lFrom
+ ,&lTo
+ );
+ if (lFrom != -1 && lTo != -1)
+ Remove( lFrom
+ ,lTo
+ );
+} // end of wxTextCtrl::OnDelete
+
+void wxTextCtrl::OnSelectAll(
+ wxCommandEvent& rEvent
+)
+{
+ SetSelection(-1, -1);
+} // end of wxTextCtrl::OnSelectAll
+
void wxTextCtrl::OnUpdateCut(
wxUpdateUIEvent& rEvent
)
rEvent.Enable(CanRedo());
} // end of wxTextCtrl::OnUpdateRedo
+void wxTextCtrl::OnUpdateDelete(
+ wxUpdateUIEvent& rEvent
+)
+{
+ long lFrom;
+ long lTo;
+
+ GetSelection( &lFrom
+ ,&lTo
+ );
+ rEvent.Enable( lFrom != -1L && lTo != -1L && lFrom != lTo && IsEditable()) ;
+} // end of wxTextCtrl::OnUpdateDelete
+
+void wxTextCtrl::OnUpdateSelectAll(
+ wxUpdateUIEvent& rEvent
+)
+{
+ rEvent.Enable(GetLastPosition() > 0);
+} // end of wxTextCtrl::OnUpdateSelectAll
+
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(
{
if (m_bIsMLE)
::WinSendMsg(GetHwnd(), MLM_SETTEXTCOLOR, (MPARAM)rColour.GetPixel(), MLE_INDEX);
- return TRUE;
+ return true;
} // end of wxTextCtrl::SetForegroundColour
bool wxTextCtrl::SetStyle(
//
// TODO:: finish this part
//
- return TRUE;
+ return true;
} // end of wxTextCtrl::SetStyle
projects / wxWidgets.git / blobdiff