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

Fix build with wxWidgets 2.9

Browse Source 
This was SVN commit r10037.
This commit is contained in:
Ykkrosh 2011-08-18 23:38:11 +00:00
parent 49af1880f8
commit 5f07107609
16 changed files with 46 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
source/tools/atlas/AtlasUI/CustomControls/Canvas/Canvas.cpp
View File

@ -23,12 +23,18 @@
#include "ScenarioEditor/Tools/Common/Tools.h"
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);
}
void Canvas::OnResize(wxSizeEvent&)
{
// Be careful not to send 'resize' messages to the game before we've

5
source/tools/atlas/AtlasUI/CustomControls/Canvas/Canvas.h
View File

@ -23,6 +23,9 @@ public:
Canvas(wxWindow* parent, int* attribList, long style);
void InitSize();
void SetCurrent();
protected:
virtual void HandleMouseEvent(wxMouseEvent& evt) = 0;
@ -31,6 +34,8 @@ private:
void OnMouseCapture(wxMouseCaptureChangedEvent& evt);
void OnMouse(wxMouseEvent& evt);
wxGLContext m_GLContext;
bool m_SuppressResize;
wxPoint m_LastMousePos;

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

@ -200,7 +200,7 @@ void VideoRecorder::RecordCinematic(wxWindow* window, const wxString& trackName,
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();
wxLogMessage(_("Finished recording (took %.1f seconds)\n"), sw.Time()/1000.f);

6
source/tools/atlas/AtlasUI/Misc/DLLInterface.cpp
View File

@ -231,7 +231,7 @@ public:
// One argument => argv[1] is probably a filename to open
if (argc > 1)
{
wxChar* filename = argv[1];
wxString filename = argv[1];
if (filename[0] != _T('-')) // ignore -options
{
@ -240,7 +240,7 @@ public:
win->OpenFile(filename);
}
else
wxLogError(_("Cannot find file '%s'"), filename);
wxLogError(_("Cannot find file '%s'"), filename.c_str());
}
}
}
@ -331,4 +331,4 @@ private:
}
};
IMPLEMENT_APP_NO_MAIN(AtlasDLLApp)
IMPLEMENT_APP_NO_MAIN(AtlasDLLApp);

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

@ -56,12 +56,12 @@ using namespace AtlasMessage;
// thread to the standard wx one)
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();
}
@ -358,6 +358,8 @@ ScenarioEditor::ScenarioEditor(wxWindow* parent, ScriptInterface& scriptInterfac
{
// Global application initialisation:
wxImage::AddHandler(new wxICOHandler);
// wxLog::SetTraceMask(wxTraceMessages);
SetOpenFilename(_T(""));
@ -369,7 +371,7 @@ ScenarioEditor::ScenarioEditor(wxWindow* parent, ScriptInterface& scriptInterfac
const wxString relativePath (_T("tools/atlas/icons/ScenarioEditor.ico"));
wxFileName filename (relativePath, wxPATH_UNIX);
filename.MakeAbsolute(Datafile::GetDataDirectory());
SetIcon(wxIcon(filename.GetFullPath()));
SetIcon(wxIcon(filename.GetFullPath(), wxBITMAP_TYPE_ICO));
}
#endif
@ -608,7 +610,7 @@ void ScenarioEditor::OpenFile(const wxString& name, const wxString& filename)
wxBusyCursor busyc;
// 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
// and crash.
@ -679,7 +681,7 @@ void ScenarioEditor::OnSave(wxCommandEvent& event)
// the preview units.)
m_ToolManager.SetCurrentTool(_T(""));
std::wstring map = m_OpenFilename.c_str();
std::wstring map(m_OpenFilename.wc_str());
POST_MESSAGE(SaveMap, (map));
// Wait for it to finish saving
@ -702,7 +704,7 @@ void ScenarioEditor::OnSaveAs(wxCommandEvent& WXUNUSED(event))
m_ToolManager.SetCurrentTool(_T(""));
// 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));
SetOpenFilename(dlg.GetFilename());
@ -751,7 +753,7 @@ void ScenarioEditor::OnJavaScript(wxCommandEvent& WXUNUSED(event))
wxString cmd = ::wxGetTextFromUser(_T(""), _("JS command"), _T(""), this);
if (cmd.IsEmpty())
return;
POST_MESSAGE(JavaScript, (cmd.c_str()));
POST_MESSAGE(JavaScript, ((std::wstring)cmd.wc_str()));
}
void ScenarioEditor::OnCameraReset(wxCommandEvent& WXUNUSED(event))

2
source/tools/atlas/AtlasUI/ScenarioEditor/SectionLayout.cpp
View File

@ -308,7 +308,7 @@ void SectionLayout::Build(ScenarioEditor& scenarioEditor)
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);
}

2
source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Cinematic/Cinematic.cpp
View File

@ -58,7 +58,7 @@ public:
void OnText(wxCommandEvent& WXUNUSED(event))
{
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)
{

12
source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Map/Map.cpp
View File

@ -144,7 +144,7 @@ void MapSettingsControl::CreateWidgets()
gameTypes.Add(_T("conquest"));
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));
gridSizer->Add(new wxStaticText(this, wxID_ANY, _("Game type")), wxSizerFlags().Align(wxALIGN_CENTER_VERTICAL | wxALIGN_RIGHT));
@ -156,7 +156,7 @@ void MapSettingsControl::CreateWidgets()
sizer->AddSpacer(5);
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));
kwGridSizer->Add(new wxStaticText(this, wxID_ANY, _("Hidden")), wxSizerFlags().Align(wxALIGN_CENTER_VERTICAL | wxALIGN_RIGHT));
@ -272,7 +272,7 @@ MapSidebar::MapSidebar(ScenarioEditor& scenarioEditor, wxWindow* sidebarContaine
sizer->AddSpacer(5);
wxFlexGridSizer* gridSizer = new wxFlexGridSizer(2, 2, 5, 5);
wxFlexGridSizer* gridSizer = new wxFlexGridSizer(2, 5, 5);
gridSizer->AddGrowableCol(1);
wxChoice* sizeChoice = new wxChoice(this, ID_RandomSize);
@ -483,11 +483,13 @@ void MapSidebar::OnRandomGenerate(wxCommandEvent& WXUNUSED(evt))
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();
}

2
source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Object/Object.cpp
View File

@ -104,7 +104,7 @@ struct ObjectSidebarImpl
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));
}
};

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

@ -72,7 +72,7 @@ public:
/////////////////////////////////////////////////////////////////////////
// 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));
wxTextCtrl* nameCtrl = new wxTextCtrl(this, wxID_ANY);
@ -97,7 +97,7 @@ public:
/////////////////////////////////////////////////////////////////////////
// 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));
wxSpinCtrl* foodCtrl = new wxSpinCtrl(this, ID_PlayerFood, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, 0, INT_MAX);

6
source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Terrain/Terrain.cpp
View File

@ -94,7 +94,7 @@ TerrainSidebar::TerrainSidebar(ScenarioEditor& scenarioEditor, wxWindow* sidebar
wxSizer* sizer = new wxStaticBoxSizer(wxVERTICAL, this, _("Visualise"));
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);
wxArrayString defaultChoices;
@ -136,7 +136,7 @@ void TerrainSidebar::OnPassabilityChoice(wxCommandEvent& evt)
if (evt.GetSelection() == 0)
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()));
}
void TerrainSidebar::OnShowPriorities(wxCommandEvent& evt)
@ -226,7 +226,7 @@ public:
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();
std::vector<AtlasMessage::sTerrainGroupPreview> previews = *qry.previews;

2
source/tools/atlas/AtlasUI/ScenarioEditor/Tools/Common/ObjectSettings.cpp
View File

@ -98,7 +98,7 @@ AtlasMessage::sObjectSettings ObjectSettings::GetSettings() const
it != m_ActorSelections.end();
++it)
{
selections.push_back(it->c_str());
selections.push_back((std::wstring)it->wc_str());
}
settings.selections = selections;

2
source/tools/atlas/AtlasUI/ScenarioEditor/Tools/FillTerrain.cpp
View File

@ -57,7 +57,7 @@ public:
{
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;
}
else if (evt.Moving())

2
source/tools/atlas/AtlasUI/ScenarioEditor/Tools/PaintTerrain.cpp
View File

@ -115,7 +115,7 @@ public:
void Paint(PaintTerrain* obj)
{
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()));
}
virtual bool IsMouseUp(wxMouseEvent& evt) = 0;

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

@ -48,9 +48,9 @@ public:
+ (m_ScreenPos.type1.y-m_Target.type1.y)*(m_ScreenPos.type1.y-m_Target.type1.y);
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));
}
virtual void Init(void* initData, ScenarioEditor* scenarioEditor)

2
source/tools/atlas/AtlasUI/ScenarioEditor/Tools/ReplaceTerrain.cpp
View File

@ -57,7 +57,7 @@ public:
{
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;
}
else if (evt.Moving())