Changeset 10037 for ps

Timestamp:

08/19/11 01:38:11 (13 years ago)

Author:

philip

Message:

Fix build with wxWidgets 2.9

Location:

ps/trunk/source/tools/atlas/AtlasUI

Files:

• CustomControls/Canvas/Canvas.cpp (modified) (1 diff)
• CustomControls/Canvas/Canvas.h (modified) (2 diffs)
• General/VideoRecorder/VideoRecorder.cpp (modified) (1 diff)
• Misc/DLLInterface.cpp (modified) (3 diffs)
• ScenarioEditor/ScenarioEditor.cpp (modified) (7 diffs)
• ScenarioEditor/SectionLayout.cpp (modified) (1 diff)
• ScenarioEditor/Sections/Cinematic/Cinematic.cpp (modified) (1 diff)
• ScenarioEditor/Sections/Map/Map.cpp (modified) (4 diffs)
• ScenarioEditor/Sections/Object/Object.cpp (modified) (1 diff)
• ScenarioEditor/Sections/Player/Player.cpp (modified) (2 diffs)
• ScenarioEditor/Sections/Terrain/Terrain.cpp (modified) (3 diffs)
• ScenarioEditor/Tools/Common/ObjectSettings.cpp (modified) (1 diff)
• ScenarioEditor/Tools/FillTerrain.cpp (modified) (1 diff)
• ScenarioEditor/Tools/PaintTerrain.cpp (modified) (1 diff)
• ScenarioEditor/Tools/PlaceObject.cpp (modified) (1 diff)
• ScenarioEditor/Tools/ReplaceTerrain.cpp (modified) (1 diff)

ps/trunk/source/tools/atlas/AtlasUI/CustomControls/Canvas/Canvas.cpp

@@ -24 +24 @@
 
 Canvas::Canvas(wxWindow* parent, int* attribList, long style)
-    : wxGLCanvas(parent, -1, wxDefaultPosition, wxDefaultSize, style, _T("GLCanvas"), attribList),
+    : wxGLCanvas(parent, -1, attribList, wxDefaultPosition, wxDefaultSize, style, _T("GLCanvas")),
+    m_GLContext(this),
     m_SuppressResize(true),
     m_LastMousePos(-1, -1), m_MouseCaptured(false)
 {
+}
+
+void Canvas::SetCurrent()
+{
+    m_GLContext.SetCurrent(*this);
 }
 

ps/trunk/source/tools/atlas/AtlasUI/CustomControls/Canvas/Canvas.h

@@ -24 +24 @@
 
     void InitSize();
+
+    void SetCurrent();
+
 protected:
     virtual void HandleMouseEvent(wxMouseEvent& evt) = 0;
@@ -32 +35 @@
     void OnMouse(wxMouseEvent& evt);
 
+    wxGLContext m_GLContext;
+
     bool m_SuppressResize;
 

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

@@ -201 +201 @@
     VideoEncoder venc (dlg.m_Filename, dlg.m_Framerate, dlg.m_Bitrate, duration, w, h);
 
-    qCinemaRecord qry(trackName.c_str(), dlg.m_Framerate, duration, w, h, Callback<sCinemaRecordCB>(&callback, (void*)&venc));
+    qCinemaRecord qry((std::wstring)trackName.wc_str(), dlg.m_Framerate, duration, w, h, Callback<sCinemaRecordCB>(&callback, (void*)&venc));
     qry.Post();
 

ps/trunk/source/tools/atlas/AtlasUI/Misc/DLLInterface.cpp

@@ -232 +232 @@
             if (argc > 1)
             {
-                wxChar* filename = argv[1];
+                wxString filename = argv[1];
 
                 if (filename[0] != _T('-')) // ignore -options
@@ -241 +241 @@
                     }
                     else
-                        wxLogError(_("Cannot find file '%s'"), filename);
+                        wxLogError(_("Cannot find file '%s'"), filename.c_str());
                 }
             }
@@ -332 +332 @@
 };
 
-IMPLEMENT_APP_NO_MAIN(AtlasDLLApp)
+IMPLEMENT_APP_NO_MAIN(AtlasDLLApp);

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

@@ -57 +57 @@
 ATLASDLLIMPEXP void Atlas_GLSetCurrent(void* canvas)
 {
-    static_cast<wxGLCanvas*>(canvas)->SetCurrent();
+    static_cast<Canvas*>(canvas)->SetCurrent();
 }
 
 ATLASDLLIMPEXP void Atlas_GLSwapBuffers(void* canvas)
 {
-    static_cast<wxGLCanvas*>(canvas)->SwapBuffers();
+    static_cast<Canvas*>(canvas)->SwapBuffers();
 }
 
@@ -359 +359 @@
     // Global application initialisation:
 
+    wxImage::AddHandler(new wxICOHandler);
+
     // wxLog::SetTraceMask(wxTraceMessages);
 
@@ -370 +372 @@
         wxFileName filename (relativePath, wxPATH_UNIX);
         filename.MakeAbsolute(Datafile::GetDataDirectory());
-        SetIcon(wxIcon(filename.GetFullPath()));
+        SetIcon(wxIcon(filename.GetFullPath(), wxBITMAP_TYPE_ICO));
     }
 #endif
@@ -609 +611 @@
 
     // TODO: Work when the map is not in .../maps/scenarios/
-    std::wstring map = name.c_str();
+    std::wstring map(name.wc_str());
 
     // Deactivate tools, so they don't carry forwards into the new CWorld
@@ -680 +682 @@
         m_ToolManager.SetCurrentTool(_T(""));
 
-        std::wstring map = m_OpenFilename.c_str();
+        std::wstring map(m_OpenFilename.wc_str());
         POST_MESSAGE(SaveMap, (map));
 
@@ -703 +705 @@
 
         // TODO: Work when the map is not in .../maps/scenarios/
-        std::wstring map = dlg.GetFilename().c_str();
+        std::wstring map(dlg.GetFilename().wc_str());
         POST_MESSAGE(SaveMap, (map));
 
@@ -752 +754 @@
     if (cmd.IsEmpty())
         return;
-    POST_MESSAGE(JavaScript, (cmd.c_str()));
+    POST_MESSAGE(JavaScript, ((std::wstring)cmd.wc_str()));
 }
 

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

@@ -309 +309 @@
 void SectionLayout::SelectPage(const wxString& classname)
 {
-    std::map<std::wstring, int>::iterator it = m_PageMappings.find(classname.c_str());
+    std::map<std::wstring, int>::iterator it = m_PageMappings.find((std::wstring)classname.wc_str());
     if (it != m_PageMappings.end())
         m_SidebarBook->SetSelection(it->second);

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

@@ -59 +59 @@
     {
         m_OldScale = CinemaTextFloat(*m_TimeText, 2, -5.f, 5.f, m_OldScale);
-        m_Sidebar->UpdatePath(m_Name->GetLineText(0).wc_str(), m_OldScale);
+        m_Sidebar->UpdatePath((std::wstring)m_Name->GetLineText(0).wc_str(), m_OldScale);
     }
     void Update(std::wstring name, float scale)

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

@@ -145 +145 @@
     gameTypes.Add(_T("endless"));
 
-    wxFlexGridSizer* gridSizer = new wxFlexGridSizer(2, 2, 5, 5);
+    wxFlexGridSizer* gridSizer = new wxFlexGridSizer(2, 5, 5);
     gridSizer->Add(new wxStaticText(this, wxID_ANY, _("Reveal map")), wxSizerFlags().Align(wxALIGN_CENTER_VERTICAL | wxALIGN_RIGHT));
     gridSizer->Add(new wxCheckBox(this, ID_MapReveal, wxEmptyString));
@@ -157 +157 @@
 
     wxStaticBoxSizer* keywordsSizer = new wxStaticBoxSizer(wxVERTICAL, this, _("Keywords"));
-    wxFlexGridSizer* kwGridSizer = new wxFlexGridSizer(2, 2, 5, 5);
+    wxFlexGridSizer* kwGridSizer = new wxFlexGridSizer(2, 5, 5);
     kwGridSizer->Add(new wxStaticText(this, wxID_ANY, _("Demo")), wxSizerFlags().Align(wxALIGN_CENTER_VERTICAL | wxALIGN_RIGHT));
     kwGridSizer->Add(new wxCheckBox(this, ID_MapKW_Demo, wxEmptyString));
@@ -273 +273 @@
         sizer->AddSpacer(5);
 
-        wxFlexGridSizer* gridSizer = new wxFlexGridSizer(2, 2, 5, 5);
+        wxFlexGridSizer* gridSizer = new wxFlexGridSizer(2, 5, 5);
         gridSizer->AddGrowableCol(1);
 
@@ -484 +484 @@
     wxString scriptName(settings["Script"]);
 
-    AtlasMessage::qGenerateMap qry(scriptName.c_str(), json);
+    AtlasMessage::qGenerateMap qry((std::wstring)scriptName.wc_str(), json);
     qry.Post();
 
     if (qry.status < 0)
-        wxLogError(_("Random map script '%ls' failed"), scriptName.c_str());
+    {
+        wxLogError(_("Random map script '%ls' failed"), scriptName.wc_str());
+    }
 
     m_ScenarioEditor.NotifyOnMapReload();

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

@@ -105 +105 @@
     void ActorViewerPostToGame()
     {
-        POST_MESSAGE(SetActorViewer, (m_ActorViewerEntity.c_str(), m_ActorViewerAnimation.c_str(), m_ActorViewerSpeed, false));
+        POST_MESSAGE(SetActorViewer, ((std::wstring)m_ActorViewerEntity.wc_str(), (std::wstring)m_ActorViewerAnimation.wc_str(), m_ActorViewerSpeed, false));
     }
 };

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

@@ -73 +73 @@
         // Player Info
         wxStaticBoxSizer* playerInfoSizer = new wxStaticBoxSizer(wxVERTICAL, this, _("Player info"));
-        wxFlexGridSizer* gridSizer = new wxFlexGridSizer(2, 2, 5, 5);
+        wxFlexGridSizer* gridSizer = new wxFlexGridSizer(2, 5, 5);
         gridSizer->AddGrowableCol(1);
         gridSizer->Add(new wxStaticText(this, wxID_ANY, _("Name")), wxSizerFlags().Align(wxALIGN_CENTER_VERTICAL | wxALIGN_RIGHT));
@@ -98 +98 @@
         // Resources
         wxStaticBoxSizer* resourceSizer = new wxStaticBoxSizer(wxVERTICAL, this, _("Resources"));
-        gridSizer = new wxFlexGridSizer(2, 2, 5, 5);
+        gridSizer = new wxFlexGridSizer(2, 5, 5);
         gridSizer->AddGrowableCol(1);
         gridSizer->Add(new wxStaticText(this, wxID_ANY, _("Food")), wxSizerFlags().Align(wxALIGN_CENTER_VERTICAL | wxALIGN_RIGHT));

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

@@ -95 +95 @@
         m_MainSizer->Add(sizer, wxSizerFlags().Expand().Border(wxTOP, 10));
 
-        wxSizer* visSizer = new wxFlexGridSizer(2, 2, 5, 5);
+        wxSizer* visSizer = new wxFlexGridSizer(2, 5, 5);
         sizer->Add(visSizer);
 
@@ -137 +137 @@
         POST_MESSAGE(SetViewParamS, (AtlasMessage::eRenderView::GAME, L"passability", L""));
     else
-        POST_MESSAGE(SetViewParamS, (AtlasMessage::eRenderView::GAME, L"passability", evt.GetString().c_str()));
+        POST_MESSAGE(SetViewParamS, (AtlasMessage::eRenderView::GAME, L"passability", (std::wstring)evt.GetString().wc_str()));
 }
 
@@ -227 +227 @@
         m_LastTerrainSelection = NULL; // clear any reference to deleted button
 
-        AtlasMessage::qGetTerrainGroupPreviews qry(m_Name.c_str(), imageWidth, imageHeight);
+        AtlasMessage::qGetTerrainGroupPreviews qry((std::wstring)m_Name.wc_str(), imageWidth, imageHeight);
         qry.Post();
 

ps/trunk/source/tools/atlas/AtlasUI/ScenarioEditor/Tools/Common/ObjectSettings.cpp

@@ -99 +99 @@
         ++it)
     {
-        selections.push_back(it->c_str());
+        selections.push_back((std::wstring)it->wc_str());
     }
     settings.selections = selections;

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

@@ -58 +58 @@
                 Position pos(evt.GetPosition());
                 POST_MESSAGE(BrushPreview, (true, pos));
-                POST_COMMAND(FillTerrain, (pos, g_SelectedTexture.c_str()));
+                POST_COMMAND(FillTerrain, (pos, (std::wstring)g_SelectedTexture.wc_str()));
                 return true;
             }

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

@@ -116 +116 @@
         {
             POST_MESSAGE(BrushPreview, (true, obj->m_Pos));
-            POST_COMMAND(PaintTerrain, (obj->m_Pos, g_SelectedTexture.c_str(), GetPriority()));
+            POST_COMMAND(PaintTerrain, (obj->m_Pos, (std::wstring)g_SelectedTexture.wc_str(), GetPriority()));
         }
 

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

@@ -49 +49 @@
         bool useTarget = (dragDistSq >= 16*16);
         if (preview)
-            POST_MESSAGE(ObjectPreview, (m_ObjectID.c_str(), GetScenarioEditor().GetObjectSettings().GetSettings(), m_ObjPos, useTarget, m_Target, g_DefaultAngle));
+            POST_MESSAGE(ObjectPreview, ((std::wstring)m_ObjectID.wc_str(), GetScenarioEditor().GetObjectSettings().GetSettings(), m_ObjPos, useTarget, m_Target, g_DefaultAngle));
         else
-            POST_COMMAND(CreateObject, (m_ObjectID.c_str(), GetScenarioEditor().GetObjectSettings().GetSettings(), m_ObjPos, useTarget, m_Target, g_DefaultAngle));
+            POST_COMMAND(CreateObject, ((std::wstring)m_ObjectID.wc_str(), GetScenarioEditor().GetObjectSettings().GetSettings(), m_ObjPos, useTarget, m_Target, g_DefaultAngle));
     }
 

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

@@ -58 +58 @@
                 Position pos(evt.GetPosition());
                 POST_MESSAGE(BrushPreview, (true, pos));
-                POST_COMMAND(ReplaceTerrain, (pos, g_SelectedTexture.c_str()));
+                POST_COMMAND(ReplaceTerrain, (pos, (std::wstring)g_SelectedTexture.wc_str()));
                 return true;
             }