From 6baa699ccda572f71a74d0622517c1578199ef79 Mon Sep 17 00:00:00 2001 From: Charlie Fenton Date: Mon, 12 Jan 2015 03:49:11 -0800 Subject: [PATCH] MGR: Fix asserts under Linux: wxBG_STYLE_COLOUR does nothing under wxWidgets 3.0, is no longer supported and triggers an assert under wxGTK 3.0.2. --- clientgui/sg_CustomControls.cpp | 3 --- 1 file changed, 3 deletions(-) diff --git a/clientgui/sg_CustomControls.cpp b/clientgui/sg_CustomControls.cpp index b5487e9aca..2e51e33291 100644 --- a/clientgui/sg_CustomControls.cpp +++ b/clientgui/sg_CustomControls.cpp @@ -41,7 +41,6 @@ bool CTransparentStaticLine::Create(wxWindow* parent, wxWindowID id, const wxPoi bool bRetVal = wxPanel::Create(parent, id, pos, size, style|wxTRANSPARENT_WINDOW, name); SetBackgroundColour(parent->GetBackgroundColour()); - SetBackgroundStyle(wxBG_STYLE_COLOUR); SetForegroundColour(parent->GetForegroundColour()); SetLineColor(GetForegroundColour()); @@ -79,7 +78,6 @@ bool CTransparentStaticText::Create(wxWindow* parent, wxWindowID id, const wxStr bool bRetVal = wxStaticText::Create(parent, id, label, pos, size, style|wxTRANSPARENT_WINDOW, name); SetBackgroundColour(parent->GetBackgroundColour()); -// SetBackgroundStyle(wxBG_STYLE_COLOUR); SetForegroundColour(parent->GetForegroundColour()); return bRetVal; @@ -153,7 +151,6 @@ bool CTransparentStaticTextAssociate::Create(wxWindow* parent, wxWindowID id, co SetFont(GetFont()); SetBackgroundColour(parent->GetBackgroundColour()); - SetBackgroundStyle(wxBG_STYLE_COLOUR); SetForegroundColour(parent->GetForegroundColour()); return bRetVal;