add upstream 10.16

1 files changed, 6 insertions, 2 deletions

diff --git a/wx+/graph.h b/wx+/graph.h
index f1ae5d5a..f1f0c76c 100644
--- a/wx+/graph.h
+++ b/wx+/graph.h
@@ -264,7 +264,8 @@ public:
 
         MainAttributes& setCornerText(const wxString& txt, PosCorner pos) { cornerTexts[pos] = txt; return *this; }
 
-        MainAttributes& setBackgroundColor(const wxColor& col) { backgroundColor = col; return *this; }
+        //accessibility: always set both colors
+        MainAttributes& setBaseColors(const wxColor& text, const wxColor& back) { colorText = text; colorBack = back; return *this; }
 
         MainAttributes& setSelectionMode(SelMode mode) { mouseSelMode = mode; return *this; }
 
@@ -287,10 +288,13 @@ public:
 
         std::map<PosCorner, wxString> cornerTexts;
 
-        wxColor backgroundColor = wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW);
+        wxColor colorText = wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOWTEXT);
+        wxColor colorBack = wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW);
+
         SelMode mouseSelMode = SELECT_RECTANGLE;
     };
 
+
     void setAttributes(const MainAttributes& newAttr) { attr_ = newAttr; Refresh(); }
     MainAttributes getAttributes() const { return attr_; }