From d7218938ed8fccb7c480c315b68a7e56ac2a22f7 Mon Sep 17 00:00:00 2001
From: James Crook <james.k.crook@gmail.com>
Date: Thu, 22 Jun 2017 13:12:17 +0100
Subject: [PATCH] Set colours in AColour on all platforms.

Also drop AQUA_THEME on meters.
These changes are important on MixerBoard.
---
 src/AColor.cpp        | 4 ++--
 src/widgets/Meter.cpp | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/AColor.cpp b/src/AColor.cpp
index a94635395..fa034066f 100644
--- a/src/AColor.cpp
+++ b/src/AColor.cpp
@@ -491,7 +491,6 @@ void AColor::Init()
    // been snapped to the nearest boundary.
    theTheme.SetPenColour(   snapGuidePen,      clrSnapGuide);
 
-#if defined(__WXMSW__) || defined(__WXGTK__)
    // unselected
    lightBrush[0].SetColour(light);
    mediumBrush[0].SetColour(med);
@@ -508,7 +507,8 @@ void AColor::Init()
    mediumPen[1].SetColour(medSelected);
    darkPen[1].SetColour(darkSelected);
 
-#else
+// Unthemed colours that used to be used for mac.
+#if 0
 
 #if defined(__WXMAC__)          // && defined(TARGET_CARBON)
 
diff --git a/src/widgets/Meter.cpp b/src/widgets/Meter.cpp
index 85d160303..c33f8383b 100644
--- a/src/widgets/Meter.cpp
+++ b/src/widgets/Meter.cpp
@@ -445,7 +445,7 @@ void Meter::OnPaint(wxPaintEvent & WXUNUSED(event))
    
       // Start with a clean background
       // LLL:  Should research USE_AQUA_THEME usefulness...
-#ifndef USE_AQUA_THEME
+//#ifndef USE_AQUA_THEME
 #ifdef EXPERIMENTAL_THEMING
       //if( !mMeterDisabled )
       //{
@@ -456,7 +456,7 @@ void Meter::OnPaint(wxPaintEvent & WXUNUSED(event))
       dc.SetPen(*wxTRANSPARENT_PEN);
       dc.SetBrush(mBkgndBrush);
       dc.DrawRectangle(0, 0, mWidth, mHeight);
-#endif
+//#endif
 
       // MixerTrackCluster style has no icon or L/R labels
       if (mStyle != MixerTrackCluster)
@@ -468,6 +468,7 @@ void Meter::OnPaint(wxPaintEvent & WXUNUSED(event))
          dc.DrawBitmap(*mIcon, mIconRect.GetPosition(), true);
          dc.SetFont(GetFont());
          dc.SetTextForeground( clrText );
+         dc.SetTextBackground( clrBoxFill );
          dc.DrawText(mLeftText, mLeftTextPos.x, mLeftTextPos.y);
          dc.DrawText(mRightText, mRightTextPos.x, mRightTextPos.y);
       }