GitHub-Proxy/Slic3r
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/slic3r/Slic3r.git synced 2025-08-04 15:50:38 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Avoid gcc interpreting things as initializer lists.

Browse Source
This commit is contained in:
Joseph Lenox 2018-05-13 12:47:31 -05:00 committed by Joseph Lenox
parent 720d4f1571
commit 7fcf9b65ed
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/GUI/AboutDialog.cpp
View File

@ -10,16 +10,16 @@ static void link_clicked(wxHtmlLinkEvent& e)
AboutDialog::AboutDialog(wxWindow* parent) : wxDialog(parent, -1, _("About Slic3r"), wxDefaultPosition, wxSize(600, 460), wxCAPTION) AboutDialog::AboutDialog(wxWindow* parent) : wxDialog(parent, -1, _("About Slic3r"), wxDefaultPosition, wxSize(600, 460), wxCAPTION)
{ {
auto hsizer { new wxBoxSizer(wxHORIZONTAL) } ; auto hsizer = new wxBoxSizer(wxHORIZONTAL) ;
auto vsizer { new wxBoxSizer(wxVERTICAL) } ; auto vsizer = new wxBoxSizer(wxVERTICAL) ;
// logo // logo
auto logo { new AboutDialogLogo(this) }; auto logo = new AboutDialogLogo(this);
hsizer->Add(logo, 0, wxEXPAND | wxLEFT | wxRIGHT, 30); hsizer->Add(logo, 0, wxEXPAND | wxLEFT | wxRIGHT, 30);
// title // title
auto title { new wxStaticText(this, -1, "Slic3r", wxDefaultPosition, wxDefaultSize) }; auto title = new wxStaticText(this, -1, "Slic3r", wxDefaultPosition, wxDefaultSize);
auto title_font { wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT) }; auto title_font { wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT) };
title_font.SetWeight(wxFONTWEIGHT_BOLD); title_font.SetWeight(wxFONTWEIGHT_BOLD);
@ -31,7 +31,7 @@ AboutDialog::AboutDialog(wxWindow* parent) : wxDialog(parent, -1, _("About Slic3
// version // version
auto version {new wxStaticText(this, -1, wxString("Version ") + wxString(SLIC3R_VERSION), wxDefaultPosition, wxDefaultSize) }; auto version = new wxStaticText(this, -1, wxString("Version ") + wxString(SLIC3R_VERSION), wxDefaultPosition, wxDefaultSize);
auto version_font { wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT) }; auto version_font { wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT) };
version_font.SetPointSize((the_os == OS::Windows ? 9 : 11)); version_font.SetPointSize((the_os == OS::Windows ? 9 : 11));
version->SetFont(version_font); version->SetFont(version_font);
@ -54,7 +54,7 @@ AboutDialog::AboutDialog(wxWindow* parent) : wxDialog(parent, -1, _("About Slic3
<< "Built on " << build_date << " at git version " << git_version << "." << "Built on " << build_date << " at git version " << git_version << "."
<< "</body>" << "</body>"
<< "</html>"; << "</html>";
auto html {new wxHtmlWindow(this, -1, wxDefaultPosition, wxDefaultSize, wxHW_SCROLLBAR_NEVER)}; auto html = new wxHtmlWindow(this, -1, wxDefaultPosition, wxDefaultSize, wxHW_SCROLLBAR_NEVER);
html->SetBorders(2); html->SetBorders(2);
html->SetPage(text); html->SetPage(text);