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

Derive from wxTextEntry instead of wxTextCtrlBase

Browse Source
This commit is contained in:
ali kettab
2019-12-29 18:59:18 +01:00
committed by Vadim Zeitlin
parent c09db9c23d
commit 020b6ebcb8
3 changed files with 8 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
src/gtk/srchctrl.cpp
View File

@@ -101,13 +101,13 @@ wx_gtk_icon_press(GtkEntry* WXUNUSED(entry),
// ============================================================================
// wxSearchCtrl implementation
// ============================================================================
wxBEGIN_EVENT_TABLE(wxSearchCtrl, wxSearchCtrlBase)
wxBEGIN_EVENT_TABLE(wxSearchCtrl, wxControl)
EVT_CHAR(wxSearchCtrl::OnChar)
EVT_TEXT(wxID_ANY, wxSearchCtrl::OnText)
EVT_TEXT_ENTER(wxID_ANY, wxSearchCtrl::OnTextEnter)
wxEND_EVENT_TABLE()
wxIMPLEMENT_DYNAMIC_CLASS(wxSearchCtrl, wxSearchCtrlBase);
wxIMPLEMENT_DYNAMIC_CLASS(wxSearchCtrl, wxControl);
// ----------------------------------------------------------------------------
// creation/destruction
@@ -225,71 +225,6 @@ void wxSearchCtrl::Clear()
ShowCancelButton(false);
}
bool wxSearchCtrl::IsModified() const
{
return m_modified;
}
void wxSearchCtrl::MarkDirty()
{
m_modified = true;
}
void wxSearchCtrl::DiscardEdits()
{
m_modified = false;
}
bool wxSearchCtrl::PositionToXY(long pos, long *x, long *y ) const
{
if (pos <= GTKGetEntryTextLength(GetEntry()))
{
if ( y )
*y = 0;
if ( x )
*x = pos;
}
else
{
// index out of bounds
return false;
}
return true;
}
long wxSearchCtrl::XYToPosition(long x, long y ) const
{
if ( y != 0 || x > GTKGetEntryTextLength(GetEntry()) )
return -1;
return x;
}
int wxSearchCtrl::GetLineLength(long lineNo) const
{
const wxString str = GetLineText(lineNo);
return (int) str.length();
}
int wxSearchCtrl::GetNumberOfLines() const
{
return 1;
}
wxString wxSearchCtrl::GetLineText( long lineNo ) const
{
if ( lineNo == 0 )
return GetValue();
return wxString();
}
void wxSearchCtrl::ShowPosition( long pos )
{
gtk_editable_set_position(GetEditable(), pos);
}
// search control specific interfaces
// ----------------------------------
#if wxUSE_MENUS