From b4769191031e9e6d1fea00a7b3a54f7f205a5ac6 Mon Sep 17 00:00:00 2001 From: James Crook Date: Thu, 17 Aug 2017 09:06:30 +0100 Subject: [PATCH] Bug 1664 - Restore wxPanelWrapper I'd changed wxPanelWrapper to wxPanel in investigating bug 1664, and that change mistakenly went through in my 1664 fix. In the Lyrics window I don't think the wxPanelWrpper's capturing of Tabs is currently necessary, but keeping it means we can add controls to Lyrics Window, and tab between them correctly on Mac, which wxPanelWrapper was introduced to solve. --- src/Lyrics.cpp | 2 +- src/Lyrics.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Lyrics.cpp b/src/Lyrics.cpp index bddb92c3f..7bc8e65c6 100644 --- a/src/Lyrics.cpp +++ b/src/Lyrics.cpp @@ -83,7 +83,7 @@ IMPLEMENT_CLASS(Lyrics, wxPanel) Lyrics::Lyrics(wxWindow* parent, wxWindowID id, const wxPoint& pos /*= wxDefaultPosition*/, const wxSize& size /*= wxDefaultSize*/): - wxPanel(parent, id, pos, size, wxWANTS_CHARS), + wxPanelWrapper(parent, id, pos, size, wxWANTS_CHARS), mWidth(size.x), mHeight(size.y) { mKaraokeHeight = mHeight; diff --git a/src/Lyrics.h b/src/Lyrics.h index b2424dd60..8bed9e58a 100644 --- a/src/Lyrics.h +++ b/src/Lyrics.h @@ -58,7 +58,7 @@ private: DECLARE_EVENT_TABLE() }; -class Lyrics final : public wxPanel +class Lyrics final : public wxPanelWrapper { DECLARE_DYNAMIC_CLASS(Lyrics)