TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-03-02 20:10:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Compilation fixes for C++20

Browse source
This commit is contained in:
Jeff Hutchinson 2022-11-27 23:08:07 -05:00
parent e16351605b
commit 1940becb2d
40 changed files with 220 additions and 211 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Engine/source/gui/controls/guiConsoleEditCtrl.cpp
View file

@ -134,7 +134,7 @@ bool GuiConsoleEditCtrl::onKeyDown(const GuiEvent &event)
text = String::ToString( "echo(%s);", text.c_str() );
setText( text );
setText( text.utf8() );
}
return Parent::dealWithEnter(false);

2
Engine/source/gui/controls/guiTreeViewCtrl.cpp
View file

@ -3802,7 +3802,7 @@ void GuiTreeViewCtrl::onRenderCell(Point2I offset, Point2I cell, bool, bool )
{
//Check if we're a SceneObject, and pick the default icon as appropriate
if (pObject->getClassName() != String("SimGroup"))
if (pObject->getClassName() != StringTable->insert("SimGroup"))
{
item->mIcon = Icon31;
}

2
Engine/source/gui/editor/guiPopupMenuCtrl.cpp
View file

@ -227,7 +227,7 @@ void GuiPopupMenuTextListCtrl::onMouseUp(const GuiEvent &event)
{
if (item->mEnabled)
{
Con::executef(mPopup, "onSelectItem", Con::getIntArg(getSelectedCell().y), item->mText.isNotEmpty() ? item->mText : "");
Con::executef(mPopup, "onSelectItem", Con::getIntArg(getSelectedCell().y), item->mText.isNotEmpty() ? item->mText : String(""));
}
}
}

2
Engine/source/gui/editor/guiShapeEdPreview.cpp
View file

@ -530,7 +530,7 @@ void GuiShapeEdPreview::setThreadSequence(GuiShapeEdPreview::Thread& thread, TSS
const char* GuiShapeEdPreview::getThreadSequence() const
{
return ( mActiveThread >= 0 ) ? mThreads[mActiveThread].seqName : "";
return ( mActiveThread >= 0 ) ? mThreads[mActiveThread].seqName.c_str() : "";
}
void GuiShapeEdPreview::refreshThreadSequences()