From e8253249a26d04f641b8d7f432c41687b506684f Mon Sep 17 00:00:00 2001 From: historic_bruno Date: Mon, 29 Aug 2011 22:27:58 +0000 Subject: [PATCH] Switches Atlas player panel to our custom ColourDialog for consistency. This was SVN commit r10134. --- .../AtlasUI/ScenarioEditor/Sections/Player/Player.cpp | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Player/Player.cpp b/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Player/Player.cpp index b38fb0c941..a85b886e4a 100644 --- a/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Player/Player.cpp +++ b/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Player/Player.cpp @@ -21,10 +21,10 @@ #include "AtlasObject/AtlasObject.h" #include "AtlasScript/ScriptInterface.h" +#include "CustomControls/ColourDialog/ColourDialog.h" #include "ScenarioEditor/ScenarioEditor.h" #include "wx/choicebk.h" -#include "wx/colordlg.h" enum { @@ -227,11 +227,7 @@ private: void OnColour(wxCommandEvent& evt) { // Show colour dialog - wxColourData clrData; - clrData.SetColour(m_Controls.colour->GetBackgroundColour()); - - wxColourDialog colourDlg(this, &clrData); - colourDlg.SetTitle(_("Choose player colour")); + ColourDialog colourDlg(this, _T("Scenario Editor/PlayerColour"), m_Controls.colour->GetBackgroundColour()); if (colourDlg.ShowModal() == wxID_OK) {