ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Change about page branch info to wxStaticText
This commit is contained in:
Lioncash 2015-04-30 20:39:06 -04:00
parent ad6ed9a6bc 886e5c80dd
commit 5cdac0d826
1 changed files with 3 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Source/Core/DolphinWX/AboutDolphin.cpp
View File

@ -25,14 +25,6 @@
#include "DolphinWX/AboutDolphin.h" #include "DolphinWX/AboutDolphin.h"
#include "DolphinWX/resources/dolphin_logo.cpp" #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, AboutDolphin::AboutDolphin(wxWindow *parent, wxWindowID id,
const wxString &title, const wxPoint &position, const wxString &title, const wxPoint &position,
const wxSize& size, long style) const wxSize& size, long style)
@ -75,11 +67,10 @@ AboutDolphin::AboutDolphin(wxWindow *parent, wxWindowID id,
const wxString SupportText = _("Support"); const wxString SupportText = _("Support");
wxStaticText* const Dolphin = new wxStaticText(this, wxID_ANY, DolphinText); 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); wxStaticText* const Revision = new wxStaticText(this, wxID_ANY, RevisionText);
BanishBackground(Revision);
wxStaticText* const Copyright = new wxStaticText(this, wxID_ANY, CopyrightText); 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); wxStaticText* const Branch = new wxStaticText(this, wxID_ANY, BranchText + "\n" + BranchRevText + "\n" + CompiledText+"\n");
BanishBackground(Branch);
wxStaticText* const Message = new wxStaticText(this, wxID_ANY, Text); wxStaticText* const Message = new wxStaticText(this, wxID_ANY, Text);
wxStaticText* const UpdateText = new wxStaticText(this, wxID_ANY, CheckUpdateText); wxStaticText* const UpdateText = new wxStaticText(this, wxID_ANY, CheckUpdateText);
wxStaticText* const FirstSpacer = new wxStaticText(this, wxID_ANY, " | "); wxStaticText* const FirstSpacer = new wxStaticText(this, wxID_ANY, " | ");
@ -102,9 +93,6 @@ AboutDolphin::AboutDolphin(wxWindow *parent, wxWindowID id,
BranchFont.SetPointSize(7); BranchFont.SetPointSize(7);
Branch->SetFont(BranchFont); Branch->SetFont(BranchFont);
Branch->AppendText(BranchText + "\n");
Branch->AppendText(BranchRevText + "\n");
Branch->AppendText(CompiledText);
CopyrightFont.SetPointSize(7); CopyrightFont.SetPointSize(7);
Copyright->SetFont(CopyrightFont); Copyright->SetFont(CopyrightFont);