From 49e6b80fc5acee71d0830fc69ffc42c879df8063 Mon Sep 17 00:00:00 2001 From: Marek Roszko Date: Thu, 8 Jul 2021 07:26:05 -0400 Subject: [PATCH] Rollback searchctrl change for FOOTPRINT_VIEWER_FRAME Fixes #8751 --- pcbnew/footprint_viewer_frame.cpp | 8 ++++---- pcbnew/footprint_viewer_frame.h | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pcbnew/footprint_viewer_frame.cpp b/pcbnew/footprint_viewer_frame.cpp index c26d04c8ea..6629746e04 100644 --- a/pcbnew/footprint_viewer_frame.cpp +++ b/pcbnew/footprint_viewer_frame.cpp @@ -138,9 +138,9 @@ FOOTPRINT_VIEWER_FRAME::FOOTPRINT_VIEWER_FRAME( KIWAY* aKiway, wxWindow* aParent wxPanel* libPanel = new wxPanel( this ); wxSizer* libSizer = new wxBoxSizer( wxVERTICAL ); - m_libFilter = new wxSearchCtrl( libPanel, ID_MODVIEW_LIB_FILTER, wxEmptyString, + m_libFilter = new wxTextCtrl( libPanel, ID_MODVIEW_LIB_FILTER, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_PROCESS_ENTER ); - m_libFilter->SetDescriptiveText( _( "Filter" ) ); + m_libFilter->SetHint( _( "Filter" ) ); libSizer->Add( m_libFilter, 0, wxEXPAND, 5 ); m_libList = new wxListBox( libPanel, ID_MODVIEW_LIB_LIST, wxDefaultPosition, wxDefaultSize, @@ -153,9 +153,9 @@ FOOTPRINT_VIEWER_FRAME::FOOTPRINT_VIEWER_FRAME( KIWAY* aKiway, wxWindow* aParent wxPanel* fpPanel = new wxPanel( this ); wxSizer* fpSizer = new wxBoxSizer( wxVERTICAL ); - m_fpFilter = new wxSearchCtrl( fpPanel, ID_MODVIEW_FOOTPRINT_FILTER, wxEmptyString, + m_fpFilter = new wxTextCtrl( fpPanel, ID_MODVIEW_FOOTPRINT_FILTER, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_PROCESS_ENTER ); - m_fpFilter->SetDescriptiveText( _( "Filter" ) ); + m_fpFilter->SetHint( _( "Filter" ) ); m_fpFilter->SetToolTip( _( "Filter on footprint name, keywords, description and pad count.\n" "Search terms are separated by spaces. All search terms must match.\n" diff --git a/pcbnew/footprint_viewer_frame.h b/pcbnew/footprint_viewer_frame.h index 22e71c88d4..902e953b99 100644 --- a/pcbnew/footprint_viewer_frame.h +++ b/pcbnew/footprint_viewer_frame.h @@ -167,9 +167,9 @@ private: friend struct PCB::IFACE; // constructor called from here only - wxSearchCtrl* m_libFilter; + wxTextCtrl* m_libFilter; wxListBox* m_libList; // The list of library names. - wxSearchCtrl* m_fpFilter; + wxTextCtrl* m_fpFilter; wxListBox* m_fpList; // The list of footprint names. bool m_autoZoom;