From bbb0777162044b3f38e05ba31abea7f25cb4f484 Mon Sep 17 00:00:00 2001 From: Daniel Buckmaster Date: Sat, 29 Nov 2014 00:22:03 +1100 Subject: [PATCH] Remove extras define. --- Engine/source/gui/containers/guiFlexibleArrayCtrl.cpp | 5 +---- Engine/source/gui/containers/guiFlexibleArrayCtrl.h | 5 +---- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/Engine/source/gui/containers/guiFlexibleArrayCtrl.cpp b/Engine/source/gui/containers/guiFlexibleArrayCtrl.cpp index 93a8e5ca3..befcd3610 100644 --- a/Engine/source/gui/containers/guiFlexibleArrayCtrl.cpp +++ b/Engine/source/gui/containers/guiFlexibleArrayCtrl.cpp @@ -1,4 +1,3 @@ -#ifdef TORQUE_WALKABOUT_EXTRAS_ENABLED //----------------------------------------------------------------------------- // Copyright (c) 2012 Daniel Buckmaster // @@ -182,6 +181,4 @@ DefineEngineMethod( GuiFlexibleArrayControl, refresh, void, (),, "Recalculates the position and size of this control and all its children." ) { object->refresh(); -} - -#endif // TORQUE_WALKABOUT_EXTRAS_ENABLED +} \ No newline at end of file diff --git a/Engine/source/gui/containers/guiFlexibleArrayCtrl.h b/Engine/source/gui/containers/guiFlexibleArrayCtrl.h index 45059686a..1bf068f48 100644 --- a/Engine/source/gui/containers/guiFlexibleArrayCtrl.h +++ b/Engine/source/gui/containers/guiFlexibleArrayCtrl.h @@ -1,4 +1,3 @@ -#ifdef TORQUE_WALKABOUT_EXTRAS_ENABLED //----------------------------------------------------------------------------- // Copyright (c) 2012 Daniel Buckmaster // @@ -65,6 +64,4 @@ protected: RectSpacingI mPadding; }; -#endif // _GUIFLEXIBLEARRAYCTRL_H_ - -#endif // TORQUE_WALKABOUT_EXTRAS_ENABLED +#endif // _GUIFLEXIBLEARRAYCTRL_H_ \ No newline at end of file