From 901567f2b1f22316dd31aa7b13acbfc984e2bb9e Mon Sep 17 00:00:00 2001
From: j <you@example.com>
Date: Sun, 2 Nov 2025 21:05:58 +0000
Subject: [PATCH] haxe 5 and cppia include changes

---
 haxe/ui/focus/BoxFocusApplicator.hx                           | 2 ++
 haxe/ui/macros/{LayoutMacros.hx => LayoutMacros.macro.hx}     | 4 ++--
 haxe/ui/macros/{SchemaMacros.hx => SchemaMacros.macro.hx}     | 0
 .../macros/helpers/{ClassBuilder.hx => ClassBuilder.macro.hx} | 0
 .../macros/helpers/{FieldBuilder.hx => FieldBuilder.macro.hx} | 0
 .../helpers/{FunctionBuilder.hx => FunctionBuilder.macro.hx}  | 0
 haxe/ui/macros/helpers/{VarBuilder.hx => VarBuilder.macro.hx} | 0
 7 files changed, 4 insertions(+), 2 deletions(-)
 rename haxe/ui/macros/{LayoutMacros.hx => LayoutMacros.macro.hx} (99%)
 rename haxe/ui/macros/{SchemaMacros.hx => SchemaMacros.macro.hx} (100%)
 rename haxe/ui/macros/helpers/{ClassBuilder.hx => ClassBuilder.macro.hx} (100%)
 rename haxe/ui/macros/helpers/{FieldBuilder.hx => FieldBuilder.macro.hx} (100%)
 rename haxe/ui/macros/helpers/{FunctionBuilder.hx => FunctionBuilder.macro.hx} (100%)
 rename haxe/ui/macros/helpers/{VarBuilder.hx => VarBuilder.macro.hx} (100%)

diff --git a/haxe/ui/focus/BoxFocusApplicator.hx b/haxe/ui/focus/BoxFocusApplicator.hx
index 38499dbae..44d1d09b9 100644
--- a/haxe/ui/focus/BoxFocusApplicator.hx
+++ b/haxe/ui/focus/BoxFocusApplicator.hx
@@ -9,6 +9,8 @@ import haxe.ui.focus.FocusManager;
 import haxe.ui.focus.IFocusable;
 import haxe.ui.styles.elements.AnimationKeyFrame;
 import haxe.ui.styles.elements.Directive;
+import haxe.ui.styles.Value;
+import haxe.ui.styles.Dimension;
 
 class BoxFocusApplicator extends FocusApplicator {
     private var _box:Box = null;
diff --git a/haxe/ui/macros/LayoutMacros.hx b/haxe/ui/macros/LayoutMacros.macro.hx
similarity index 99%
rename from haxe/ui/macros/LayoutMacros.hx
rename to haxe/ui/macros/LayoutMacros.macro.hx
index 190c6d772..097359153 100644
--- a/haxe/ui/macros/LayoutMacros.hx
+++ b/haxe/ui/macros/LayoutMacros.macro.hx
@@ -1,13 +1,13 @@
 package haxe.ui.macros;
 
-#if macro
+
 import haxe.macro.Context;
 import haxe.macro.Expr;
 import haxe.macro.TypeTools;
 import haxe.ui.macros.helpers.ClassBuilder;
 import haxe.ui.macros.helpers.CodePos;
 import haxe.ui.util.StringUtil;
-#end
+
 
 class LayoutMacros {
     macro static function build():Array<Field> {
diff --git a/haxe/ui/macros/SchemaMacros.hx b/haxe/ui/macros/SchemaMacros.macro.hx
similarity index 100%
rename from haxe/ui/macros/SchemaMacros.hx
rename to haxe/ui/macros/SchemaMacros.macro.hx
diff --git a/haxe/ui/macros/helpers/ClassBuilder.hx b/haxe/ui/macros/helpers/ClassBuilder.macro.hx
similarity index 100%
rename from haxe/ui/macros/helpers/ClassBuilder.hx
rename to haxe/ui/macros/helpers/ClassBuilder.macro.hx
diff --git a/haxe/ui/macros/helpers/FieldBuilder.hx b/haxe/ui/macros/helpers/FieldBuilder.macro.hx
similarity index 100%
rename from haxe/ui/macros/helpers/FieldBuilder.hx
rename to haxe/ui/macros/helpers/FieldBuilder.macro.hx
diff --git a/haxe/ui/macros/helpers/FunctionBuilder.hx b/haxe/ui/macros/helpers/FunctionBuilder.macro.hx
similarity index 100%
rename from haxe/ui/macros/helpers/FunctionBuilder.hx
rename to haxe/ui/macros/helpers/FunctionBuilder.macro.hx
diff --git a/haxe/ui/macros/helpers/VarBuilder.hx b/haxe/ui/macros/helpers/VarBuilder.macro.hx
similarity index 100%
rename from haxe/ui/macros/helpers/VarBuilder.hx
rename to haxe/ui/macros/helpers/VarBuilder.macro.hx