From 1adc3ba4eef649c838ed3d06052b5bb27db3dc06 Mon Sep 17 00:00:00 2001 From: Naser Buhamad Date: Wed, 13 Jun 2018 23:53:58 +0200 Subject: [PATCH] Fix menu bar background colour in wxQt wxMenuBar is a native, not generic, window, so pass "false" to PostCreation() to use the correct colours for it. --- docs/changes.txt | 4 ++++ src/qt/menu.cpp | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/docs/changes.txt b/docs/changes.txt index f5b2e3ba67..cd8c9da99a 100644 --- a/docs/changes.txt +++ b/docs/changes.txt @@ -107,6 +107,10 @@ wxOSX: - Fix dispatching pending events (and CallAfter()) in console applications. +wxQt: + +- Fix menu bar background colour (Naser Buhamad). + 3.1.1: (released 2018-02-19) ---------------------------- diff --git a/src/qt/menu.cpp b/src/qt/menu.cpp index cec2fd1d7d..61d27b7976 100644 --- a/src/qt/menu.cpp +++ b/src/qt/menu.cpp @@ -162,13 +162,13 @@ QMenu *wxMenu::GetHandle() const wxMenuBar::wxMenuBar() { m_qtMenuBar = new QMenuBar(); - PostCreation(); + PostCreation(false); } wxMenuBar::wxMenuBar( long WXUNUSED( style )) { m_qtMenuBar = new QMenuBar(); - PostCreation(); + PostCreation(false); } wxMenuBar::wxMenuBar(size_t count, wxMenu *menus[], const wxString titles[], long WXUNUSED( style )) @@ -178,7 +178,7 @@ wxMenuBar::wxMenuBar(size_t count, wxMenu *menus[], const wxString titles[], lon for ( size_t i = 0; i < count; ++i ) Append( menus[ i ], titles[ i ] ); - PostCreation(); + PostCreation(false); }