From 937ef6c33d77201b61ee439c063e4b82208c615e Mon Sep 17 00:00:00 2001 From: Areloch Date: Thu, 8 Feb 2018 16:04:50 -0600 Subject: [PATCH] Tabs&Spaces --- Engine/source/gui/core/guiCanvas.cpp | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/Engine/source/gui/core/guiCanvas.cpp b/Engine/source/gui/core/guiCanvas.cpp index 71a4eb760..efb0674ea 100644 --- a/Engine/source/gui/core/guiCanvas.cpp +++ b/Engine/source/gui/core/guiCanvas.cpp @@ -134,7 +134,7 @@ GuiCanvas::GuiCanvas(): GuiControl(), mPlatformWindow(NULL), mDisplayWindow(true), mMenuBarCtrl(nullptr), - mMenuBackground(nullptr) + mMenuBackground(nullptr) { setBounds(0, 0, 640, 480); mAwake = true; @@ -297,11 +297,11 @@ void GuiCanvas::setMenuBar(SimObject *obj) mMenuBarCtrl = dynamic_cast(obj); //remove old menubar - if (oldMenuBar) - { - Parent::removeObject(oldMenuBar); - Parent::removeObject(mMenuBackground); //also remove the modeless wrapper - } + if (oldMenuBar) + { + Parent::removeObject(oldMenuBar); + Parent::removeObject(mMenuBackground); //also remove the modeless wrapper + } // set new menubar if (mMenuBarCtrl) @@ -316,15 +316,15 @@ void GuiCanvas::setMenuBar(SimObject *obj) return; } - if (mMenuBackground == nullptr) - { - mMenuBackground = new GuiControl(); - mMenuBackground->registerObject(); + if (mMenuBackground == nullptr) + { + mMenuBackground = new GuiControl(); + mMenuBackground->registerObject(); - mMenuBackground->setControlProfile(profile); - } + mMenuBackground->setControlProfile(profile); + } - mMenuBackground->addObject(mMenuBarCtrl); + mMenuBackground->addObject(mMenuBarCtrl); Parent::addObject(mMenuBackground); }