diff options
| author | flacs <tilkax@gmail.com> | 2015-10-11 15:29:59 +0200 |
|---|---|---|
| committer | flacs <tilkax@gmail.com> | 2015-10-11 15:29:59 +0200 |
| commit | f3c88137e750cee208053313df8df8416cf93fa0 (patch) | |
| tree | 7147ed31b9213b86cd63bf81d3b49eadc65ba1df /Source/Core/DolphinWX/Debugger/CodeWindow.cpp | |
| parent | fe164e3a9055883c9a9b46b1ebaad07f1e01625a (diff) | |
| parent | 457a398c3361439e50180fa20d04d623315b0fda (diff) | |
Merge pull request #2798 from lioncash/search
Debugger: Use wxSearchCtrls instead of wxTextCtrl for address searching.
Diffstat (limited to 'Source/Core/DolphinWX/Debugger/CodeWindow.cpp')
| -rw-r--r-- | Source/Core/DolphinWX/Debugger/CodeWindow.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/Source/Core/DolphinWX/Debugger/CodeWindow.cpp b/Source/Core/DolphinWX/Debugger/CodeWindow.cpp index f21b56054b..ca38129b9c 100644 --- a/Source/Core/DolphinWX/Debugger/CodeWindow.cpp +++ b/Source/Core/DolphinWX/Debugger/CodeWindow.cpp @@ -10,6 +10,7 @@ #include <wx/listbox.h> #include <wx/menu.h> #include <wx/panel.h> +#include <wx/srchctrl.h> #include <wx/stattext.h> #include <wx/textctrl.h> #include <wx/textdlg.h> @@ -83,12 +84,11 @@ CCodeWindow::CCodeWindow(const SConfig& _LocalCoreStartupParameter, CFrame *pare m_aui_toolbar = new wxAuiToolBar(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxAUI_TB_HORIZONTAL | wxAUI_TB_PLAIN_BACKGROUND); - wxTextCtrl* const address_textctrl = new wxTextCtrl(m_aui_toolbar, IDM_ADDRBOX); - address_textctrl->Bind(wxEVT_TEXT, &CCodeWindow::OnAddrBoxChange, this); + wxSearchCtrl* const address_searchctrl = new wxSearchCtrl(m_aui_toolbar, IDM_ADDRBOX); + address_searchctrl->Bind(wxEVT_TEXT, &CCodeWindow::OnAddrBoxChange, this); + address_searchctrl->SetDescriptiveText(_("Search Address")); - m_aui_toolbar->AddControl(new wxStaticText(m_aui_toolbar, wxID_ANY, _("Address Search:"))); - m_aui_toolbar->AddSpacer(5); - m_aui_toolbar->AddControl(address_textctrl); + m_aui_toolbar->AddControl(address_searchctrl); m_aui_toolbar->Realize(); m_aui_manager.SetManagedWindow(this); @@ -225,7 +225,7 @@ void CCodeWindow::OnCodeViewChange(wxCommandEvent &event) void CCodeWindow::OnAddrBoxChange(wxCommandEvent& event) { - wxTextCtrl* pAddrCtrl = (wxTextCtrl*)m_aui_toolbar->FindControl(IDM_ADDRBOX); + wxSearchCtrl* pAddrCtrl = (wxSearchCtrl*)m_aui_toolbar->FindControl(IDM_ADDRBOX); // Trim leading and trailing whitespace. wxString txt = pAddrCtrl->GetValue().Trim().Trim(false); @@ -240,7 +240,7 @@ void CCodeWindow::OnAddrBoxChange(wxCommandEvent& event) if (success) pAddrCtrl->SetBackgroundColour(wxNullColour); - else + else if (!txt.empty()) pAddrCtrl->SetBackgroundColour(*wxRED); pAddrCtrl->Refresh(); |