Changeset 10095 for ps

Timestamp:

08/26/11 03:56:14 (13 years ago)

Author:

ben

Message:

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).

Location:

ps/trunk/source/tools/atlas/AtlasUI

Files:

• ActorEditor/ActorEditor.cpp (modified) (3 diffs)
• CustomControls/EditableListCtrl/QuickFileCtrl.cpp (modified) (2 diffs)
• CustomControls/Windows/AtlasWindow.cpp (modified) (2 diffs)
• General/VideoRecorder/VideoRecorder.cpp (modified) (2 diffs)
• ScenarioEditor/ScenarioEditor.cpp (modified) (2 diffs)
• ScenarioEditor/Tools/PlaceObject.cpp (modified) (2 diffs)

ps/trunk/source/tools/atlas/AtlasUI/ActorEditor/ActorEditor.cpp

@@ -1 @@
-/* Copyright (C) 2009 Wildfire Games.
+/* Copyright (C) 2011 Wildfire Games.
  * This file is part of 0 A.D.
  *
@@ -385 +385 @@
     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())
@@ -395 +395 @@
     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())

ps/trunk/source/tools/atlas/AtlasUI/CustomControls/EditableListCtrl/QuickFileCtrl.cpp

@@ -1 @@
-/* Copyright (C) 2009 Wildfire Games.
+/* Copyright (C) 2011 Wildfire Games.
  * This file is part of 0 A.D.
  *
@@ -139 +139 @@
         }
 
-        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;

ps/trunk/source/tools/atlas/AtlasUI/CustomControls/Windows/AtlasWindow.cpp

@@ -216 +216 @@
     }
 
-    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)
@@ -263 +263 @@
             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)

ps/trunk/source/tools/atlas/AtlasUI/General/VideoRecorder/VideoRecorder.cpp

@@ -1 @@
-/* Copyright (C) 2009 Wildfire Games.
+/* Copyright (C) 2011 Wildfire Games.
  * This file is part of 0 A.D.
  *
@@ -160 +160 @@
         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;

ps/trunk/source/tools/atlas/AtlasUI/ScenarioEditor/ScenarioEditor.cpp

@@ -638 +638 @@
         Datafile::GetDataDirectory() + _T("/mods/public/maps/scenarios"), m_OpenFilename,
         _T("PMP files (*.pmp)|*.pmp|All files (*.*)|*.*"),
-        wxOPEN);
+        wxFD_OPEN);
 
     wxString cwd = wxFileName::GetCwd();
@@ -696 +696 @@
         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)

ps/trunk/source/tools/atlas/AtlasUI/ScenarioEditor/Tools/PlaceObject.cpp

@@ -1 @@
-/* Copyright (C) 2009 Wildfire Games.
+/* Copyright (C) 2011 Wildfire Games.
  * This file is part of 0 A.D.
  *
@@ -116 +116 @@
     {
         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)
         {