TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-04-23 13:25:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix TORQUE_TOOLS = off compilation

Browse source
This commit is contained in:
AzaezelX 2022-06-13 12:38:08 -05:00
parent 9836f6eb30
commit 4a7104e5ea
38 changed files with 80 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

13
Engine/source/gui/core/guiCanvas.cpp
View file

@ -330,7 +330,7 @@ void GuiCanvas::onRemove()
Parent::onRemove();
}
#ifdef TORQUE_TOOLS
void GuiCanvas::setMenuBar(SimObject *obj)
{
GuiControl *oldMenuBar = mMenuBarCtrl;
@ -382,7 +382,7 @@ void GuiCanvas::setMenuBar(SimObject *obj)
newMenu->buildWindowAcceleratorMap(*getPlatformWindow()->getInputGenerator());
}
}
#endif
void GuiCanvas::setWindowTitle(const char *newTitle)
{
if (mPlatformWindow)
@ -705,9 +705,6 @@ bool GuiCanvas::processInputEvent(InputEventInfo &inputEvent)
if (mCursorEnabled || mForceMouseToGUI ||
(mAlwaysHandleMouseButtons && inputEvent.objType == SI_BUTTON) )
{
if (inputEvent.objType != SI_AXIS && inputEvent.action == SI_MAKE)
bool asdfasdf = true;
return processMouseEvent(inputEvent);
}
break;
@ -1441,10 +1438,10 @@ void GuiCanvas::setContentControl(GuiControl *gui)
Sim::getGuiGroup()->addObject( ctrl );
}
#ifdef TORQUE_TOOLS
// set current menu bar
setMenuBar( mMenuBarCtrl );
#endif
// lose the first responder from the old GUI
GuiControl* responder = gui->findFirstTabable();
if(responder)
@ -2795,6 +2792,7 @@ DefineEngineMethod( GuiCanvas, setFocus, void, (), , "() - Claim OS input focus
}
}
#ifdef TORQUE_TOOLS
DefineEngineMethod( GuiCanvas, setMenuBar, void, ( GuiControl* menu ),,
"Translate a coordinate from canvas window-space to screen-space.\n"
"@param coordinate The coordinate in window-space.\n"
@ -2802,6 +2800,7 @@ DefineEngineMethod( GuiCanvas, setMenuBar, void, ( GuiControl* menu ),,
{
return object->setMenuBar( menu );
}
#endif
DefineEngineMethod( GuiCanvas, setVideoMode, void,
(U32 width, U32 height, bool fullscreen, U32 bitDepth, U32 refreshRate, U32 antialiasLevel),

4
Engine/source/gui/core/guiCanvas.h
View file

@ -222,10 +222,10 @@ public:
virtual bool onAdd();
virtual void onRemove();
#ifdef TORQUE_TOOLS
void setMenuBar(SimObject *obj);
SimObject* getMenuBar() { return mMenuBarCtrl; }
#endif
static void initPersistFields();
static CanvasSizeChangeSignal& getCanvasSizeChangeSignal() { return smCanvasSizeChangeSignal; }