added wxTextCtrl::IsEmpty()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41740 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -69,6 +69,7 @@ All (GUI):
|
|||||||
- Added wxAboutBox() function for displaying the standard about dialog
|
- Added wxAboutBox() function for displaying the standard about dialog
|
||||||
- Added wxID_PAGE_SETUP standard id.
|
- Added wxID_PAGE_SETUP standard id.
|
||||||
- Added wxSize::IncBy() and DecBy() methods.
|
- Added wxSize::IncBy() and DecBy() methods.
|
||||||
|
- Added wxTextCtrl::IsEmpty()
|
||||||
- Added file type parameter to wxTextCtrl::LoadFile, wxTextCtrl::SaveFile for
|
- Added file type parameter to wxTextCtrl::LoadFile, wxTextCtrl::SaveFile for
|
||||||
consistency with wxRichTextCtrl.
|
consistency with wxRichTextCtrl.
|
||||||
- wxRichTextCtrl: fixed range out-by-one bug to be consistent with wxTextCtrl API,
|
- wxRichTextCtrl: fixed range out-by-one bug to be consistent with wxTextCtrl API,
|
||||||
|
@@ -43,9 +43,9 @@ public:
|
|||||||
// ----------------------------------
|
// ----------------------------------
|
||||||
|
|
||||||
virtual wxString GetValue() const;
|
virtual wxString GetValue() const;
|
||||||
|
virtual bool IsEmpty() const;
|
||||||
virtual void SetValue(const wxString& value) { DoSetValue(value, SetValue_SendEvent); }
|
virtual void SetValue(const wxString& value) { DoSetValue(value, SetValue_SendEvent); }
|
||||||
|
virtual void ChangeValue(const wxString& value) { DoSetValue(value); }
|
||||||
virtual void ChangeValue(const wxString &value) { DoSetValue(value); }
|
|
||||||
|
|
||||||
virtual int GetLineLength(long lineNo) const;
|
virtual int GetLineLength(long lineNo) const;
|
||||||
virtual wxString GetLineText(long lineNo) const;
|
virtual wxString GetLineText(long lineNo) const;
|
||||||
|
@@ -45,8 +45,9 @@ public:
|
|||||||
// ----------------------------------
|
// ----------------------------------
|
||||||
|
|
||||||
virtual wxString GetValue() const;
|
virtual wxString GetValue() const;
|
||||||
|
virtual bool IsEmpty() const;
|
||||||
virtual void SetValue(const wxString& value) { DoSetValue(value, SetValue_SendEvent); }
|
virtual void SetValue(const wxString& value) { DoSetValue(value, SetValue_SendEvent); }
|
||||||
virtual void ChangeValue(const wxString &value) { DoSetValue(value); }
|
virtual void ChangeValue(const wxString& value) { DoSetValue(value); }
|
||||||
|
|
||||||
virtual wxString GetRange(long from, long to) const;
|
virtual wxString GetRange(long from, long to) const;
|
||||||
|
|
||||||
|
@@ -300,6 +300,8 @@ public:
|
|||||||
virtual wxString GetValue() const = 0;
|
virtual wxString GetValue() const = 0;
|
||||||
virtual void SetValue(const wxString& value) = 0;
|
virtual void SetValue(const wxString& value) = 0;
|
||||||
|
|
||||||
|
virtual bool IsEmpty() const { return GetValue().empty(); }
|
||||||
|
|
||||||
virtual void ChangeValue(const wxString &value) = 0;
|
virtual void ChangeValue(const wxString &value) = 0;
|
||||||
|
|
||||||
virtual wxString GetRange(long from, long to) const;
|
virtual wxString GetRange(long from, long to) const;
|
||||||
|
@@ -821,6 +821,14 @@ wxFontEncoding wxTextCtrl::GetTextEncoding() const
|
|||||||
return enc;
|
return enc;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool wxTextCtrl::IsEmpty() const
|
||||||
|
{
|
||||||
|
if ( IsMultiLine() )
|
||||||
|
return gtk_text_buffer_get_char_count(m_buffer) != 0;
|
||||||
|
|
||||||
|
return wxTextCtrlBase::IsEmpty();
|
||||||
|
}
|
||||||
|
|
||||||
void wxTextCtrl::DoSetValue( const wxString &value, int flags )
|
void wxTextCtrl::DoSetValue( const wxString &value, int flags )
|
||||||
{
|
{
|
||||||
wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") );
|
wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") );
|
||||||
|
@@ -662,6 +662,15 @@ void wxTextCtrl::SetWindowStyleFlag(long style)
|
|||||||
// set/get the controls text
|
// set/get the controls text
|
||||||
// ----------------------------------------------------------------------------
|
// ----------------------------------------------------------------------------
|
||||||
|
|
||||||
|
bool wxTextCtrl::IsEmpty() const
|
||||||
|
{
|
||||||
|
// this is an optimization for multiline controls containing a lot of text
|
||||||
|
if ( IsMultiLine() && GetNumberOfLines() != 1 )
|
||||||
|
return false;
|
||||||
|
|
||||||
|
return wxTextCtrlBase::IsEmpty();
|
||||||
|
}
|
||||||
|
|
||||||
wxString wxTextCtrl::GetValue() const
|
wxString wxTextCtrl::GetValue() const
|
||||||
{
|
{
|
||||||
// range 0..-1 is special for GetRange() and means to retrieve all text
|
// range 0..-1 is special for GetRange() and means to retrieve all text
|
||||||
|
Reference in New Issue
Block a user