Ticket #3824: atlas_warning_fixes.patch

File atlas_warning_fixes.patch, 6.3 KB (added by Stephen Imhoff, 8 years ago)

correct flags, normalize spelling

  • source/tools/atlas/AtlasUI/CustomControls/MapDialog/MapDialog.cpp 

    From 60e26d38ee6f1ebe0d8992fb8cfc04d9f1f577f7 Mon Sep 17 00:00:00 2001
From: "Stephen A. Imhoff" <clockwork-muse@outlook.com>
Date: Sun, 29 May 2016 15:04:18 +0900
Subject: [PATCH] Remove ignored flags.

---
 source/tools/atlas/AtlasUI/CustomControls/MapDialog/MapDialog.cpp | 2 +-
 .../tools/atlas/AtlasUI/ScenarioEditor/Sections/Player/Player.cpp | 4 ++--
 .../atlas/AtlasUI/ScenarioEditor/Sections/Terrain/Terrain.cpp     | 8 ++++----
 .../tools/atlas/AtlasUI/ScenarioEditor/Tools/Common/Brushes.cpp   | 4 ++--
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/source/tools/atlas/AtlasUI/CustomControls/MapDialog/MapDialog.cpp b/source/tools/atlas/AtlasUI/CustomControls/MapDialog/MapDialog.cpp
index f5eab4f..a56ee3f 100644
    a b MapDialog::MapDialog(wxWindow* parent, MapDialogType type, const wxIcon& icon)  
    9595
    9696    wxSizer* filenameSizer = new wxBoxSizer(wxHORIZONTAL);
    9797    filenameSizer->AddSpacer(10);
    98     filenameSizer->Add(new wxStaticText(this, wxID_ANY, _("Map name: ")), wxSizerFlags().Align(wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL));
     98    filenameSizer->Add(new wxStaticText(this, wxID_ANY, _("Map name: ")), wxSizerFlags().Align(wxALIGN_CENTER_VERTICAL));
    9999    wxTextCtrl* filename = new wxTextCtrl(this, ID_MapDialogFilename, wxEmptyString);
    100100    if (m_Type == MAPDIALOG_OPEN)
    101101        filename->Disable();

  • source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Player/Player.cpp 

    diff --git a/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Player/Player.cpp b/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Player/Player.cpp
index c99200d..bbaf307 100644
    a b public:  
    201201            wxChoice* teamCtrl = new wxChoice(this, wxID_ANY);
    202202            boxSizer->Add(new DefaultCheckbox(this, ID_DefaultTeam, teamCtrl), wxSizerFlags().Align(wxALIGN_CENTER_VERTICAL));
    203203            boxSizer->AddSpacer(5);
    204             boxSizer->Add(new wxStaticText(this, wxID_ANY, _("Team")), wxSizerFlags().Align(wxALIGN_CENTER_VERTICAL | wxALIGN_RIGHT));
     204            boxSizer->Add(new wxStaticText(this, wxID_ANY, _("Team")), wxSizerFlags().Align(wxALIGN_CENTER_VERTICAL));
    205205            boxSizer->AddSpacer(5);
    206206            teamCtrl->Append(_("None"));
    207207            teamCtrl->Append(_T("1"));
    … … PlayerSettingsControl::PlayerSettingsControl(wxWindow* parent, ScenarioEditor& s  
    560560    SetSizer(sizer);
    561561
    562562    wxBoxSizer* boxSizer = new wxBoxSizer(wxHORIZONTAL);
    563     boxSizer->Add(new wxStaticText(this, wxID_ANY, _("Num players")), wxSizerFlags().Align(wxALIGN_CENTER_VERTICAL | wxALIGN_RIGHT));
     563    boxSizer->Add(new wxStaticText(this, wxID_ANY, _("Num players")), wxSizerFlags().Align(wxALIGN_CENTER_VERTICAL));
    564564    wxSpinCtrl* numPlayersSpin = new wxSpinCtrl(this, ID_NumPlayers, wxEmptyString, wxDefaultPosition, wxSize(40, -1));
    565565    numPlayersSpin->SetValue(MAX_NUM_PLAYERS);
    566566    numPlayersSpin->SetRange(1, MAX_NUM_PLAYERS);

  • source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Terrain/Terrain.cpp 

    diff --git a/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Terrain/Terrain.cpp b/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Terrain/Terrain.cpp
index 2c2287a..d6a935b 100644
    a b public:  
    119119            wxImage img(qry.preview->imageWidth, qry.preview->imageHeight, buf);
    120120
    121121            wxStaticBitmap* bitmap = new wxStaticBitmap(this, wxID_ANY, wxBitmap(img), wxDefaultPosition, wxSize(qry.preview->imageWidth, qry.preview->imageHeight), wxBORDER_SIMPLE);
    122             m_Sizer->Add(bitmap, wxSizerFlags(1).Align(wxALIGN_CENTRE));
     122            m_Sizer->Add(bitmap, wxSizerFlags(1).Align(wxALIGN_CENTER));
    123123            m_Sizer->Add(label, wxSizerFlags().Expand());
    124124       
    125125            // We have to force the sidebar to layout manually
    … … TerrainSidebar::TerrainSidebar(ScenarioEditor& scenarioEditor, wxWindow* sidebar  
    232232        m_PassabilityChoice = new wxChoice(this, ID_Passability, wxDefaultPosition, wxDefaultSize, defaultChoices);
    233233        m_PassabilityChoice->SetSelection(0);
    234234
    235         visSizer->Add(new wxStaticText(this, wxID_ANY, _("Passability")), wxSizerFlags().Align(wxALIGN_CENTER|wxALIGN_RIGHT));
     235        visSizer->Add(new wxStaticText(this, wxID_ANY, _("Passability")), wxSizerFlags().Align(wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT));
    236236        visSizer->Add(Tooltipped(m_PassabilityChoice,
    237237            _("View passability classes")), wxSizerFlags().Expand());
    238238
    239         visSizer->Add(new wxStaticText(this, wxID_ANY, _("Priorities")), wxSizerFlags().Align(wxALIGN_CENTER|wxALIGN_RIGHT));
     239        visSizer->Add(new wxStaticText(this, wxID_ANY, _("Priorities")), wxSizerFlags().Align(wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT));
    240240        visSizer->Add(Tooltipped(new wxCheckBox(this, ID_ShowPriorities, _("")),
    241241            _("Show terrain texture priorities")));
    242242    }
    … … public:  
    390390            wxSizer* imageSizer = new wxBoxSizer(wxVERTICAL);
    391391            imageSizer->Add(button, wxSizerFlags().Center());
    392392            imageSizer->Add(label, wxSizerFlags().Proportion(1).Center());
    393             m_ItemSizer->Add(imageSizer, wxSizerFlags().Expand().Center());
     393            m_ItemSizer->Add(imageSizer, wxSizerFlags().Center());
    394394        }
    395395
    396396        m_ScrolledPanel->Fit();

  • source/tools/atlas/AtlasUI/ScenarioEditor/Tools/Common/Brushes.cpp 

    diff --git a/source/tools/atlas/AtlasUI/ScenarioEditor/Tools/Common/Brushes.cpp b/source/tools/atlas/AtlasUI/ScenarioEditor/Tools/Common/Brushes.cpp
index 9a159f7..4874087 100644
    a b void Brush::CreateUI(wxWindow* parent, wxSizer* sizer)  
    244244    // TODO: These are yucky
    245245    wxFlexGridSizer* spinnerSizer = new wxFlexGridSizer(2, 5, 5);
    246246    spinnerSizer->AddGrowableCol(1);
    247     spinnerSizer->Add(new wxStaticText(parent, wxID_ANY, _("Size")), wxSizerFlags().Align(wxALIGN_CENTER|wxALIGN_RIGHT));
     247    spinnerSizer->Add(new wxStaticText(parent, wxID_ANY, _("Size")), wxSizerFlags().Align(wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT));
    248248    spinnerSizer->Add(new BrushSizeCtrl(parent, *this), wxSizerFlags().Expand());
    249     spinnerSizer->Add(new wxStaticText(parent, wxID_ANY, _("Strength")), wxSizerFlags().Align(wxALIGN_CENTER|wxALIGN_RIGHT));
     249    spinnerSizer->Add(new wxStaticText(parent, wxID_ANY, _("Strength")), wxSizerFlags().Align(wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT));
    250250    spinnerSizer->Add(new BrushStrengthCtrl(parent, *this), wxSizerFlags().Expand());
    251251    sizer->Add(spinnerSizer, wxSizerFlags().Expand());
    252252}