More fixes

Author: kunitoki

modules/yup_gui/profiling/yup_PaintProfiler.cpp

@@ -102,9 +102,7 @@ void PaintProfiler::deregisterComponent (const Component& component)
 
 void PaintProfiler::enableSubtree (Component& root, PaintProfileOptions options)
 {
-#if YUP_ENABLE_COMPONENT_PAINT_PROFILING
     root.setPaintProfilingEnabled (true, options);
-#endif
 
     for (int i = 0; i < root.getNumChildComponents(); ++i)
     {
@@ -115,9 +113,7 @@ void PaintProfiler::enableSubtree (Component& root, PaintProfileOptions options)
 
 void PaintProfiler::disableSubtree (Component& root)
 {
-#if YUP_ENABLE_COMPONENT_PAINT_PROFILING
     root.setPaintProfilingEnabled (false);
-#endif
 
     for (int i = 0; i < root.getNumChildComponents(); ++i)
     {
@@ -186,11 +182,7 @@ PaintProfiler::Snapshot PaintProfiler::createSnapshot (PaintProfileTimeKind sort
     {
         ComponentEntry entry;
         entry.component = component;
-#if YUP_ENABLE_COMPONENT_PAINT_PROFILING
         entry.name = component->getPaintProfileName();
-#else
-        entry.name = component->getTitle();
-#endif
         entry.stats = stats;
         entry.self = stats->summarize (PaintProfileTimeKind::self);
         entry.children = stats->summarize (PaintProfileTimeKind::children);
@@ -283,13 +275,11 @@ PaintProfiler::ScopedSession::ScopedSession (PaintProfiler& profilerRef,
 
 PaintProfiler::ScopedSession::~ScopedSession()
 {
-#if YUP_ENABLE_COMPONENT_PAINT_PROFILING
     for (auto& weakComponent : enabledComponents)
     {
         if (auto* component = weakComponent.get())
             component->setPaintProfilingEnabled (false);
     }
-#endif
 }
 
 //==============================================================================

modules/yup_gui/yup_gui.cpp

@@ -125,6 +125,13 @@
 
 //==============================================================================
 
+#if YUP_ENABLE_COMPONENT_PAINT_PROFILING
+#include "profiling/yup_PaintProfileStats.cpp"
+#include "profiling/yup_PaintProfiler.cpp"
+#endif
+
+//==============================================================================
+
 #include "application/yup_Application.cpp"
 #include "desktop/yup_Desktop.cpp"
 #include "keyboard/yup_TextInputTarget.cpp"
@@ -133,8 +140,6 @@
 #include "clipboard/yup_SystemClipboard.cpp"
 #include "component/yup_ComponentNative.cpp"
 #include "component/yup_Component.cpp"
-#include "profiling/yup_PaintProfileStats.cpp"
-#include "profiling/yup_PaintProfiler.cpp"
 #include "menus/yup_PopupMenu.cpp"
 #include "buttons/yup_Button.cpp"
 #include "buttons/yup_TextButton.cpp"

modules/yup_gui/yup_gui.h

@@ -80,19 +80,21 @@
 
 //==============================================================================
 
+#include <tuple>
+#include <unordered_map>
+
+//==============================================================================
+
 #if YUP_ENABLE_COMPONENT_PAINT_PROFILING
 #define YUP_IF_COMPONENT_PAINT_PROFILING_ENABLED(CODE) CODE
+#include "profiling/yup_PaintProfileSample.h"
+#include "profiling/yup_PaintProfileStats.h"
 #else
 #define YUP_IF_COMPONENT_PAINT_PROFILING_ENABLED(CODE)
 #endif
 
 //==============================================================================
 
-#include <tuple>
-#include <unordered_map>
-
-//==============================================================================
-
 #include "application/yup_Application.h"
 #include "keyboard/yup_KeyModifiers.h"
 #include "keyboard/yup_KeyPress.h"
@@ -104,12 +106,9 @@
 #include "clipboard/yup_SystemClipboard.h"
 #include "desktop/yup_Screen.h"
 #include "desktop/yup_Desktop.h"
-#include "profiling/yup_PaintProfileSample.h"
-#include "profiling/yup_PaintProfileStats.h"
 #include "component/yup_ComponentNative.h"
 #include "component/yup_ComponentStyle.h"
 #include "component/yup_Component.h"
-#include "profiling/yup_PaintProfiler.h"
 #include "menus/yup_PopupMenu.h"
 #include "buttons/yup_Button.h"
 #include "buttons/yup_TextButton.h"
@@ -131,6 +130,12 @@
 
 //==============================================================================
 
+#if YUP_ENABLE_COMPONENT_PAINT_PROFILING
+#include "profiling/yup_PaintProfiler.h"
+#endif
+
+//==============================================================================
+
 #include "native/yup_WindowingHelpers.h"
 
 //==============================================================================