Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'textctrl_qt' of https://github.com/oneeyeman1/wxWidgets

Browse Source 
Implement support for wxTE_PASSWORD and MarkDirty()/DiscardEdits() in
wxQt.

See https://github.com/wxWidgets/wxWidgets/pull/1026
This commit is contained in:
Vadim Zeitlin
2018-11-20 14:13:45 +01:00
parent f7514dc79d add8e8804b
commit a1adc2efa4
1 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/qt/textctrl.cpp
View File

@@ -121,6 +121,8 @@ bool wxTextCtrl::Create(wxWindow *parent,
{ {
m_qtLineEdit = new wxQtLineEdit( parent, this ); m_qtLineEdit = new wxQtLineEdit( parent, this );
m_qtTextEdit = NULL; m_qtTextEdit = NULL;
if ( style & wxTE_PASSWORD )
m_qtLineEdit->setEchoMode( QLineEdit::Password );
} }
else else
{ {
@@ -161,15 +163,26 @@ int wxTextCtrl::GetNumberOfLines() const
bool wxTextCtrl::IsModified() const bool wxTextCtrl::IsModified() const
{ {
return false; if ( IsSingleLine() )
return m_qtLineEdit->isModified();
else
return m_qtTextEdit->isWindowModified();
} }
void wxTextCtrl::MarkDirty() void wxTextCtrl::MarkDirty()
{ {
if ( IsSingleLine() )
return m_qtLineEdit->setModified( true );
else
return m_qtTextEdit->setWindowModified( true );
} }
void wxTextCtrl::DiscardEdits() void wxTextCtrl::DiscardEdits()
{ {
if ( IsSingleLine() )
return m_qtLineEdit->setModified( false );
else
return m_qtTextEdit->setWindowModified( false );
} }
bool wxTextCtrl::SetStyle(long WXUNUSED(start), long WXUNUSED(end), const wxTextAttr& WXUNUSED(style)) bool wxTextCtrl::SetStyle(long WXUNUSED(start), long WXUNUSED(end), const wxTextAttr& WXUNUSED(style))