Merge pull request #2351 from illuminatedgeek/about-page-static-text

Change about page branch info to wxStaticText

1 files changed, 3 insertions, 15 deletions

diff --git a/Source/Core/DolphinWX/AboutDolphin.cpp b/Source/Core/DolphinWX/AboutDolphin.cpp
index 2adb9823e0..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)
@@ -75,11 +67,10 @@ 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);
-	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 +93,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);