paczek/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

Fixes use of deprecated wxWidgets constants as they don't work on all platforms (only when the library was built with WXWIN_COMPATIBILITY_2_6).

Browse Source 
This was SVN commit r10095.
This commit is contained in:
historic_bruno 2011-08-26 01:56:14 +00:00
parent 9090545852
commit 2d1fe050b9
6 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source/tools/atlas/AtlasUI/ActorEditor/ActorEditor.cpp
View File

@ -1,4 +1,4 @@
/* Copyright (C) 2009 Wildfire Games.
/* Copyright (C) 2011 Wildfire Games.
* This file is part of 0 A.D.
*
* 0 A.D. is free software: you can redistribute it and/or modify
@ -384,7 +384,7 @@ void ActorEditor::OnCreateEntity(wxCommandEvent& WXUNUSED(event))
wxString parentEntityFilename
(wxFileSelector(_("Choose a parent entity"), entityPath.GetPath(), _T(""),
_T("xml"), _("XML files (*.xml)|*.xml|All files (*.*)|*.*"), wxOPEN, this));
_T("xml"), _("XML files (*.xml)|*.xml|All files (*.*)|*.*"), wxFD_OPEN, this));
if (! parentEntityFilename.Length())
return; // cancelled by user
@ -394,7 +394,7 @@ void ActorEditor::OnCreateEntity(wxCommandEvent& WXUNUSED(event))
wxString outputEntityFilename
(wxFileSelector(_("Choose a filename to save as"), entityPath.GetPath(), entityName,
_T("xml"), _("XML files (*.xml)|*.xml|All files (*.*)|*.*"), wxSAVE|wxOVERWRITE_PROMPT, this));
_T("xml"), _("XML files (*.xml)|*.xml|All files (*.*)|*.*"), wxFD_SAVE|wxFD_OVERWRITE_PROMPT, this));
if (! outputEntityFilename.Length())
return; // cancelled by user

4
source/tools/atlas/AtlasUI/CustomControls/EditableListCtrl/QuickFileCtrl.cpp
View File

@ -1,4 +1,4 @@
/* Copyright (C) 2009 Wildfire Games.
/* Copyright (C) 2011 Wildfire Games.
* This file is part of 0 A.D.
*
* 0 A.D. is free software: you can redistribute it and/or modify
@ -138,7 +138,7 @@ public:
defaultFile = wxEmptyString;
}
wxFileDialog dlg(this, _("Choose a file"), defaultDir, defaultFile, m_FileMask, wxOPEN);
wxFileDialog dlg(this, _("Choose a file"), defaultDir, defaultFile, m_FileMask, wxFD_OPEN);
parent->m_DisableKillFocus = true;
int ret = dlg.ShowModal();

4
source/tools/atlas/AtlasUI/CustomControls/Windows/AtlasWindow.cpp
View File

@ -215,7 +215,7 @@ void AtlasWindow::OnOpen(wxCommandEvent& WXUNUSED(event))
path = GetDefaultOpenDirectory();
}
wxFileDialog dlg (this, _("Select XML file to open"), path, name, _("XML files (*.xml)|*.xml|All files (*.*)|*.*"), wxOPEN);
wxFileDialog dlg (this, _("Select XML file to open"), path, name, _("XML files (*.xml)|*.xml|All files (*.*)|*.*"), wxFD_OPEN);
if (dlg.ShowModal() != wxID_OK)
return;
@ -262,7 +262,7 @@ bool AtlasWindow::SaveChanges(bool forceSaveAs)
wxFileDialog dlg (this, _("Select XML file to save as"),
GetCurrentFilename().GetPath(), GetCurrentFilename().GetFullName(),
//_T(""), _T(""),
_("XML files (*.xml)|*.xml|All files (*.*)|*.*"), wxSAVE | wxOVERWRITE_PROMPT);
_("XML files (*.xml)|*.xml|All files (*.*)|*.*"), wxFD_SAVE | wxFD_OVERWRITE_PROMPT);
if (dlg.ShowModal() != wxID_OK)
return false;

4
source/tools/atlas/AtlasUI/General/VideoRecorder/VideoRecorder.cpp
View File

@ -1,4 +1,4 @@
/* Copyright (C) 2009 Wildfire Games.
/* Copyright (C) 2011 Wildfire Games.
* This file is part of 0 A.D.
*
* 0 A.D. is free software: you can redistribute it and/or modify
@ -159,7 +159,7 @@ private:
wxTextCtrl* filenameWin = wxDynamicCast(FindWindow(ID_FILENAME), wxTextCtrl);
wxCHECK(filenameWin, );
wxFileDialog dlg (this, wxFileSelectorPromptStr, filenameWin->GetValue(), filenameWin->GetValue(), _("MP4 files (*.mp4)|*.mp4"), wxSAVE);
wxFileDialog dlg (this, wxFileSelectorPromptStr, filenameWin->GetValue(), filenameWin->GetValue(), _("MP4 files (*.mp4)|*.mp4"), wxFD_SAVE);
if (dlg.ShowModal() != wxID_OK)
return;

4
source/tools/atlas/AtlasUI/ScenarioEditor/ScenarioEditor.cpp
View File

@ -637,7 +637,7 @@ void ScenarioEditor::OnOpen(wxCommandEvent& WXUNUSED(event))
wxFileDialog dlg (NULL, wxFileSelectorPromptStr,
Datafile::GetDataDirectory() + _T("/mods/public/maps/scenarios"), m_OpenFilename,
_T("PMP files (*.pmp)|*.pmp|All files (*.*)|*.*"),
wxOPEN);
wxFD_OPEN);
wxString cwd = wxFileName::GetCwd();
@ -695,7 +695,7 @@ void ScenarioEditor::OnSaveAs(wxCommandEvent& WXUNUSED(event))
wxFileDialog dlg (NULL, wxFileSelectorPromptStr,
Datafile::GetDataDirectory() + _T("/mods/public/maps/scenarios"), m_OpenFilename,
_T("PMP files (*.pmp)|*.pmp|All files (*.*)|*.*"),
wxSAVE | wxOVERWRITE_PROMPT);
wxFD_SAVE | wxFD_OVERWRITE_PROMPT);
if (dlg.ShowModal() == wxID_OK)
{

6
source/tools/atlas/AtlasUI/ScenarioEditor/Tools/PlaceObject.cpp
View File

@ -1,4 +1,4 @@
/* Copyright (C) 2009 Wildfire Games.
/* Copyright (C) 2011 Wildfire Games.
* This file is part of 0 A.D.
*
* 0 A.D. is free software: you can redistribute it and/or modify
@ -115,8 +115,8 @@ public:
void RotateTick(float dt)
{
int dir = 0;
if (wxGetKeyState(WXK_NEXT)) ++dir; // page-down key
if (wxGetKeyState(WXK_PRIOR)) --dir; // page-up key
if (wxGetKeyState(WXK_PAGEDOWN)) ++dir; // page-down key
if (wxGetKeyState(WXK_PAGEUP)) --dir; // page-up key
if (dir)
{
float speed = M_PI/2.f * ScenarioEditor::GetSpeedModifier(); // radians per second