From 6df443bd37bc67fee1b7995e7cf556a7c1d6b18c Mon Sep 17 00:00:00 2001 From: yam Date: Sun, 17 May 2015 10:25:47 -0500 Subject: [PATCH] Fix background (behind button bar) drawing on GTK --- src/effects/Effect.cpp | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/src/effects/Effect.cpp b/src/effects/Effect.cpp index c21492d09..ea6308f23 100644 --- a/src/effects/Effect.cpp +++ b/src/effects/Effect.cpp @@ -2869,7 +2869,8 @@ bool EffectUIHost::Initialize() hs->Add(w, 1, wxEXPAND); vs->Add(hs, 1, wxEXPAND); - wxPanel *bar = new wxPanel(this, wxID_ANY); + wxPanel *buttonPanel = new wxPanel(this, wxID_ANY); + wxPanel *bar = new wxPanel(buttonPanel, wxID_ANY); // This fools NVDA into not saying "Panel" when the dialog gets focus bar->SetName(wxT("\a")); @@ -3003,8 +3004,8 @@ bool EffectUIHost::Initialize() buttons += eDebugButton; } - wxSizer *s = CreateStdButtonSizer(this, buttons, bar); - vs->Add(s, 0, wxEXPAND | wxALIGN_CENTER_VERTICAL); + buttonPanel->SetSizer(CreateStdButtonSizer(buttonPanel, buttons, bar)); + vs->Add(buttonPanel, 0, wxEXPAND | wxALIGN_CENTER_VERTICAL); SetSizer(vs); Layout(); @@ -3058,10 +3059,6 @@ void EffectUIHost::OnPaint(wxPaintEvent & WXUNUSED(evt)) { wxPaintDC dc(this); -#if defined(__WXGTK__) - dc.SetBackground(wxBrush(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE))); -#endif - dc.Clear(); }