From df341ffba6fdbc2cbd489dfa0df25a4b87e8533e Mon Sep 17 00:00:00 2001 From: Simon McFarlane Date: Thu, 30 Apr 2015 17:22:37 -0700 Subject: [PATCH 1/3] Change about page branch info to wxStaticText --- Source/Core/DolphinWX/AboutDolphin.cpp | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/Source/Core/DolphinWX/AboutDolphin.cpp b/Source/Core/DolphinWX/AboutDolphin.cpp index 2adb9823e0..61d2f27e08 100644 --- a/Source/Core/DolphinWX/AboutDolphin.cpp +++ b/Source/Core/DolphinWX/AboutDolphin.cpp @@ -78,8 +78,7 @@ AboutDolphin::AboutDolphin(wxWindow *parent, wxWindowID id, wxTextCtrl* const Revision = new wxTextCtrl(this, wxID_ANY, RevisionText, wxDefaultPosition, wxDefaultSize, wxNO_BORDER | wxTE_READONLY | wxTE_NO_VSCROLL); BanishBackground(Revision); wxStaticText* const Copyright = new wxStaticText(this, wxID_ANY, CopyrightText); - wxTextCtrl* const Branch = new wxTextCtrl(this, wxID_ANY, "", wxDefaultPosition, wxSize(300, 50), wxNO_BORDER | wxTE_READONLY | wxTE_MULTILINE | wxTE_NO_VSCROLL); - BanishBackground(Branch); + wxStaticText* const Branch = new wxStaticText(this, wxID_ANY, BranchText + "\n" + BranchRevText + "\n" + CompiledText+"\n"); wxStaticText* const Message = new wxStaticText(this, wxID_ANY, Text); wxStaticText* const UpdateText = new wxStaticText(this, wxID_ANY, CheckUpdateText); wxStaticText* const FirstSpacer = new wxStaticText(this, wxID_ANY, " | "); @@ -102,9 +101,6 @@ AboutDolphin::AboutDolphin(wxWindow *parent, wxWindowID id, BranchFont.SetPointSize(7); Branch->SetFont(BranchFont); - Branch->AppendText(BranchText + "\n"); - Branch->AppendText(BranchRevText + "\n"); - Branch->AppendText(CompiledText); CopyrightFont.SetPointSize(7); Copyright->SetFont(CopyrightFont); From e6e046e37cdd7b677dfe5bbaea99dd5e20ae4f8f Mon Sep 17 00:00:00 2001 From: Simon McFarlane Date: Thu, 30 Apr 2015 17:32:45 -0700 Subject: [PATCH 2/3] Make revision text wxStaticText --- Source/Core/DolphinWX/AboutDolphin.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/Core/DolphinWX/AboutDolphin.cpp b/Source/Core/DolphinWX/AboutDolphin.cpp index 61d2f27e08..105275141d 100644 --- a/Source/Core/DolphinWX/AboutDolphin.cpp +++ b/Source/Core/DolphinWX/AboutDolphin.cpp @@ -75,8 +75,8 @@ AboutDolphin::AboutDolphin(wxWindow *parent, wxWindowID id, const wxString SupportText = _("Support"); wxStaticText* const Dolphin = new wxStaticText(this, wxID_ANY, DolphinText); - wxTextCtrl* const Revision = new wxTextCtrl(this, wxID_ANY, RevisionText, wxDefaultPosition, wxDefaultSize, wxNO_BORDER | wxTE_READONLY | wxTE_NO_VSCROLL); - BanishBackground(Revision); + wxStaticText* const Revision = new wxStaticText(this, wxID_ANY, RevisionText); + wxStaticText* const Copyright = new wxStaticText(this, wxID_ANY, CopyrightText); wxStaticText* const Branch = new wxStaticText(this, wxID_ANY, BranchText + "\n" + BranchRevText + "\n" + CompiledText+"\n"); wxStaticText* const Message = new wxStaticText(this, wxID_ANY, Text); From 886e5c80dd4ee0abae43a72ff3f38a11e7a0a6a8 Mon Sep 17 00:00:00 2001 From: Simon McFarlane Date: Thu, 30 Apr 2015 17:33:24 -0700 Subject: [PATCH 3/3] Remove BanishBackground function No longer needed --- Source/Core/DolphinWX/AboutDolphin.cpp | 8 -------- 1 file changed, 8 deletions(-) diff --git a/Source/Core/DolphinWX/AboutDolphin.cpp b/Source/Core/DolphinWX/AboutDolphin.cpp index 105275141d..7b35682ecd 100644 --- a/Source/Core/DolphinWX/AboutDolphin.cpp +++ b/Source/Core/DolphinWX/AboutDolphin.cpp @@ -25,14 +25,6 @@ #include "DolphinWX/AboutDolphin.h" #include "DolphinWX/resources/dolphin_logo.cpp" -static void BanishBackground(wxTextCtrl* ctrl) -{ -#ifdef __APPLE__ - NSTextField* tf = (NSTextField*)ctrl->GetHandle(); - tf.drawsBackground = NO; -#endif -} - AboutDolphin::AboutDolphin(wxWindow *parent, wxWindowID id, const wxString &title, const wxPoint &position, const wxSize& size, long style)