From 7a650f38f922e2ba087665dc5a1967f5d7382bc4 Mon Sep 17 00:00:00 2001
From: Randalphwa <38287198+Randalphwa@users.noreply.github.com>
Date: Tue, 7 Jan 2025 19:01:55 -0800
Subject: [PATCH 1/8] wxPerl minimum is now 3.005

This version uses wxWidgets 3.2.
---
 src/xml/interfaces.xml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/xml/interfaces.xml b/src/xml/interfaces.xml
index 397ca0cc3..b337b6232 100644
--- a/src/xml/interfaces.xml
+++ b/src/xml/interfaces.xml
@@ -434,9 +434,8 @@
 	<gen class="wxPerl" type="interface">
 		<property name="wxPerl_version" type="option"
 			help="Specifies the minimum version of wxPerl needed to run the generated code.">
-			<option name="0.91"/>
-			<option name="3.2.0"/>
-			 3.2.0 </property>
+			<option name="3.005"/>
+			 3.005 </property>
 		<property name="perl_output_folder" type="path"
 			help="If a folder name is specified, it will be used for all perl code."/>
 		<property name="perl_line_length" type="uint"

From a6a6a24fca1505ea0f400abb12012201a832d9c7 Mon Sep 17 00:00:00 2001
From: Randalphwa <38287198+Randalphwa@users.noreply.github.com>
Date: Tue, 7 Jan 2025 19:02:57 -0800
Subject: [PATCH 2/8] Support wxPerl variable prefix

---
 src/nodes/node.cpp | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/nodes/node.cpp b/src/nodes/node.cpp
index 20113d2e4..64ad1eb84 100644
--- a/src/nodes/node.cpp
+++ b/src/nodes/node.cpp
@@ -509,6 +509,8 @@ tt_string_view Node::getNodeName(GenLang lang) const
         // Valid for Ruby, but not for C++
         if (name[0] == '@')
             name.remove_prefix(1);
+        else if (name[0] == '$')  // commonly used for Perl variables
+            name.remove_prefix(1);
         // Used for local Python variables, but non-standard for C++ where '_' is typically used for
         // member variables
         else if (name[0] == '_' && isLocal())
@@ -521,6 +523,11 @@ tt_string_view Node::getNodeName(GenLang lang) const
         name.remove_prefix(1);
         return name;
     }
+    else if (name[0] == '$' && lang != GEN_LANG_PERL)
+    {
+        name.remove_prefix(1);
+        return name;
+    }
 
     // GEN_LANG_CPLUSPLUS is handled above
     ASSERT(lang != GEN_LANG_CPLUSPLUS);

From a4ab7a90e16111786ad3ffb42dd6997ff2e3941b Mon Sep 17 00:00:00 2001
From: Randalphwa <38287198+Randalphwa@users.noreply.github.com>
Date: Tue, 7 Jan 2025 19:04:17 -0800
Subject: [PATCH 3/8] Expand wxPerl support

---
 src/generate/code.cpp         | 201 ++++++++++++++++++++++++++--------
 src/generate/code.h           |  13 ++-
 src/generate/gen_common.cpp   |  26 +++--
 src/generate/gen_frame.cpp    |  33 +++---
 src/generate/gen_menuitem.cpp |   6 +-
 src/generate/gen_perl.cpp     |  85 +++++++++++++-
 src/generate/gen_toolbar.cpp  |  51 ++++++++-
 src/generate/gen_toolbar.h    |   4 +-
 8 files changed, 337 insertions(+), 82 deletions(-)

diff --git a/src/generate/code.cpp b/src/generate/code.cpp
index 8db8022e8..efcace1f4 100644
--- a/src/generate/code.cpp
+++ b/src/generate/code.cpp
@@ -1,7 +1,7 @@
 /////////////////////////////////////////////////////////////////////////////
 // Purpose:   Helper class for generating code
 // Author:    Ralph Walden
-// Copyright: Copyright (c) 2022-2024 KeyWorks Software (Ralph Walden)
+// Copyright: Copyright (c) 2022-2025 KeyWorks Software (Ralph Walden)
 // License:   Apache License -- see ../../LICENSE
 /////////////////////////////////////////////////////////////////////////////
 
@@ -19,6 +19,8 @@
 #include <charconv>  // for std::to_chars()
 #include <map>
 
+#include <frozen/set.h>
+
 #include "code.h"
 
 #include "gen_common.h"       // Common component functions
@@ -277,6 +279,16 @@ static const view_map s_short_rust_map
 {
 };
 
+constexpr auto set_perl_constants = frozen::make_set<std::string_view>({
+
+    "wxNullBitmap",
+    "wxITEM_CHECK",
+    "wxITEM_DROPDOWN",
+    "wxITEM_NORMAL",
+    "wxITEM_RADIO",
+    "wxID_ANY",
+});
+
 // clang-format on
 
 std::string_view GetLanguagePrefix(tt_string_view candidate, GenLang language)
@@ -592,7 +604,7 @@ Code& Code::AddAuto()
         }
         else if (is_perl())
         {
-            *this += "my ";
+            *this += "my $";
         }
         else if (is_python())
         {
@@ -793,7 +805,32 @@ Code& Code::Add(tt_string_view text)
         }
         else if (text.is_sameprefix("wx") && !is_cpp())
         {
-            if (std::string_view language_prefix = GetLanguagePrefix(text, m_language); language_prefix.size())
+            if (is_perl())
+            {
+                if (set_perl_constants.contains(text))
+                {
+                    CheckLineLength(text.size());
+                    *this += text;
+                    return *this;
+                }
+                else if (text == "wxEmptyString")
+                {
+                    *this << "\"\"";
+                    return *this;
+                }
+
+                if (std::string_view language_prefix = GetLanguagePrefix(text, m_language); language_prefix.size())
+                {
+                    CheckLineLength(language_prefix.size() + text.size() - 2);
+                    *this << language_prefix << text.substr(2);
+                }
+                else
+                {
+                    CheckLineLength(m_language_wxPrefix.size() + text.size() - 2);
+                    *this << m_language_wxPrefix << text.substr(2);
+                }
+            }
+            else if (std::string_view language_prefix = GetLanguagePrefix(text, m_language); language_prefix.size())
             {
                 CheckLineLength(language_prefix.size() + text.size() - 2);
                 *this << language_prefix << text.substr(2);
@@ -951,7 +988,7 @@ Code& Code::FormFunction(tt_string_view text)
     }
     else if (is_perl())
     {
-        *this += "$this->";
+        *this += "$self->";
     }
     else if (is_lua())
     {
@@ -1108,10 +1145,15 @@ Code& Code::CreateClass(bool use_generic, tt_string_view override_name, bool ass
         {
             *this += class_name;
         }
+
         if (is_ruby())
         {
             *this += ".new";
         }
+        else if (is_perl())
+        {
+            *this += "->new";
+        }
     }
 
     *this += '(';
@@ -1177,10 +1219,41 @@ Code& Code::NodeName(Node* node)
     {
         *this += "self.";
     }
-    if (is_ruby() && !node->isForm() && !node->isLocal() && node_name[0] != '@')
+    else if (is_ruby() && !node->isForm() && !node->isLocal() && node_name[0] != '@')
     {
         *this += "@";
     }
+    else if (is_perl() && !node->isForm())
+    {
+        if (node->isLocal())
+        {
+            if (!node_name.starts_with("$") && (size() < 1 || back() != '$'))
+            {
+                *this += "$";
+            }
+            *this += node_name;
+            return *this;
+        }
+        else
+        {
+            if (node_name.starts_with("$self->"))
+            {
+                *this += node_name;
+                return *this;
+            }
+            *this += "$self->{";
+            if (node_name.is_sameprefix("$"))
+            {
+                *this += node_name.subview(1);
+            }
+            else
+            {
+                *this += node_name;
+            }
+            *this += "}";
+            return *this;
+        }
+    }
     *this += node_name;
     return *this;
 }
@@ -1203,11 +1276,21 @@ Code& Code::VarName(tt_string_view var_name, bool class_access)
             *this += "self.";
         else if (is_ruby())
             *this += "@";
+        else if (is_perl())
+        {
+            Str("$self->{");
+            if (var_name.is_sameprefix("m_"))
+                *this += var_name.subview(2);
+            else
+                *this += var_name;
+            *this += "}";
+            return *this;
+        }
     }
 
     else if (is_perl())
     {
-        *this += "my $";
+        *this += "$";
     }
 
     if (var_name.is_sameprefix("m_"))
@@ -2244,6 +2327,11 @@ void Code::GenWindowSettings()
 Code& Code::GenFont(GenEnum::PropName prop_name, tt_string_view font_function)
 {
     FontProperty fontprop(m_node->getPropPtr(prop_name));
+    if (is_perl())
+    {
+        // REVIEW: [Randalphwa - 01-07-2025] As of wx-3.005, wxPerl doesn't support wxFontinfo
+        return *this;
+    }
     if (fontprop.isDefGuiFont())
     {
         OpenFontBrace();
@@ -2317,7 +2405,12 @@ Code& Code::GenFont(GenEnum::PropName prop_name, tt_string_view font_function)
         }
         else
         {
-            Eol(eol_if_needed).Add("font_info").CreateClass(false, "wxFontInfo");
+            Eol(eol_if_needed);
+            if (is_perl())
+            {
+                *this += "my $";
+            }
+            Add("font_info").CreateClass(false, "wxFontInfo");
         }
 
         if (point_size != static_cast<int>(point_size))  // is there a fractional value?
@@ -2385,56 +2478,76 @@ Code& Code::GenFont(GenEnum::PropName prop_name, tt_string_view font_function)
             }
         }
 
-        if (fontprop.GetFaceName().size() && fontprop.GetFaceName() != "default")
-            VariableMethod("FaceName(").QuotedString(tt_string() << fontprop.GetFaceName().utf8_string()) += ")";
-        if (fontprop.GetFamily() != wxFONTFAMILY_DEFAULT)
-            VariableMethod("Family(").Add(font_family_pairs.GetValue(fontprop.GetFamily())) += ")";
-        if (fontprop.GetStyle() != wxFONTSTYLE_NORMAL)
-            VariableMethod("Style(").Add(font_style_pairs.GetValue(fontprop.GetStyle())) += ")";
-        if (fontprop.GetWeight() != wxFONTWEIGHT_NORMAL)
+        if (is_perl())
         {
-            if (is_cpp() && Project.is_wxWidgets31())
+            if (fontprop.GetFaceName().size() && fontprop.GetFaceName() != "default")
             {
-                Eol().Str("#if !wxCHECK_VERSION(3, 1, 2)").Eol().Tab();
+                Eol().Str("$font_info->").Str("FaceName = ");
+                QuotedString(tt_string() << fontprop.GetFaceName().utf8_string()) += ";";
+            }
+            if (fontprop.GetFamily() != wxFONTFAMILY_DEFAULT)
+            {
+                Eol().Str("$font_info->").Str("Family = ");
+                Add(font_family_pairs.GetValue(fontprop.GetFamily())) += ";";
+            }
+            if (fontprop.GetStyle() != wxFONTSTYLE_NORMAL)
+            {
+                Eol().Str("$font_info->").Str("Style = ");
+                Add(font_style_pairs.GetValue(fontprop.GetStyle())) += ";";
+            }
+        }
+        else
+        {
+            if (fontprop.GetFaceName().size() && fontprop.GetFaceName() != "default")
+                VariableMethod("FaceName(").QuotedString(tt_string() << fontprop.GetFaceName().utf8_string()) += ")";
+            if (fontprop.GetFamily() != wxFONTFAMILY_DEFAULT)
+                VariableMethod("Family(").Add(font_family_pairs.GetValue(fontprop.GetFamily())) += ")";
+            if (fontprop.GetStyle() != wxFONTSTYLE_NORMAL)
+                VariableMethod("Style(").Add(font_style_pairs.GetValue(fontprop.GetStyle())) += ")";
+            if (fontprop.GetWeight() != wxFONTWEIGHT_NORMAL)
+            {
+                if (is_cpp() && Project.is_wxWidgets31())
                 {
-                    // wxFontInfo::SetFlag() would have worked around this, unfortunately it is a private: function
-                    bool is_code_added = false;
-                    if (fontprop.GetWeight() == wxFONTWEIGHT_LIGHT)
+                    Eol().Str("#if !wxCHECK_VERSION(3, 1, 2)").Eol().Tab();
                     {
-                        VariableMethod("Light();");
-                        is_code_added = true;
+                        // wxFontInfo::SetFlag() would have worked around this, unfortunately it is a private: function
+                        bool is_code_added = false;
+                        if (fontprop.GetWeight() == wxFONTWEIGHT_LIGHT)
+                        {
+                            VariableMethod("Light();");
+                            is_code_added = true;
+                        }
+                        else if (fontprop.GetWeight() == wxFONTWEIGHT_BOLD)
+                        {
+                            VariableMethod("Bold()");
+                            is_code_added = true;
+                        }
+
+                        if (!is_code_added)
+                        {
+                            Str("// Only Bold and Light are supported in wxWidgets 3.1.1 and earlier");
+                        }
                     }
-                    else if (fontprop.GetWeight() == wxFONTWEIGHT_BOLD)
+                    Eol().Str("#else // Weight() is new to wxWidgets 3.1.2").Eol().Tab();
                     {
-                        VariableMethod("Bold()");
-                        is_code_added = true;
+                        VariableMethod("Weight(").Add(font_weight_pairs.GetValue(fontprop.GetWeight())) += ")";
                     }
-
-                    if (!is_code_added)
+                    Eol().Str("#endif").Eol();
+                    if (!fontprop.IsUnderlined() && !fontprop.IsStrikethrough())
                     {
-                        Str("// Only Bold and Light are supported in wxWidgets 3.1.1 and earlier");
+                        Str(";").Eol();
                     }
                 }
-                Eol().Str("#else // Weight() is new to wxWidgets 3.1.2").Eol().Tab();
+                else
                 {
                     VariableMethod("Weight(").Add(font_weight_pairs.GetValue(fontprop.GetWeight())) += ")";
                 }
-                Eol().Str("#endif").Eol();
-                if (!fontprop.IsUnderlined() && !fontprop.IsStrikethrough())
-                {
-                    Str(";").Eol();
-                }
-            }
-            else
-            {
-                VariableMethod("Weight(").Add(font_weight_pairs.GetValue(fontprop.GetWeight())) += ")";
             }
+            if (fontprop.IsUnderlined())
+                VariableMethod("Underlined()");
+            if (fontprop.IsStrikethrough())
+                VariableMethod("Strikethrough()");
         }
-        if (fontprop.IsUnderlined())
-            VariableMethod("Underlined()");
-        if (fontprop.IsStrikethrough())
-            VariableMethod("Strikethrough()");
-
         if (back() == '.')
         {
             pop_back();
@@ -2461,12 +2574,12 @@ Code& Code::GenFont(GenEnum::PropName prop_name, tt_string_view font_function)
             }
             else
             {
-                FormFunction(font_function).Object("wxFont").Str("font_info").Str(")").EndFunction();
+                FormFunction(font_function).Object("wxFont").VarName("font_info", false).Str(")").EndFunction();
             }
         }
         else
         {
-            NodeName().Function(font_function).Object("wxFont").Str("font_info").Str(")").EndFunction();
+            NodeName().Function(font_function).Object("wxFont").VarName("font_info", false).Str(")").EndFunction();
         }
         CloseFontBrace();
     }
diff --git a/src/generate/code.h b/src/generate/code.h
index c40ba2548..e62541bf0 100644
--- a/src/generate/code.h
+++ b/src/generate/code.h
@@ -1,7 +1,7 @@
 /////////////////////////////////////////////////////////////////////////////
 // Purpose:   Helper class for generating code
 // Author:    Ralph Walden
-// Copyright: Copyright (c) 2022-2024 KeyWorks Software (Ralph Walden)
+// Copyright: Copyright (c) 2022-2025 KeyWorks Software (Ralph Walden)
 // License:   Apache License -- see ../../LICENSE
 /////////////////////////////////////////////////////////////////////////////
 
@@ -58,6 +58,10 @@ using namespace code;
 extern const view_map g_map_python_prefix;
 extern const view_map g_map_ruby_prefix;
 
+// Returns true if value exists in one of the use Wx qw(...) declarations.
+// If true, then the constant is available without modification.
+bool HasPerlMapConstant(std::string_view value);
+
 class Code : public tt_string
 {
 public:
@@ -207,6 +211,13 @@ class Code : public tt_string
     // Equivalent to calling as_string(prop_name). Correctly modifies the string for Python.
     Code& Add(GenEnum::PropName prop_name) { return as_string(prop_name); }
 
+    Code& AddIfLang(GenLang lang, tt_string_view text)
+    {
+        if (m_language == lang)
+            Add(text);
+        return *this;
+    }
+
     Code& AddIfCpp(tt_string_view text)
     {
         if (is_cpp())
diff --git a/src/generate/gen_common.cpp b/src/generate/gen_common.cpp
index 252768440..0be3e1955 100644
--- a/src/generate/gen_common.cpp
+++ b/src/generate/gen_common.cpp
@@ -1,7 +1,7 @@
 /////////////////////////////////////////////////////////////////////////////
 // Purpose:   Common component functions
 // Author:    Ralph Walden
-// Copyright: Copyright (c) 2020-2024 KeyWorks Software (Ralph Walden)
+// Copyright: Copyright (c) 2020-2025 KeyWorks Software (Ralph Walden)
 // License:   Apache License -- see ../../LICENSE
 /////////////////////////////////////////////////////////////////////////////
 
@@ -1312,6 +1312,7 @@ void GenToolCode(Code& code)
     }
 
     code.QuotedString(prop_label).Comma();
+
     if (!code.hasValue(prop_bitmap))
     {
         code.Add("wxNullBitmap");
@@ -1331,14 +1332,23 @@ void GenToolCode(Code& code)
                 code.Eol() += "#if wxCHECK_VERSION(3, 1, 6)\n\t";
             }
 
-            GenerateBundleParameter(code, parts);
-
-            if (code.is_cpp() && Project.is_wxWidgets31())
+            // TODO: [Randalphwa - 01-07-2025] wxPerl doesn't support wxBitmapBundle. It
+            // does support wxBitmap, but wxUE doesn't generate code for that yet.
+            else if (code.is_perl())
             {
-                code.Eol() += "#else\n\t";
-                code << "wxBitmap(" << GenerateBitmapCode(node->as_string(prop_bitmap)) << ")";
-                code.Eol() += "#endif";
-                code.Eol();
+                code.Add("wxNullBitmap");
+            }
+            else
+            {
+                GenerateBundleParameter(code, parts);
+
+                if (code.is_cpp() && Project.is_wxWidgets31())
+                {
+                    code.Eol() += "#else\n\t";
+                    code << "wxBitmap(" << GenerateBitmapCode(node->as_string(prop_bitmap)) << ")";
+                    code.Eol() += "#endif";
+                    code.Eol();
+                }
             }
         }
     }
diff --git a/src/generate/gen_frame.cpp b/src/generate/gen_frame.cpp
index 00af35c39..1c7a7d2c2 100644
--- a/src/generate/gen_frame.cpp
+++ b/src/generate/gen_frame.cpp
@@ -1,13 +1,15 @@
 /////////////////////////////////////////////////////////////////////////////
 // Purpose:   wxFrame generator
 // Author:    Ralph Walden
-// Copyright: Copyright (c) 2020-2024 KeyWorks Software (Ralph Walden)
+// Copyright: Copyright (c) 2020-2025 KeyWorks Software (Ralph Walden)
 // License:   Apache License -- see ../../LICENSE
 /////////////////////////////////////////////////////////////////////////////
 
 #include <wx/frame.h>              // wxFrame class interface
 #include <wx/propgrid/propgrid.h>  // wxPropertyGrid
 
+#include <frozen/set.h>
+
 #include "gen_base.h"    // BaseCodeGenerator -- Generate Src and Hdr files for Base Class
 #include "gen_common.h"  // GeneratorLibrary -- Generator classes
 #include "node.h"        // Node class
@@ -127,7 +129,7 @@ bool FrameFormGenerator::ConstructionCode(Code& code)
             code += "\"frame\"";
         code.Str(" unless defined $name;");
 
-        code.Eol().Eol() += "my $this = $class->SUPER::new($parent, $id, $title, $pos, $size, $style, $name);";
+        code.Eol().Eol() += "my $self = $class->SUPER::new($parent, $id, $title, $pos, $size, $style, $name);";
     }
     else
     {
@@ -550,6 +552,9 @@ bool FrameFormGenerator::AllowPropertyChange(wxPropertyGridEvent* event, NodePro
     return true;
 }
 
+// defined in code.cpp
+extern constexpr auto set_perl_constants = frozen::make_set<std::string_view>;
+
 bool FrameFormGenerator::GetImports(Node* node, std::set<std::string>& set_imports, GenLang language)
 {
     if (language == GEN_LANG_PERL)
@@ -569,22 +574,6 @@ bool FrameFormGenerator::GetImports(Node* node, std::set<std::string>& set_impor
             }
         };
 
-        // wxDefaultPosition and wxDefaultSize can also appear in child components, so put them on
-        // their own line to avoid duplicates.
-        if (node->as_string(prop_pos).empty() || node->as_string(prop_pos) == "wxDefaultPosition")
-            constants += " wxDefaultPosition";
-        if (node->as_string(prop_size).empty() || node->as_string(prop_size) == "wxDefaultSize")
-            constants += " wxDefaultSize";
-        set_constants();
-
-        if (node->as_string(prop_id).empty() || node->as_string(prop_id) == "wxID_ANY")
-            constants += " wxID_ANY";
-        set_constants();
-
-        if (node->hasValue(prop_center))
-            constants += " wxHORIZONTAL wxVERTICAL wxBOTH";
-        set_constants();
-
         if (node->as_string(prop_style) == "wxDEFAULT_FRAME_STYLE")
             constants += " wxDEFAULT_FRAME_STYLE";
         if (node->as_string(prop_style).contains("wxCAPTION"))
@@ -613,12 +602,16 @@ bool FrameFormGenerator::GetImports(Node* node, std::set<std::string>& set_impor
             constants += " wxCLIP_CHILDREN";
         if (node->as_string(prop_style).contains("wxSTAY_ON_TOP"))
             constants += " wxSTAY_ON_TOP";
-        if (node->as_string(prop_style).contains("wxFRAME_EX_CONTEXTHELP"))
+        if (node->as_string(prop_extra_style).contains("wxFRAME_EX_CONTEXTHELP"))
             constants += " wxFRAME_EX_CONTEXTHELP";
-        if (node->as_string(prop_style).contains("wxFRAME_EX_METAL"))
+        if (node->as_string(prop_extra_style).contains("wxFRAME_EX_METAL"))
             constants += " wxFRAME_EX_METAL";
         set_constants();
 
+        if (node->as_string(prop_center) != "no")
+            constants += " wxBOTH wxHORIZONTAL wxVERTICAL";
+        set_constants();
+
         set_imports.emplace("use base qw(Wx::Frame);");
         return true;
     }
diff --git a/src/generate/gen_menuitem.cpp b/src/generate/gen_menuitem.cpp
index c8350e9e9..b55eacd76 100644
--- a/src/generate/gen_menuitem.cpp
+++ b/src/generate/gen_menuitem.cpp
@@ -1,7 +1,7 @@
 /////////////////////////////////////////////////////////////////////////////
 // Purpose:   Menu Item Generator
 // Author:    Ralph Walden
-// Copyright: Copyright (c) 2020-2023 KeyWorks Software (Ralph Walden)
+// Copyright: Copyright (c) 2020-2025 KeyWorks Software (Ralph Walden)
 // License:   Apache License -- see ../../LICENSE
 /////////////////////////////////////////////////////////////////////////////
 
@@ -227,6 +227,10 @@ bool MenuItemGenerator::SettingsCode(Code& code)
             code.NodeName().Function("SetBitmap(");
             code.Bundle(prop_bitmap).EndFunction();
         }
+        else if (code.is_perl())
+        {
+            code.AddComment("wxPerl does not support bundle, currently wxUE does not support non-bundle bitmaps");
+        }
         else
         {
             ASSERT_MSG(false, "Unknown language in MenuItemGenerator::SettingsCode()");
diff --git a/src/generate/gen_perl.cpp b/src/generate/gen_perl.cpp
index 70ffe55ae..1f04bb482 100644
--- a/src/generate/gen_perl.cpp
+++ b/src/generate/gen_perl.cpp
@@ -1,7 +1,7 @@
 /////////////////////////////////////////////////////////////////////////////
 // Purpose:   Generate Perl code files
 // Author:    Ralph Walden
-// Copyright: Copyright (c) 2024 KeyWorks Software (Ralph Walden)
+// Copyright: Copyright (c) 2024-2025 KeyWorks Software (Ralph Walden)
 // License:   Apache License -- see ../../LICENSE
 /////////////////////////////////////////////////////////////////////////////
 
@@ -9,6 +9,8 @@
 #include <thread>
 #include <unordered_set>
 
+#include <frozen/map.h>
+
 #include "mainframe.h"
 
 #include "base_generator.h"   // BaseGenerator -- Base widget generator class
@@ -57,6 +59,29 @@ my $frame = MainFrame->new(undef, -1, "wxPerl app");
 
 // clang-format on
 
+// extern constexpr auto map_perl_constants = frozen::make_map<GenEnum::PropName, std::string_view>;
+
+// If the node contains the specified property, then the string contains all
+// possible contants that could be used separated by spaces.
+constexpr auto map_perl_constants = frozen::make_map<GenEnum::PropName, std::string_view>({
+
+    { prop_bitmap, "wxNullBitmap" },
+    { prop_id, "wxID_ANY" },
+    { prop_pos, "wxDefaultPosition" },
+    { prop_size, "wxDefaultSize" },
+
+});
+
+bool HasPerlMapConstant(std::string_view value)
+{
+    for (auto& iter: map_perl_constants)
+    {
+        if (tt::contains(iter.second, value))
+            return true;
+    }
+    return false;
+}
+
 // This *must* be written on a line by itself with *no* indentation.
 const char* perl_begin_cmt_block = "=pod";
 
@@ -134,32 +159,80 @@ void BaseCodeGenerator::GeneratePerlClass(PANEL_PAGE panel_type)
 
     m_source->writeLine();
 
-    std::set<std::string> imports;
+    std::set<std::string> use_classes;
+    std::set<std::string> use_constants;
 
     auto GatherImportModules = [&](Node* node, auto&& GatherImportModules) -> void
     {
         if (auto* gen = node->getGenerator(); gen)
         {
+            std::set<std::string> imports;
             gen->GetImports(node, imports, GEN_LANG_PERL);
+            for (auto& iter: imports)
+            {
+                if (iter.starts_with("use Wx"))
+                    use_constants.emplace(iter);
+                else
+                    use_classes.emplace(iter);
+            }
+            for (auto& iter: map_perl_constants)
+            {
+                if (node->hasProp(iter.first))
+                {
+                    tt_string constants("use Wx qw(");
+                    constants += iter.second;
+                    constants += ");";
+                    use_constants.emplace(constants);
+                }
+            }
         }
         for (auto& child: node->getChildNodePtrs())
         {
+            std::set<std::string> imports;
             GatherImportModules(child.get(), GatherImportModules);
+            for (auto& iter: imports)
+            {
+                if (iter.starts_with("use "))
+                    use_classes.emplace(iter);
+                else
+                    use_constants.emplace(iter);
+            }
+            for (auto& iter: map_perl_constants)
+            {
+                if (child.get()->hasProp(iter.first))
+                {
+                    tt_string constants("use Wx qw(");
+                    constants += iter.second;
+                    constants += ");";
+                    use_constants.emplace(constants);
+                }
+            }
         }
     };
     GatherImportModules(m_form_node, GatherImportModules);
 
-    if (imports.size())
+    if (use_classes.size())
     {
         m_source->writeLine();
-        for (const auto& import: imports)
+        for (const auto& import: use_classes)
         {
             m_source->writeLine(import);
         }
+        m_source->writeLine();
     }
     else
     {
-        m_source->writeLine("use Wx qw[:everything];");
+        m_source->writeLine("use Wx qw[:allclasses];");
+    }
+
+    if (use_constants.size())
+    {
+        m_source->writeLine();
+        for (const auto& import: use_constants)
+        {
+            m_source->writeLine(import);
+        }
+        m_source->writeLine();
     }
 
     m_source->writeLine();
@@ -299,7 +372,7 @@ void BaseCodeGenerator::GeneratePerlClass(PANEL_PAGE panel_type)
 
     // Make certain indentation is reset after all construction code is written
     m_source->ResetIndent();
-    m_source->writeLine("\treturn $this;", indent::none);
+    m_source->writeLine("\treturn $self;", indent::none);
     m_source->writeLine("}\n\n", indent::none);
     m_source->writeLine("1;", indent::none);
 
diff --git a/src/generate/gen_toolbar.cpp b/src/generate/gen_toolbar.cpp
index 214d7f190..0c23d97e5 100644
--- a/src/generate/gen_toolbar.cpp
+++ b/src/generate/gen_toolbar.cpp
@@ -1,7 +1,7 @@
 /////////////////////////////////////////////////////////////////////////////
 // Purpose:   wxToolBar generator
 // Author:    Ralph Walden
-// Copyright: Copyright (c) 2020-2023 KeyWorks Software (Ralph Walden)
+// Copyright: Copyright (c) 2020-2025 KeyWorks Software (Ralph Walden)
 // License:   Apache License -- see ../../LICENSE
 /////////////////////////////////////////////////////////////////////////////
 
@@ -503,6 +503,55 @@ void ToolBarGenerator::RequiredHandlers(Node* /* node */, std::set<std::string>&
     handlers.emplace("wxToolBarXmlHandler");
 }
 
+bool ToolBarGenerator::GetImports(Node* node, std::set<std::string>& set_imports, GenLang language)
+{
+    if (language == GEN_LANG_PERL)
+    {
+        tt_string constants;
+
+        auto set_constants = [&]()
+        {
+            if (constants.size())
+            {
+                // remove the leading space
+                constants.erase(0, 1);
+                constants.insert(0, "use Wx qw(");
+                constants += ");";
+                set_imports.emplace(constants);
+                constants.clear();
+            }
+        };
+
+        if (node->as_string(prop_style).contains("wxTB_FLAT"))
+            constants += " wxTB_FLAT";
+        if (node->as_string(prop_style).contains("wxTB_DOCKABLE"))
+            constants += " wxTB_DOCKABLE";
+        if (node->as_string(prop_style).contains("wxTB_HORIZONTAL"))
+            constants += " wxTB_HORIZONTAL";
+        if (node->as_string(prop_style).contains("wxTB_VERTICAL"))
+            constants += " wxTB_VERTICAL";
+        if (node->as_string(prop_style).contains("wxTB_TEXT"))
+            constants += " wxTB_TEXT";
+        if (node->as_string(prop_style).contains("wxTB_NOICONS"))
+            constants += " wxTB_NOICONS";
+        if (node->as_string(prop_style).contains("wxTB_NODIVIDER"))
+            constants += " wxTB_NODIVIDER";
+        if (node->as_string(prop_style).contains("wxTB_NOALIGN"))
+            constants += " wxTB_NOALIGN";
+        if (node->as_string(prop_style).contains("wxTB_HORZ_LAYOUT"))
+            constants += " wxTB_HORZ_LAYOUT";
+        if (node->as_string(prop_style).contains("wxTB_HORZ_TEXT"))
+            constants += " wxTB_HORZ_TEXT";
+        set_constants();
+
+        set_imports.emplace("use Wx qw(wxITEM_NORMAL wxITEM_CHECK wxITEM_DROPDOWN wxITEM_RADIO);");
+
+        return true;
+    }
+
+    return false;
+}
+
 //////////////////////////////////////////  ToolGenerator  //////////////////////////////////////////
 
 bool ToolGenerator::ConstructionCode(Code& code)
diff --git a/src/generate/gen_toolbar.h b/src/generate/gen_toolbar.h
index c53c2c36a..247f5cd39 100644
--- a/src/generate/gen_toolbar.h
+++ b/src/generate/gen_toolbar.h
@@ -1,7 +1,7 @@
 /////////////////////////////////////////////////////////////////////////////
 // Purpose:   wxToolBar generator
 // Author:    Ralph Walden
-// Copyright: Copyright (c) 2020-2023 KeyWorks Software (Ralph Walden)
+// Copyright: Copyright (c) 2020-2025 KeyWorks Software (Ralph Walden)
 // License:   Apache License -- see ../../LICENSE
 /////////////////////////////////////////////////////////////////////////////
 
@@ -49,6 +49,8 @@ class ToolBarGenerator : public BaseGenerator
     int GenXrcObject(Node*, pugi::xml_node& /* object */, size_t /* xrc_flags */) override;
     void RequiredHandlers(Node*, std::set<std::string>& /* handlers */) override;
 
+    bool GetImports(Node*, std::set<std::string>& set_imports, GenLang language) override;
+
 protected:
     void OnTool(wxCommandEvent& event);
 };

From c78de536ced2a9685b669a5a90ac9177ae2a48bb Mon Sep 17 00:00:00 2001
From: Randalphwa <38287198+Randalphwa@users.noreply.github.com>
Date: Wed, 8 Jan 2025 06:58:50 -0800
Subject: [PATCH 4/8] Replace old php var names with rust var names

This affects the Event Handler dialog. PHP had already been replaced
with a Rust tab, but the variable names had not been changed.
---
 src/wxui/wxUiEditor.wxui | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/wxui/wxUiEditor.wxui b/src/wxui/wxUiEditor.wxui
index c73b8da11..25629ae4d 100644
--- a/src/wxui/wxUiEditor.wxui
+++ b/src/wxui/wxUiEditor.wxui
@@ -4562,7 +4562,7 @@
                     checked="0"
                     class_access="protected:"
                     label="Use function"
-                    radiobtn_var_name="m_php_radio_use_function"
+                    radiobtn_var_name="m_rust_radio_use_function"
                     var_name="m_php_function_box"
                     flags="wxEXPAND"
                     wxEVT_RADIOBUTTON="OnUseRubyFunction">
@@ -4594,8 +4594,8 @@
                       checked="0"
                       class_access="protected:"
                       label="Anonymous function"
-                      radiobtn_var_name="m_php_radio_use_anon_func"
-                      var_name="m_php_lambda_box"
+                      radiobtn_var_name="m_rust_radio_use_anon_func"
+                      var_name="m_rust_lambda_box"
                       flags="wxEXPAND"
                       proportion="1"
                       wxEVT_RADIOBUTTON="OnUseRustLambda">

From a1c6af9f316dcb607e18b34d0a2e416bcb0067ed Mon Sep 17 00:00:00 2001
From: Randalphwa <38287198+Randalphwa@users.noreply.github.com>
Date: Wed, 8 Jan 2025 12:06:47 -0800
Subject: [PATCH 5/8] Generate unused C++ events

Similar to the other languages, this adds unimplemented events as
comments in the source code.

Closes #1530
---
 src/generate/file_codewriter.cpp |   6 +-
 src/generate/gen_base.h          |   3 +
 src/generate/gen_cpp.cpp         |   8 ++
 src/generate/gen_events.cpp      | 156 +++++++++++++++++++++++++++++++
 4 files changed, 170 insertions(+), 3 deletions(-)

diff --git a/src/generate/file_codewriter.cpp b/src/generate/file_codewriter.cpp
index 492284c2c..6488effa3 100644
--- a/src/generate/file_codewriter.cpp
+++ b/src/generate/file_codewriter.cpp
@@ -17,7 +17,7 @@ using namespace code;
 
 // clang-format off
 
-inline constexpr const auto txt_EndCppBlock =
+inline constexpr const auto end_cpp_block =
 R"===(
 // ************* End of generated code ***********
 // DO NOT EDIT THIS COMMENT BLOCK!
@@ -79,7 +79,7 @@ int FileCodeWriter::WriteFile(GenLang language, int flags)
         if (flags & flag_add_closing_brace)
         {
             tt_string_vector lines;
-            lines.ReadString(txt_EndCppBlock);
+            lines.ReadString(end_cpp_block);
             for (auto& iter: lines)
             {
                 if (iter.is_sameprefix("// clang-format on"))
@@ -99,7 +99,7 @@ int FileCodeWriter::WriteFile(GenLang language, int flags)
         }
         else
         {
-            m_buffer += txt_EndCppBlock;
+            m_buffer += end_cpp_block;
         }
     }
     else if (language == GEN_LANG_FORTRAN)
diff --git a/src/generate/gen_base.h b/src/generate/gen_base.h
index 714793640..d02dc8658 100644
--- a/src/generate/gen_base.h
+++ b/src/generate/gen_base.h
@@ -146,8 +146,11 @@ class BaseCodeGenerator
 
     void GenSrcEventBinding(Node* class_node, EventVector& events);
     void GenHdrEvents();
+    void GenCppEventHandlers(EventVector& events);
+    void GenPerlEventHandlers(EventVector& events);
     void GenPythonEventHandlers(EventVector& events);
     void GenRubyEventHandlers(EventVector& events);
+    void GenRustEventHandlers(EventVector& events);
 
     // Generates all the code lines for validator_variables initialized in the header file
     void GenCppValVarsBase(const NodeDeclaration* info, Node* node, std::set<std::string>& code_lines);
diff --git a/src/generate/gen_cpp.cpp b/src/generate/gen_cpp.cpp
index ff0e6a4d1..018dd0b18 100644
--- a/src/generate/gen_cpp.cpp
+++ b/src/generate/gen_cpp.cpp
@@ -1339,6 +1339,14 @@ void BaseCodeGenerator::GenerateCppClassConstructor()
             m_source->writeLine();
             m_source->writeLine("// Event handlers");
             GenSrcEventBinding(m_form_node, m_events);
+
+            if (m_events.size())
+            {
+                m_source->writeLine();
+                m_source->ResetIndent();
+                GenCppEventHandlers(m_events);
+                m_source->Indent();
+            }
         }
 
         code.clear();
diff --git a/src/generate/gen_events.cpp b/src/generate/gen_events.cpp
index 2de2be7fc..a8f5200c8 100644
--- a/src/generate/gen_events.cpp
+++ b/src/generate/gen_events.cpp
@@ -666,6 +666,162 @@ void BaseCodeGenerator::GenHdrEvents()
 
 // This function simply generates unhandled event handlers in a multi-string comment.
 
+void BaseCodeGenerator::GenCppEventHandlers(EventVector& events)
+{
+    ASSERT_MSG(events.size(), "GenCppEventHandlers() shouldn't be called if there are no events");
+    if (events.empty())
+    {
+        return;
+    }
+
+    // Multiple events can be bound to the same function, so use a set to make sure we only generate each function once.
+    std::unordered_set<std::string> code_lines;
+
+    Code code(m_form_node, GEN_LANG_CPLUSPLUS);
+    auto sort_event_handlers = [](NodeEvent* a, NodeEvent* b)
+    {
+        return (EventHandlerDlg::GetCppValue(a->get_value()) < EventHandlerDlg::GetCppValue(b->get_value()));
+    };
+
+    // Sort events by function name
+    std::sort(events.begin(), events.end(), sort_event_handlers);
+
+    bool found_user_handlers = false;
+    if (m_panel_type == NOT_PANEL)
+    {
+        tt_view_vector org_file;
+        auto [path, has_base_file] = Project.GetOutputPath(m_form_node, GEN_LANG_CPLUSPLUS);
+
+        if (has_base_file && path.extension().empty())
+        {
+            if (auto& extProp = Project.as_string(prop_source_ext); extProp.size())
+            {
+                path += extProp;
+            }
+            else
+            {
+                path += ".cpp";
+            }
+        }
+
+        // If the user has defined any event handlers, add them to the code_lines set so we
+        // don't generate them again.
+        if (has_base_file && org_file.ReadFile(path))
+        {
+            size_t line_index;
+            for (line_index = 0; line_index < org_file.size(); ++line_index)
+            {
+                if (org_file[line_index].is_sameprefix(cpp_rust_end_cmt_line))
+                {
+                    break;
+                }
+            }
+            for (++line_index; line_index < org_file.size(); ++line_index)
+            {
+                auto handler = org_file[line_index].view_nonspace();
+                if (org_file[line_index].view_nonspace().starts_with("void "))
+                {
+                    code_lines.emplace(handler);
+                    found_user_handlers = true;
+                }
+            }
+        }
+    }
+
+    bool is_all_events_implemented = true;
+    if (found_user_handlers)
+    {
+        // Determine whether the user has implemented all of the event handlers in this module
+        for (auto& event: events)
+        {
+            auto handler = EventHandlerDlg::GetCppValue(event->get_value());
+            // Ignore lambda's
+            if (handler.starts_with("[cpp:lambda]"))
+                continue;
+
+            tt_string set_code;
+            set_code << "void " << m_form_node->getNodeName() << "::" << handler;
+            if (code_lines.find(set_code) != code_lines.end())
+                continue;
+
+            // At least one event wasn't implemented, so stop looking for more
+            is_all_events_implemented = false;
+
+            code.Str(
+                "// Unimplemented Event handler functions\n// Copy any of the following and paste them below the comment block, or "
+                "to your inherited class.");
+            code.Eol().Str("\n/*").Eol();
+            break;
+        }
+        if (is_all_events_implemented)
+        {
+            // If the user has defined all the event handlers, then we don't need to output anything else.
+            return;
+        }
+    }
+    else
+    {
+        // The user hasn't defined their own event handlers in this module
+        is_all_events_implemented = false;
+
+        code.Str("// Unimplemented Event handler functions\n// Copy any of the following and paste them below the comment block, or "
+                 "to your inherited class.");
+        code.Eol().Str("\n/*").Eol();
+    }
+    m_source->writeLine(code);
+
+    code.clear();
+    if (!is_all_events_implemented)
+    {
+        for (auto& event: events)
+        {
+            auto handler = EventHandlerDlg::GetCppValue(event->get_value());
+            // Ignore lambda's
+            if (handler.empty() || handler.starts_with("[cpp:lambda]"))
+                continue;
+
+            tt_string set_code;
+            set_code << "void " << m_form_node->getNodeName() << "::" << handler;
+            if (code_lines.find(set_code) != code_lines.end())
+                continue;
+
+            // Add it to our set of handled events in case the user specified
+            // the same event handler for multiple events.
+            code_lines.emplace(set_code);
+
+            code.Str(set_code).Eol();
+            code.OpenBrace();
+#if defined(_DEBUG)
+            auto& dbg_event_name = event->get_name();
+            wxUnusedVar(dbg_event_name);
+#endif  // _DEBUG
+            if (event->get_name() == "CloseButtonClicked")
+            {
+                code.Str("EndModal(wxID_CLOSE);").Eol().Eol();
+            }
+            else if (event->get_name() == "YesButtonClicked")
+            {
+                code.Str("EndModal(wxID_YES);").Eol().Eol();
+            }
+            else if (event->get_name() == "NoButtonClicked")
+            {
+                code.Str("EndModal(wxID_NO);").Eol().Eol();
+            }
+            else
+            {
+                code.Str("event.Skip();").Eol().Eol();
+            }
+            code.CloseBrace();
+        }
+    }
+
+    if (!is_all_events_implemented)
+    {
+        m_source->writeLine(code);
+        m_source->writeLine("\n*/");
+    }
+}
+
 void BaseCodeGenerator::GenPythonEventHandlers(EventVector& events)
 {
     ASSERT_MSG(events.size(), "GenPythonEventHandlers() shouldn't be called if there are no events");

From ba837245b155bd0bc353f8ecab6ef07d0190170e Mon Sep 17 00:00:00 2001
From: Randalphwa <38287198+Randalphwa@users.noreply.github.com>
Date: Thu, 9 Jan 2025 10:03:22 -0800
Subject: [PATCH 6/8] Fix Rust lexer for code display panel

This was still the old PHP lexer that we no longer use.
---
 src/panels/code_display.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/panels/code_display.cpp b/src/panels/code_display.cpp
index b15cdce68..dc2389e73 100644
--- a/src/panels/code_display.cpp
+++ b/src/panels/code_display.cpp
@@ -389,7 +389,7 @@ CodeDisplay::CodeDisplay(wxWindow* parent, GenLang panel_type) : CodeDisplayBase
     }
     else if (panel_type == GEN_LANG_RUST)
     {
-        m_scintilla->SetLexer(wxSTC_LEX_PHPSCRIPT);
+        m_scintilla->SetLexer(wxSTC_LEX_RUST);
         // On Windows, this saves converting the UTF8 to UTF16 and then back to ANSI.
         m_scintilla->SendMsg(SCI_SETKEYWORDS, 0, (wxIntPtr) g_rust_keywords);
 

From bb008e3b5cda7f9b91d0bda6d923d300a2231619 Mon Sep 17 00:00:00 2001
From: Randalphwa <38287198+Randalphwa@users.noreply.github.com>
Date: Thu, 9 Jan 2025 10:51:50 -0800
Subject: [PATCH 7/8] Fix problems with Rust event handling

---
 src/customprops/eventhandler_dlg.cpp | 266 ++++++++++++++++++++++-----
 src/customprops/eventhandler_dlg.h   |   3 +-
 2 files changed, 217 insertions(+), 52 deletions(-)

diff --git a/src/customprops/eventhandler_dlg.cpp b/src/customprops/eventhandler_dlg.cpp
index 69f35a0ee..9bd831e6d 100644
--- a/src/customprops/eventhandler_dlg.cpp
+++ b/src/customprops/eventhandler_dlg.cpp
@@ -1,7 +1,7 @@
 /////////////////////////////////////////////////////////////////////////////
 // Purpose:   Dialog for editing event handlers
 // Author:    Ralph Walden
-// Copyright: Copyright (c) 2021-2024 KeyWorks Software (Ralph Walden)
+// Copyright: Copyright (c) 2021-2025 KeyWorks Software (Ralph Walden)
 // License:   Apache License -- see ../../LICENSE
 /////////////////////////////////////////////////////////////////////////////
 
@@ -57,13 +57,17 @@ EventHandlerDlg::EventHandlerDlg(wxWindow* parent, NodeEvent* event) : EventHand
 
     m_gen_languages = Project.getGenerateLanguages();
     m_is_cpp_enabled = (m_gen_languages & GEN_LANG_CPLUSPLUS);
+    m_is_perl_enabled = (m_gen_languages & GEN_LANG_PERL);
     m_is_python_enabled = (m_gen_languages & GEN_LANG_PYTHON);
     m_is_ruby_enabled = (m_gen_languages & GEN_LANG_RUBY);
+    m_is_rust_enabled = (m_gen_languages & GEN_LANG_RUST);
+
+    // REVIEW: [Randalphwa - 01-09-2025] Support for these is not currently planned, but they are
+    // here in case they do get supported in the future.
+
     m_is_fortran_enabled = (m_gen_languages & GEN_LANG_FORTRAN);
     m_is_haskell_enabled = (m_gen_languages & GEN_LANG_HASKELL);
     m_is_lua_enabled = (m_gen_languages & GEN_LANG_LUA);
-    m_is_perl_enabled = (m_gen_languages & GEN_LANG_PERL);
-    m_is_rust_enabled = (m_gen_languages & GEN_LANG_RUST);
 
     m_code_preference = Project.getCodePreference(event->getNode());
 
@@ -145,6 +149,27 @@ EventHandlerDlg::EventHandlerDlg(wxWindow* parent, NodeEvent* event) : EventHand
         m_cpp_stc_lambda->StyleSetForeground(wxSTC_C_WORD, UserPrefs.get_CppKeywordColour());
         m_cpp_stc_lambda->StyleSetForeground(wxSTC_C_WORD2, UserPrefs.get_CppColour());
     }
+    if (m_is_perl_enabled)
+    {
+        m_perl_stc_lambda->SetLexer(wxSTC_LEX_PERL);
+        m_perl_stc_lambda->SendMsg(SCI_SETKEYWORDS, 0, (wxIntPtr) g_perl_keywords);
+
+        m_perl_stc_lambda->StyleSetForeground(wxSTC_PL_COMMENTLINE, UserPrefs.get_PerlCommentColour());
+        m_perl_stc_lambda->StyleSetForeground(wxSTC_PL_NUMBER, UserPrefs.get_PerlNumberColour());
+        m_perl_stc_lambda->StyleSetForeground(wxSTC_PL_STRING, UserPrefs.get_PerlStringColour());
+        m_perl_stc_lambda->StyleSetForeground(wxSTC_PL_WORD, UserPrefs.get_PerlKeywordColour());
+    }
+    if (m_is_rust_enabled)
+    {
+        m_rust_stc_lambda->SetLexer(wxSTC_LEX_RUST);
+        m_rust_stc_lambda->SendMsg(SCI_SETKEYWORDS, 0, (wxIntPtr) g_rust_keywords);
+
+        m_rust_stc_lambda->StyleSetForeground(wxSTC_RUST_COMMENTLINE, UserPrefs.get_RustCommentColour());
+        m_rust_stc_lambda->StyleSetForeground(wxSTC_RUST_NUMBER, UserPrefs.get_RustNumberColour());
+        m_rust_stc_lambda->StyleSetForeground(wxSTC_RUST_STRING, UserPrefs.get_RustStringColour());
+        m_rust_stc_lambda->StyleSetForeground(wxSTC_RUST_WORD, UserPrefs.get_RustKeywordColour());
+        m_rust_stc_lambda->StyleSetForeground(wxSTC_RUST_WORD2, UserPrefs.get_RustColour());
+    }
     if (m_is_ruby_enabled)
     {
         m_ruby_stc_lambda->SetLexer(wxSTC_LEX_RUBY);
@@ -155,6 +180,10 @@ EventHandlerDlg::EventHandlerDlg(wxWindow* parent, NodeEvent* event) : EventHand
         m_ruby_stc_lambda->StyleSetForeground(wxSTC_RB_STRING, UserPrefs.get_RubyStringColour());
         m_ruby_stc_lambda->StyleSetForeground(wxSTC_RB_WORD, UserPrefs.get_RubyColour());
     }
+
+    // REVIEW: [Randalphwa - 01-09-2025] Support for these is not currently planned, but they are
+    // here in case they do get supported in the future.
+
     if (m_is_fortran_enabled)
     {
         m_fortran_stc_lambda->SetLexer(wxSTC_LEX_FORTRAN);
@@ -187,27 +216,6 @@ EventHandlerDlg::EventHandlerDlg(wxWindow* parent, NodeEvent* event) : EventHand
         m_lua_stc_lambda->StyleSetForeground(wxSTC_LUA_WORD, UserPrefs.get_LuaKeywordColour());
         m_lua_stc_lambda->StyleSetForeground(wxSTC_LUA_WORD2, UserPrefs.get_LuaColour());
     }
-    if (m_is_perl_enabled)
-    {
-        m_perl_stc_lambda->SetLexer(wxSTC_LEX_PERL);
-        m_perl_stc_lambda->SendMsg(SCI_SETKEYWORDS, 0, (wxIntPtr) g_perl_keywords);
-
-        m_perl_stc_lambda->StyleSetForeground(wxSTC_PL_COMMENTLINE, UserPrefs.get_PerlCommentColour());
-        m_perl_stc_lambda->StyleSetForeground(wxSTC_PL_NUMBER, UserPrefs.get_PerlNumberColour());
-        m_perl_stc_lambda->StyleSetForeground(wxSTC_PL_STRING, UserPrefs.get_PerlStringColour());
-        m_perl_stc_lambda->StyleSetForeground(wxSTC_PL_WORD, UserPrefs.get_PerlKeywordColour());
-    }
-    if (m_is_rust_enabled)
-    {
-        m_rust_stc_lambda->SetLexer(wxSTC_LEX_RUST);
-        m_rust_stc_lambda->SendMsg(SCI_SETKEYWORDS, 0, (wxIntPtr) g_rust_keywords);
-
-        m_rust_stc_lambda->StyleSetForeground(wxSTC_RUST_COMMENTLINE, UserPrefs.get_RustCommentColour());
-        m_rust_stc_lambda->StyleSetForeground(wxSTC_RUST_NUMBER, UserPrefs.get_RustNumberColour());
-        m_rust_stc_lambda->StyleSetForeground(wxSTC_RUST_STRING, UserPrefs.get_RustStringColour());
-        m_rust_stc_lambda->StyleSetForeground(wxSTC_RUST_WORD, UserPrefs.get_RustKeywordColour());
-        m_rust_stc_lambda->StyleSetForeground(wxSTC_RUST_WORD2, UserPrefs.get_RustColour());
-    }
 
     auto form = event->getNode()->getForm();
     if (form)
@@ -231,6 +239,11 @@ EventHandlerDlg::EventHandlerDlg(wxWindow* parent, NodeEvent* event) : EventHand
         // m_py_text_lambda is a single line text control, so there is no scintilla properties to
         // set.
 
+        if (m_is_perl_enabled)
+        {
+            m_perl_stc_lambda->SetLexer(wxSTC_LEX_PERL);
+            m_perl_stc_lambda->SendMsg(SCI_SETKEYWORDS, 0, (wxIntPtr) g_perl_keywords);
+        }
         if (m_is_ruby_enabled)
         {
             // Unfortunately, RUBY_LEXER only supports one set of keywords so we either combine
@@ -257,6 +270,15 @@ EventHandlerDlg::EventHandlerDlg(wxWindow* parent, NodeEvent* event) : EventHand
             }
             m_ruby_stc_lambda->SendMsg(SCI_SETKEYWORDS, 0, (wxIntPtr) wxRuby_keywords.c_str());
         }
+        if (m_is_rust_enabled)
+        {
+            m_rust_stc_lambda->SetLexer(wxSTC_LEX_PHPSCRIPT);
+            m_rust_stc_lambda->SendMsg(SCI_SETKEYWORDS, 0, (wxIntPtr) g_rust_keywords);
+        }
+
+        // REVIEW: [Randalphwa - 01-09-2025] Support for these is not currently planned, but they
+        // are here in case they do get supported in the future.
+
         if (m_is_fortran_enabled)
         {
             m_fortran_stc_lambda->SetLexer(wxSTC_LEX_FORTRAN);
@@ -272,34 +294,28 @@ EventHandlerDlg::EventHandlerDlg(wxWindow* parent, NodeEvent* event) : EventHand
             m_lua_stc_lambda->SetLexer(wxSTC_LEX_LUA);
             m_lua_stc_lambda->SendMsg(SCI_SETKEYWORDS, 0, (wxIntPtr) g_lua_keywords);
         }
-        if (m_is_perl_enabled)
-        {
-            m_perl_stc_lambda->SetLexer(wxSTC_LEX_PERL);
-            m_perl_stc_lambda->SendMsg(SCI_SETKEYWORDS, 0, (wxIntPtr) g_perl_keywords);
-        }
-        if (m_is_rust_enabled)
-        {
-            m_rust_stc_lambda->SetLexer(wxSTC_LEX_PHPSCRIPT);
-            m_rust_stc_lambda->SendMsg(SCI_SETKEYWORDS, 0, (wxIntPtr) g_rust_keywords);
-        }
     }
 
     if (m_code_preference == GEN_LANG_CPLUSPLUS)
         m_notebook->SetSelection(EVENT_PAGE_CPP);
+    else if (m_code_preference == GEN_LANG_PERL)
+        m_notebook->SetSelection(m_perl_page);
     else if (m_code_preference == GEN_LANG_PYTHON)
         m_notebook->SetSelection(m_python_page);
     else if (m_code_preference == GEN_LANG_RUBY)
         m_notebook->SetSelection(m_ruby_page);
+    else if (m_code_preference == GEN_LANG_RUST)
+        m_notebook->SetSelection(m_rust_page);
+
+    // REVIEW: [Randalphwa - 01-09-2025] Support for these is not currently planned, but they are
+    // here in case they do get supported in the future.
+
     else if (m_code_preference == GEN_LANG_FORTRAN)
         m_notebook->SetSelection(m_fortran_page);
     else if (m_code_preference == GEN_LANG_HASKELL)
         m_notebook->SetSelection(m_haskell_page);
     else if (m_code_preference == GEN_LANG_LUA)
         m_notebook->SetSelection(m_lua_page);
-    else if (m_code_preference == GEN_LANG_PERL)
-        m_notebook->SetSelection(m_perl_page);
-    else if (m_code_preference == GEN_LANG_RUST)
-        m_notebook->SetSelection(m_rust_page);
 }
 
 void EventHandlerDlg::OnInit(wxInitDialogEvent& WXUNUSED(event))
@@ -323,6 +339,12 @@ void EventHandlerDlg::OnInit(wxInitDialogEvent& WXUNUSED(event))
             m_cpp_radio_use_function->SetValue(true);
             m_cpp_lambda_box->GetStaticBox()->Enable(false);
         }
+        if (m_is_perl_enabled)
+        {
+            m_perl_text_function->SetValue(m_value);
+            m_perl_radio_use_function->SetValue(true);
+            m_perl_lambda_box->GetStaticBox()->Enable(false);
+        }
         if (m_is_python_enabled)
         {
             // Pylint recommends snake_case for Python functions, so we convert the default
@@ -337,6 +359,12 @@ void EventHandlerDlg::OnInit(wxInitDialogEvent& WXUNUSED(event))
             m_ruby_radio_use_function->SetValue(true);
             m_ruby_lambda_box->GetStaticBox()->Enable(false);
         }
+        if (m_is_rust_enabled)
+        {
+            m_rust_text_function->SetValue(m_value);
+            m_rust_radio_use_function->SetValue(true);
+            m_rust_lambda_box->GetStaticBox()->Enable(false);
+        }
     }
     else
     {
@@ -382,7 +410,19 @@ void EventHandlerDlg::OnInit(wxInitDialogEvent& WXUNUSED(event))
                 }
             }
         }
+        if (m_is_perl_enabled)
+        {
+            value = GetPerlValue(m_value.utf8_string());
+            if (value.size())
+            {
+                m_perl_radio_use_anon_func->SetValue(false);
+                m_perl_lambda_box->GetStaticBox()->Enable(false);
 
+                m_perl_function_box->GetStaticBox()->Enable(true);
+                m_perl_radio_use_function->SetValue(true);
+                m_perl_text_function->SetValue(value.make_wxString());
+            }
+        }
         if (m_is_python_enabled)
         {
             value = GetPythonValue(m_value.utf8_string());
@@ -447,6 +487,33 @@ void EventHandlerDlg::OnInit(wxInitDialogEvent& WXUNUSED(event))
                 }
             }
         }
+
+        if (m_is_rust_enabled)
+        {
+            value = GetRustValue(m_value.utf8_string());
+            if (value.size())
+            {
+                if (auto pos_lambda = value.find('['); pos_lambda != tt::npos)
+                {
+                    m_rust_radio_use_function->SetValue(false);
+                    m_rust_radio_use_anon_func->SetValue(true);
+                    m_rust_function_box->GetStaticBox()->Enable(false);
+                    m_rust_lambda_box->GetStaticBox()->Enable(true);
+
+                    // remove leading and trailing brackets
+                    value.erase(pos_lambda, sizeof("[python:lambda]") - 1);
+
+                    // m_rust_text_lambda->SetValue(value.make_wxString());
+                    m_is_rust_lambda = true;
+                }
+                else
+                {
+                    m_rust_text_function->SetValue(value.make_wxString());
+                    m_rust_radio_use_function->SetValue(true);
+                    m_rust_radio_use_anon_func->SetValue(false);
+                }
+            }
+        }
     }
 
     FormatBindText();
@@ -531,6 +598,32 @@ void EventHandlerDlg::OnUseRubyFunction(wxCommandEvent& WXUNUSED(event))
     FormatBindText();
 }
 
+void EventHandlerDlg::OnUseRustFunction(wxCommandEvent& WXUNUSED(event))
+{
+    if (m_rust_radio_use_function->GetValue())
+    {
+        m_rust_radio_use_anon_func->SetValue(false);
+        m_rust_lambda_box->GetStaticBox()->Enable(false);
+        m_rust_function_box->GetStaticBox()->Enable(true);
+
+        auto value = GetPythonValue(m_value.utf8_string());
+
+        if (value.empty() || value.contains("["))
+        {
+            if (auto default_name = s_EventNames.find(m_event->get_name()); default_name != s_EventNames.end())
+            {
+                value = default_name->second;
+            }
+            else
+            {
+                value = "OnEvent";
+            }
+        }
+        m_rust_text_function->SetValue(value);
+    }
+    FormatBindText();
+}
+
 void EventHandlerDlg::OnUseCppLambda(wxCommandEvent& WXUNUSED(event))
 {
     if (m_cpp_radio_use_lambda->GetValue())
@@ -613,6 +706,20 @@ void EventHandlerDlg::OnPageChanged(wxBookCtrlEvent& event)
         m_is_cpp_lambda = m_cpp_radio_use_lambda->GetValue();
         m_is_python_lambda = m_py_radio_use_lambda->GetValue();
     }
+    else if (m_is_rust_enabled && event.GetSelection() == (to_int) m_rust_page)
+    {
+        if (m_is_rust_lambda)
+        {
+            m_rust_radio_use_anon_func->SetValue(true);
+            m_rust_radio_use_function->SetValue(false);
+            m_rust_function_box->GetStaticBox()->Enable(false);
+            m_rust_lambda_box->GetStaticBox()->Enable(true);
+
+            m_is_rust_lambda = false;
+        }
+        m_is_cpp_lambda = m_cpp_radio_use_lambda->GetValue();
+        m_is_python_lambda = m_py_radio_use_lambda->GetValue();
+    }
 
     FormatBindText();
 }
@@ -632,21 +739,23 @@ void EventHandlerDlg::OnNone(wxCommandEvent& WXUNUSED(event))
 {
     if (m_is_cpp_enabled && m_notebook->GetCurrentPage() == m_cpp_bookpage)
         m_cpp_text_function->SetValue("none");
+    else if (m_is_perl_enabled && m_notebook->GetCurrentPage() == m_perl_bookpage)
+        m_perl_text_function->SetValue("none");
     else if (m_is_python_enabled && m_notebook->GetCurrentPage() == m_python_bookpage)
         m_py_text_function->SetValue("none");
     else if (m_is_ruby_enabled && m_notebook->GetCurrentPage() == m_ruby_bookpage)
         m_ruby_text_function->SetValue("none");
+    else if (m_is_rust_enabled && m_notebook->GetCurrentPage() == m_rust_bookpage)
+        m_rust_text_function->SetValue("none");
 
+    // REVIEW: [Randalphwa - 01-09-2025] Support for these is not currently planned, but they are
+    // here in case they do get supported in the future.
     else if (m_is_fortran_enabled && m_notebook->GetCurrentPage() == m_fortran_bookpage)
         m_fortran_text_function->SetValue("none");
     else if (m_is_haskell_enabled && m_notebook->GetCurrentPage() == m_haskell_bookpage)
         m_haskell_text_function->SetValue("none");
     else if (m_is_lua_enabled && m_notebook->GetCurrentPage() == m_lua_bookpage)
         m_lua_text_function->SetValue("none");
-    else if (m_is_perl_enabled && m_notebook->GetCurrentPage() == m_perl_bookpage)
-        m_perl_text_function->SetValue("none");
-    else if (m_is_rust_enabled && m_notebook->GetCurrentPage() == m_rust_bookpage)
-        m_rust_text_function->SetValue("none");
 }
 
 void EventHandlerDlg::OnDefault(wxCommandEvent& WXUNUSED(event))
@@ -663,21 +772,23 @@ void EventHandlerDlg::OnDefault(wxCommandEvent& WXUNUSED(event))
 
     if (m_is_cpp_enabled && m_notebook->GetCurrentPage() == m_cpp_bookpage)
         m_cpp_text_function->SetValue(value);
+    else if (m_is_perl_enabled && m_notebook->GetCurrentPage() == m_perl_bookpage)
+        m_perl_text_function->SetValue(value);
     else if (m_is_python_enabled && m_notebook->GetCurrentPage() == m_python_bookpage)
         m_py_text_function->SetValue(ConvertToSnakeCase(value.ToStdString()).make_wxString());
     else if (m_is_ruby_enabled && m_notebook->GetCurrentPage() == m_ruby_bookpage)
         m_ruby_text_function->SetValue(ConvertToSnakeCase(m_value.ToStdString()).make_wxString());
+    else if (m_is_rust_enabled && m_notebook->GetCurrentPage() == m_rust_bookpage)
+        m_rust_text_function->SetValue(value);
 
+    // REVIEW: [Randalphwa - 01-09-2025] Support for these is not currently planned, but they are
+    // here in case they do get supported in the future.
     else if (m_is_fortran_enabled && m_notebook->GetCurrentPage() == m_fortran_bookpage)
         m_fortran_text_function->SetValue(value);
     else if (m_is_haskell_enabled && m_notebook->GetCurrentPage() == m_haskell_bookpage)
         m_haskell_text_function->SetValue(value);
     else if (m_is_lua_enabled && m_notebook->GetCurrentPage() == m_lua_bookpage)
         m_lua_text_function->SetValue(value);
-    else if (m_is_perl_enabled && m_notebook->GetCurrentPage() == m_perl_bookpage)
-        m_perl_text_function->SetValue(value);
-    else if (m_is_rust_enabled && m_notebook->GetCurrentPage() == m_rust_bookpage)
-        m_rust_text_function->SetValue(value);
 }
 
 void EventHandlerDlg::FormatBindText()
@@ -842,6 +953,9 @@ void EventHandlerDlg::Update_m_value()
     tt_string cpp_value;
     tt_string py_value;
     tt_string ruby_value;
+    tt_string perl_value;
+    tt_string rust_value;
+
     m_value.clear();
 
     if (m_is_cpp_enabled)
@@ -937,12 +1051,38 @@ void EventHandlerDlg::Update_m_value()
         }
     }
 
+    if (m_is_perl_enabled)
+    {
+        if (m_perl_radio_use_function->GetValue())
+        {
+            if (!m_is_cpp_enabled && !m_is_python_enabled && !m_is_ruby_enabled && !m_is_rust_enabled)
+                perl_value = m_perl_text_function->GetValue().utf8_string();
+            else
+                perl_value << "[perl:" << m_perl_text_function->GetValue().utf8_string() << "]";
+        }
+    }
+
+    if (m_is_rust_enabled)
+    {
+        if (m_rust_radio_use_function->GetValue())
+        {
+            if (!m_is_cpp_enabled && !m_is_perl_enabled && !m_is_python_enabled && !m_is_ruby_enabled)
+                rust_value = m_rust_text_function->GetValue().utf8_string();
+            else
+                rust_value << "[rust:" << m_rust_text_function->GetValue().utf8_string() << "]";
+        }
+    }
+
     // If we get here, then more than one language has been specified.
 
     if (m_is_cpp_enabled)
     {
         m_value = cpp_value.make_wxString();
     }
+    if (m_is_perl_enabled)
+    {
+        m_value << perl_value.make_wxString();
+    }
     if (m_is_python_enabled)
     {
         m_value << py_value.make_wxString();
@@ -951,6 +1091,10 @@ void EventHandlerDlg::Update_m_value()
     {
         m_value << ruby_value.make_wxString();
     }
+    if (m_is_rust_enabled)
+    {
+        m_value << rust_value.make_wxString();
+    }
 }
 
 // For a single language, there is no language prefix unless it's a lambda. For multiple
@@ -961,13 +1105,21 @@ void EventHandlerDlg::Update_m_value()
 
 tt_string EventHandlerDlg::GetCppValue(tt_string_view value)
 {
-    if (auto pos_python = value.find("[python:"); pos_python != tt::npos)
+    if (auto pos = value.find("[python:"); pos != tt::npos)
+    {
+        value.remove_suffix(value.size() - pos);
+    }
+    if (auto pos = value.find("[perl:"); pos != tt::npos)
+    {
+        value.remove_suffix(value.size() - pos);
+    }
+    if (auto pos = value.find("[ruby:"); pos != tt::npos)
     {
-        value.remove_suffix(value.size() - pos_python);
+        value.remove_suffix(value.size() - pos);
     }
-    if (auto pos_ruby = value.find("[ruby:"); pos_ruby != tt::npos)
+    if (auto pos = value.find("[rust:"); pos != tt::npos)
     {
-        value.remove_suffix(value.size() - pos_ruby);
+        value.remove_suffix(value.size() - pos);
     }
 
     tt_string result(value);
@@ -994,6 +1146,10 @@ tt_string EventHandlerDlg::GetPerlValue(tt_string_view value)
             {
                 result.erase(pos_other, result.size() - pos_other);
             }
+            if (auto pos_other = result.find("[python:"); pos_other != tt::npos)
+            {
+                result.erase(pos_other, result.size() - pos_other);
+            }
         }
         return result;
     }
@@ -1004,7 +1160,7 @@ tt_string EventHandlerDlg::GetPerlValue(tt_string_view value)
 
     if (!value.starts_with("[perl:lambda]"))
     {
-        // This is just a function name, so remove the "[python:" and the trailing ']'
+        // This is just a function name, so remove the "[perl:" and the trailing ']'
         value.remove_prefix(sizeof("[perl:") - 1);
         if (auto end = value.find(']'); end != tt::npos)
         {
@@ -1078,6 +1234,14 @@ tt_string EventHandlerDlg::GetRustValue(tt_string_view value)
             {
                 result.erase(pos_other, result.size() - pos_other);
             }
+            if (auto pos_other = result.find("[python:"); pos_other != tt::npos)
+            {
+                result.erase(pos_other, result.size() - pos_other);
+            }
+            if (auto pos_other = result.find("[perl:"); pos_other != tt::npos)
+            {
+                result.erase(pos_other, result.size() - pos_other);
+            }
         }
         return result;
     }
diff --git a/src/customprops/eventhandler_dlg.h b/src/customprops/eventhandler_dlg.h
index 2e1a7016a..eb3bafe12 100644
--- a/src/customprops/eventhandler_dlg.h
+++ b/src/customprops/eventhandler_dlg.h
@@ -1,7 +1,7 @@
 /////////////////////////////////////////////////////////////////////////////
 // Purpose:   Dialog for editing event handlers
 // Author:    Ralph Walden
-// Copyright: Copyright (c) 2021-2024 KeyWorks Software (Ralph Walden)
+// Copyright: Copyright (c) 2021-2025 KeyWorks Software (Ralph Walden)
 // License:   Apache License -- see ../../LICENSE
 /////////////////////////////////////////////////////////////////////////////
 
@@ -111,6 +111,7 @@ class EventHandlerDlg : public EventHandlerDlgBase
     void OnUsePythonLambda(wxCommandEvent& event) override;
     void OnUseRubyFunction(wxCommandEvent& event) override;
     void OnUseRubyLambda(wxCommandEvent& WXUNUSED(event)) override;
+    void OnUseRustFunction(wxCommandEvent& event) override;
     void OnDefault(wxCommandEvent& event) override;
     void OnNone(wxCommandEvent& event) override;
 

From 77c1610a2937c08bbc1dfbf46a632807317b4129 Mon Sep 17 00:00:00 2001
From: Randalphwa <38287198+Randalphwa@users.noreply.github.com>
Date: Thu, 9 Jan 2025 13:56:18 -0800
Subject: [PATCH 8/8] Improve support for Perl, Rust, and C++ events

---
 src/generate/code.cpp              |  32 ++-
 src/generate/code.h                |   2 +-
 src/generate/file_codewriter.cpp   |  35 ++-
 src/generate/file_codewriter.h     |  10 +-
 src/generate/gen_common.cpp        |   2 +-
 src/generate/gen_cpp.cpp           |  10 +-
 src/generate/gen_events.cpp        | 428 +++++++++++++++++++++++++++--
 src/generate/gen_frame.cpp         |  21 ++
 src/generate/gen_menu.cpp          |   2 +-
 src/generate/gen_menuitem.cpp      |  19 +-
 src/generate/gen_menuitem.h        |   4 +-
 src/generate/gen_perl.cpp          |  18 +-
 src/generate/gen_rust.cpp          |   5 +-
 src/generate/menu_widgets.cpp      |   4 +
 src/wxui/eventhandler_dlg_base.cpp |  36 +--
 src/wxui/eventhandler_dlg_base.h   |   9 +-
 src/wxui/wxUiEditor.wxui           |   4 +-
 src/wxui/wxue_data.cpp             | 416 ++++++++++++++--------------
 src/wxui/wxue_data.h               |   2 +-
 src/wxui/wxui_code.cmake           |  32 ++-
 20 files changed, 790 insertions(+), 301 deletions(-)

diff --git a/src/generate/code.cpp b/src/generate/code.cpp
index efcace1f4..ce89b0d42 100644
--- a/src/generate/code.cpp
+++ b/src/generate/code.cpp
@@ -329,9 +329,7 @@ std::string_view GetLanguagePrefix(tt_string_view candidate, GenLang language)
             break;
 
         case GEN_LANG_RUST:
-            prefix_list = &s_short_rust_map;
-            global_list = &g_map_rust_prefix;
-            break;
+            return "wx::";
 
         case GEN_LANG_CPLUSPLUS:
             FAIL_MSG("Don't call GetLanguagePrefix() for C++ code!");
@@ -516,14 +514,20 @@ Code& Code::Eol(int flag)
 
 Code& Code::OpenBrace(bool all_languages)
 {
-    if (!all_languages && !is_cpp())
+    if (!all_languages && !is_cpp() && !is_perl() && !is_rust())
     {
         return *this;
     }
 
-    if (is_cpp() || is_perl())
+    if (is_cpp() || is_perl() || is_rust())
     {
-        Eol(eol_if_needed);
+        // Perl and Rust place the brace at the end of the function. wxUiEditor
+        // follows CppCoreGuidelines and places the brace on the next line for
+        // C++ code.
+        if (is_cpp())
+        {
+            Eol(eol_if_needed);
+        }
         *this += "{";
         Indent();
         Eol();
@@ -540,7 +544,7 @@ Code& Code::OpenBrace(bool all_languages)
 
 Code& Code::CloseBrace(bool all_languages, bool close_ruby)
 {
-    if (!all_languages && !is_cpp())
+    if (!all_languages && !is_cpp() && !is_perl() && !is_rust())
     {
         return *this;
     }
@@ -550,7 +554,7 @@ Code& Code::CloseBrace(bool all_languages, bool close_ruby)
         pop_back();
     Unindent();
 
-    if (is_cpp() || is_perl())
+    if (is_cpp() || is_perl() || is_rust())
     {
         m_within_braces = false;
         Eol();
@@ -1146,13 +1150,17 @@ Code& Code::CreateClass(bool use_generic, tt_string_view override_name, bool ass
             *this += class_name;
         }
 
-        if (is_ruby())
+        if (is_perl())
+        {
+            *this += "->new";
+        }
+        else if (is_ruby())
         {
             *this += ".new";
         }
-        else if (is_perl())
+        else if (is_rust())
         {
-            *this += "->new";
+            *this += "::new";
         }
     }
 
@@ -1203,7 +1211,7 @@ Code& Code::EndFunction()
         *this += ')';
     }
 
-    if (is_cpp() || is_perl())
+    if (is_cpp() || is_perl() || is_rust())
     {
         *this += ';';
     }
diff --git a/src/generate/code.h b/src/generate/code.h
index e62541bf0..8709edbdb 100644
--- a/src/generate/code.h
+++ b/src/generate/code.h
@@ -462,7 +462,7 @@ class Code : public tt_string
     void ResetIndent() { m_indent = 0; }
 
     // Call Indent() and Eol(eol_if_needed).
-    // In C++ "{" will be added before calling Indent().
+    // In C++, Perl, and Rust "{" will be added before calling Indent().
     Code& OpenBrace(bool all_languages = false);
 
     // In C++, this adds "\\n}" and removes indentation set by OpenBrace().
diff --git a/src/generate/file_codewriter.cpp b/src/generate/file_codewriter.cpp
index 6488effa3..3dac2c8dc 100644
--- a/src/generate/file_codewriter.cpp
+++ b/src/generate/file_codewriter.cpp
@@ -63,9 +63,10 @@ const char* lua_haskell_cmt_line = "-- ************* End of generated code";
 
 // clang-format on
 
-int FileCodeWriter::WriteFile(GenLang language, int flags)
+int FileCodeWriter::WriteFile(GenLang language, int flags, Node* node)
 {
     ASSERT_MSG(m_filename.size(), "Filename must be set before calling WriteFile()");
+    m_node = node;
     bool file_exists = m_filename.file_exists();
     if (!file_exists && (flags & flag_test_only))
         return write_needed;
@@ -110,7 +111,7 @@ int FileCodeWriter::WriteFile(GenLang language, int flags)
     {
         m_buffer += end_lua_haskell_block;
     }
-    else if (language == GEN_LANG_PYTHON || language == GEN_LANG_PERL)
+    else if (language == GEN_LANG_PYTHON)
     {
         m_buffer += end_python_perl_ruby_block;
     }
@@ -125,8 +126,36 @@ int FileCodeWriter::WriteFile(GenLang language, int flags)
         if (!file_exists)
         {
             m_buffer += "\nend";
+            if (m_node)
+            {
+                m_buffer += "  # " + m_node->getNodeName();
+            }
+        }
+    }
+    else if (language == GEN_LANG_PERL)
+    {
+        m_buffer += end_python_perl_ruby_block;
+
+        // If the file has never been written before, then add "1;" line that is required to close
+        // the package. This is written outside of the comment block, so presumably any
+        // user edits will be made above this line or they will remove it and replace it with their
+        // own "1;" line.
+        if (!file_exists)
+        {
+            // TODO: [Randalphwa - 01-09-2025] Ideally, this should be followed with a comment
+            // indicating that it is the end of the form's package. However, that requires knowing
+            // the node we are writing.
+            m_buffer += "\n1;";
+            if (m_node)
+            {
+                m_buffer += "  # " + m_node->getNodeName();
+            }
         }
     }
+    else if (language == GEN_LANG_RUST)
+    {
+        m_buffer += end_cpp_block;
+    }
 
     size_t additional_content = (to_size_t) -1;
     bool old_style_file = false;  // true if this doesn't have a trailing comment block
@@ -158,7 +187,7 @@ int FileCodeWriter::WriteFile(GenLang language, int flags)
         new_file.ReadString(m_buffer);
 
         std::string_view look_for = {};
-        if (language == GEN_LANG_CPLUSPLUS)
+        if (language == GEN_LANG_CPLUSPLUS || language == GEN_LANG_RUST)
             look_for = cpp_rust_end_cmt_line;
         else if (language == GEN_LANG_FORTRAN)
             look_for = fortran_end_cmt_line;
diff --git a/src/generate/file_codewriter.h b/src/generate/file_codewriter.h
index 92741b5d0..6a4558414 100644
--- a/src/generate/file_codewriter.h
+++ b/src/generate/file_codewriter.h
@@ -1,7 +1,7 @@
 //////////////////////////////////////////////////////////////////////////
 // Purpose:   Classs to write code to disk
 // Author:    Ralph Walden
-// Copyright: Copyright (c) 2020-2023 KeyWorks Software (Ralph Walden)
+// Copyright: Copyright (c) 2020-2025 KeyWorks Software (Ralph Walden)
 // License:   Apache License -- see ../../LICENSE
 /////////////////////////////////////////////////////////////////////////////
 
@@ -33,6 +33,8 @@ namespace code
     };
 };  // namespace code
 
+class Node;  // forward declaration
+
 class FileCodeWriter : public WriteCode
 {
 public:
@@ -57,8 +59,9 @@ class FileCodeWriter : public WriteCode
     void Clear() override { m_buffer.clear(); };
     tt_string& GetString() { return m_buffer; };
 
-    // Returns one of code::write_ enums
-    int WriteFile(GenLang language, int flags = code::flag_none);
+    // Returns one of code::write_ enums. Errors are negative values, 0 is current, positive
+    // values indicate success or update needed (if testing).
+    int WriteFile(GenLang language, int flags = code::flag_none, Node* node = nullptr);
 
 protected:
     void doWrite(tt_string_view code) override { m_buffer += code; };
@@ -67,6 +70,7 @@ class FileCodeWriter : public WriteCode
 
 private:
     tt_string m_filename;
+    Node* m_node { nullptr };
 
 #if defined(_DEBUG)
     bool hasWriteFileBeenCalled { false };
diff --git a/src/generate/gen_common.cpp b/src/generate/gen_common.cpp
index 0be3e1955..ae7406e2f 100644
--- a/src/generate/gen_common.cpp
+++ b/src/generate/gen_common.cpp
@@ -1573,7 +1573,7 @@ bool GenerateLanguageForm(Node* form, GenResults& results, std::vector<tt_string
     int flags = flag_no_ui;
     if (pClassList)
         flags |= flag_test_only;
-    auto retval = cpp_cw->WriteFile(language, flags);
+    auto retval = cpp_cw->WriteFile(language, flags, form);
 
     if (auto warning_msgs = codegen.getWarnings(); warning_msgs.size())
     {
diff --git a/src/generate/gen_cpp.cpp b/src/generate/gen_cpp.cpp
index 018dd0b18..8163976d8 100644
--- a/src/generate/gen_cpp.cpp
+++ b/src/generate/gen_cpp.cpp
@@ -229,7 +229,7 @@ static void GenCppForm(GenData& gen_data, Node* form)
         flags |= flag_test_only;
     if (form->as_bool(prop_no_closing_brace))
         flags |= flag_add_closing_brace;
-    auto retval = h_cw->WriteFile(GEN_LANG_CPLUSPLUS, flags);
+    auto retval = h_cw->WriteFile(GEN_LANG_CPLUSPLUS, flags, form);
     if (form->as_bool(prop_no_closing_brace))
         flags = flags & ~flag_add_closing_brace;
 
@@ -267,7 +267,7 @@ static void GenCppForm(GenData& gen_data, Node* form)
     }
 
     path.replace_extension(source_ext);
-    retval = cpp_cw->WriteFile(GEN_LANG_CPLUSPLUS, flags);
+    retval = cpp_cw->WriteFile(GEN_LANG_CPLUSPLUS, flags, form);
 
     if (retval > 0)
     {
@@ -1340,7 +1340,11 @@ void BaseCodeGenerator::GenerateCppClassConstructor()
             m_source->writeLine("// Event handlers");
             GenSrcEventBinding(m_form_node, m_events);
 
-            if (m_events.size())
+            // Only generate potential events if no derived class is being
+            // created. If a derived class is being created, then we don't know
+            // the name of that class's file, and therefore have no idea if the
+            // event has been implemented or not.
+            if (m_events.size() && !m_form_node->as_bool(prop_derived_class))
             {
                 m_source->writeLine();
                 m_source->ResetIndent();
diff --git a/src/generate/gen_events.cpp b/src/generate/gen_events.cpp
index a8f5200c8..42408afe5 100644
--- a/src/generate/gen_events.cpp
+++ b/src/generate/gen_events.cpp
@@ -23,6 +23,9 @@
 
 using namespace code;
 
+extern const char* cpp_rust_end_cmt_line;          // "// ************* End of generated code"
+extern const char* perl_begin_cmt_block;           // "=pod" -- must be written with no indentation
+extern const char* perl_end_cmt_block;             // "=cut" -- must be written with no indentation
 extern const char* python_perl_ruby_end_cmt_line;  // "# ************* End of generated code"
 extern const char* python_triple_quote;            // "\"\"\"";
 extern const char* ruby_begin_cmt_block;           // "=begin";
@@ -51,6 +54,10 @@ void BaseGenerator::GenEvent(Code& code, NodeEvent* event, const std::string& cl
     {
         event_code = EventHandlerDlg::GetCppValue(event->get_value());
     }
+    else if (code.m_language == GEN_LANG_PERL)
+    {
+        event_code = EventHandlerDlg::GetPerlValue(event->get_value());
+    }
     else if (code.m_language == GEN_LANG_PYTHON)
     {
         event_code = EventHandlerDlg::GetPythonValue(event->get_value());
@@ -59,6 +66,14 @@ void BaseGenerator::GenEvent(Code& code, NodeEvent* event, const std::string& cl
     {
         event_code = EventHandlerDlg::GetRubyValue(event->get_value());
     }
+    else if (code.m_language == GEN_LANG_RUST)
+    {
+        event_code = EventHandlerDlg::GetRustValue(event->get_value());
+    }
+
+    // REVIEW: [Randalphwa - 01-09-2025] Support for these is not currently planned, but they are
+    // here in case they do get supported in the future.
+
     else if (code.m_language == GEN_LANG_FORTRAN)
     {
         event_code = EventHandlerDlg::GetFortranValue(event->get_value());
@@ -67,18 +82,10 @@ void BaseGenerator::GenEvent(Code& code, NodeEvent* event, const std::string& cl
     {
         event_code = EventHandlerDlg::GetHaskellValue(event->get_value());
     }
-    else if (code.m_language == GEN_LANG_PERL)
-    {
-        event_code = EventHandlerDlg::GetPerlValue(event->get_value());
-    }
     else if (code.m_language == GEN_LANG_LUA)
     {
         event_code = EventHandlerDlg::GetLuaValue(event->get_value());
     }
-    else if (code.m_language == GEN_LANG_RUST)
-    {
-        event_code = EventHandlerDlg::GetRustValue(event->get_value());
-    }
 
     else
     {
@@ -159,6 +166,12 @@ void BaseGenerator::GenEvent(Code& code, NodeEvent* event, const std::string& cl
             else if (code.is_python())
                 handler.Add(", self.") << event_code;
         }
+        else if (code.is_perl())
+        {
+            // remove "wx" prefix
+            event_name.erase(0, 2);
+            handler.Str(event_name).Str("($self, ").NodeName().Str("->GetId(), $self->can('") << event_code << "'));";
+        }
         else if (code.is_ruby())
         {
             // remove "wx" prefix, make the rest of the name lower case
@@ -203,6 +216,11 @@ void BaseGenerator::GenEvent(Code& code, NodeEvent* event, const std::string& cl
                 handler.Str(event_name).Str("(").NodeName().Str(".get_id, :") << event_code << ')';
             }
         }
+        else if (code.is_rust())
+        {
+            // wxRust1 uses contro.connect and a generated extern "C" function
+            // wxRust2 uses form.base.bind(wx::RustEvent::..., move |event: &wx::EventType| { ... })
+        }
     }
 
     // With lambdas, line breaks have already been added
@@ -254,7 +272,7 @@ void BaseGenerator::GenEvent(Code& code, NodeEvent* event, const std::string& cl
                 code.AddIfPython("id=").NodeName(event->getNode()).Function("GetId()").EndFunction();
             }
         }
-        else if (code.is_ruby())
+        else
         {
             code << handler;
         }
@@ -665,11 +683,10 @@ void BaseCodeGenerator::GenHdrEvents()
 }
 
 // This function simply generates unhandled event handlers in a multi-string comment.
-
 void BaseCodeGenerator::GenCppEventHandlers(EventVector& events)
 {
     ASSERT_MSG(events.size(), "GenCppEventHandlers() shouldn't be called if there are no events");
-    if (events.empty())
+    if (events.empty() || m_form_node->as_bool(prop_use_derived_class))
     {
         return;
     }
@@ -687,7 +704,11 @@ void BaseCodeGenerator::GenCppEventHandlers(EventVector& events)
     std::sort(events.begin(), events.end(), sort_event_handlers);
 
     bool found_user_handlers = false;
+
+    // In Debug mode, always compare to see if the event handler has been implemented
+#if !defined(_DEBUG)
     if (m_panel_type == NOT_PANEL)
+#endif  // _DEBUG
     {
         tt_view_vector org_file;
         auto [path, has_base_file] = Project.GetOutputPath(m_form_node, GEN_LANG_CPLUSPLUS);
@@ -736,20 +757,29 @@ void BaseCodeGenerator::GenCppEventHandlers(EventVector& events)
         {
             auto handler = EventHandlerDlg::GetCppValue(event->get_value());
             // Ignore lambda's
-            if (handler.starts_with("[cpp:lambda]"))
+            if (handler.starts_with("["))
                 continue;
 
             tt_string set_code;
             set_code << "void " << m_form_node->getNodeName() << "::" << handler;
-            if (code_lines.find(set_code) != code_lines.end())
+            for (auto& iter: code_lines)
+            {
+                if (iter.starts_with(set_code))
+                {
+                    // This event handler has already been created by the user
+                    set_code.clear();
+                    break;
+                }
+            }
+            if (set_code.empty())
                 continue;
 
             // At least one event wasn't implemented, so stop looking for more
             is_all_events_implemented = false;
 
-            code.Str(
-                "// Unimplemented Event handler functions\n// Copy any of the following and paste them below the comment block, or "
-                "to your inherited class.");
+            code.Str("// Unimplemented Event handler functions\n// Copy any of the following and paste them below the "
+                     "comment block, or "
+                     "to your inherited class.");
             code.Eol().Str("\n/*").Eol();
             break;
         }
@@ -764,7 +794,8 @@ void BaseCodeGenerator::GenCppEventHandlers(EventVector& events)
         // The user hasn't defined their own event handlers in this module
         is_all_events_implemented = false;
 
-        code.Str("// Unimplemented Event handler functions\n// Copy any of the following and paste them below the comment block, or "
+        code.Str("// Unimplemented Event handler functions\n// Copy any of the following and paste them below the comment "
+                 "block, or "
                  "to your inherited class.");
         code.Eol().Str("\n/*").Eol();
     }
@@ -777,12 +808,22 @@ void BaseCodeGenerator::GenCppEventHandlers(EventVector& events)
         {
             auto handler = EventHandlerDlg::GetCppValue(event->get_value());
             // Ignore lambda's
-            if (handler.empty() || handler.starts_with("[cpp:lambda]"))
+            if (handler.empty() || handler.starts_with("["))
                 continue;
 
+            // The user's declaration will typically include the event parameter, often
             tt_string set_code;
-            set_code << "void " << m_form_node->getNodeName() << "::" << handler;
-            if (code_lines.find(set_code) != code_lines.end())
+            set_code << "void " << m_form_node->getNodeName() << "::" << handler << '(';
+            for (auto& iter: code_lines)
+            {
+                if (iter.starts_with(set_code))
+                {
+                    // This event handler has already been created by the user
+                    set_code.clear();
+                    break;
+                }
+            }
+            if (set_code.empty())
                 continue;
 
             // Add it to our set of handled events in case the user specified
@@ -811,7 +852,7 @@ void BaseCodeGenerator::GenCppEventHandlers(EventVector& events)
             {
                 code.Str("event.Skip();").Eol().Eol();
             }
-            code.CloseBrace();
+            code.CloseBrace().Eol();
         }
     }
 
@@ -822,6 +863,176 @@ void BaseCodeGenerator::GenCppEventHandlers(EventVector& events)
     }
 }
 
+// This function simply generates unhandled event handlers in a multi-string comment.
+
+void BaseCodeGenerator::GenPerlEventHandlers(EventVector& events)
+{
+    ASSERT_MSG(events.size(), "GenPerlEventHandlers() shouldn't be called if there are no events");
+    if (events.empty())
+    {
+        return;
+    }
+
+    // Multiple events can be bound to the same function, so use a set to make sure we only generate each function once.
+    std::unordered_set<std::string> code_lines;
+
+    Code code(m_form_node, GEN_LANG_PERL);
+    auto sort_event_handlers = [](NodeEvent* a, NodeEvent* b)
+    {
+        return (EventHandlerDlg::GetPerlValue(a->get_value()) < EventHandlerDlg::GetPerlValue(b->get_value()));
+    };
+
+    // Sort events by function name
+    std::sort(events.begin(), events.end(), sort_event_handlers);
+
+    bool found_user_handlers = false;
+    if (m_panel_type == NOT_PANEL)
+    {
+        tt_view_vector org_file;
+        auto [path, has_base_file] = Project.GetOutputPath(m_form_node, GEN_LANG_PERL);
+
+        if (has_base_file && path.extension().empty())
+        {
+            path += ".pl";
+        }
+
+        // If the user has defined any event handlers, add them to the code_lines set so we
+        // don't generate them again.
+        if (has_base_file && org_file.ReadFile(path))
+        {
+            size_t line_index;
+            for (line_index = 0; line_index < org_file.size(); ++line_index)
+            {
+                if (org_file[line_index].is_sameprefix(python_perl_ruby_end_cmt_line))
+                {
+                    break;
+                }
+            }
+            for (++line_index; line_index < org_file.size(); ++line_index)
+            {
+                auto handler = org_file[line_index].view_nonspace();
+                if (org_file[line_index].view_nonspace().starts_with("sub "))
+                {
+                    code_lines.emplace(handler);
+                    found_user_handlers = true;
+                }
+            }
+        }
+    }
+
+    bool is_all_events_implemented = true;
+    if (found_user_handlers)
+    {
+        for (auto& event: events)
+        {
+            auto handler = EventHandlerDlg::GetPerlValue(event->get_value());
+            // Ignore lambda's
+            if (handler.starts_with("[perl:lambda]"))
+                continue;
+
+            tt_string set_code;
+            // If the user doesn't use the `event` parameter, they may use '_' instead to indicate
+            // an unused parameter.
+            set_code << "sub " << handler << " {";
+            if (code_lines.find(set_code) != code_lines.end())
+                continue;
+            set_code << "sub " << handler << " {";
+            if (code_lines.find(set_code) != code_lines.end())
+                continue;
+
+            // At least one event wasn't implemented, so stop looking for more
+            is_all_events_implemented = false;
+
+            code.Str("# Unimplemented Event handler functions\n# Copy any listed and paste them below the comment block, or "
+                     "to your inherited class.");
+            break;
+        }
+        if (is_all_events_implemented)
+        {
+            // If the user has defined all the event handlers, then we don't need to output anything else.
+            return;
+        }
+    }
+    else
+    {
+        // The user hasn't defined their own event handlers in this module
+        is_all_events_implemented = false;
+
+        code.Str("# Event handler functions\n# Add these below the comment block, or to your inherited class.");
+    }
+    m_source->writeLine(code);
+
+    code.clear();
+    if (!is_all_events_implemented)
+    {
+        for (auto& event: events)
+        {
+            auto handler = EventHandlerDlg::GetPerlValue(event->get_value());
+            // Ignore lambda's
+            if (handler.empty() || handler.starts_with("[perl:lambda]"))
+                continue;
+
+            tt_string set_code;
+            // If the user doesn't use the `event` parameter, they may use '_' instead to indicate
+            // an unused parameter.
+            set_code << "sub " << handler << " {";
+            if (code_lines.find(set_code) != code_lines.end())
+                continue;
+            if (code_lines.find(set_code) != code_lines.end())
+                continue;
+            code_lines.emplace(set_code);
+
+            code.Str(set_code).Eol();
+#if defined(_DEBUG)
+            auto& dbg_event_name = event->get_name();
+            wxUnusedVar(dbg_event_name);
+#endif  // _DEBUG
+            if (event->get_name() == "CloseButtonClicked")
+            {
+                code.Tab().Str("$self->EndModal(wxID_CLOSE);").Eol().Eol();
+            }
+            else if (event->get_name() == "YesButtonClicked")
+            {
+                code.Tab().Str("$self->EndModal(wxID_YES);").Eol().Eol();
+            }
+            else if (event->get_name() == "NoButtonClicked")
+            {
+                code.Tab().Str("$self->EndModal(wxID_NO);").Eol().Eol();
+            }
+            else
+            {
+                code.Tab().Str("$event->Skip();").Eol().Eol();
+            }
+        }
+    }
+
+    // Write the unimplemented event handlers to the source file without the
+    // comment block to make it easier for the user to cut and paste and/or add
+    // them to an inherited class.
+    if (found_user_handlers && !is_all_events_implemented)
+    {
+        m_header->writeLine("# Unimplemented Event handler functions");
+    }
+    else
+    {
+        m_header->writeLine("# Event handler functions");
+    }
+    m_header->writeLine(code);
+
+    if (!is_all_events_implemented)
+    {
+        m_source->ResetIndent();
+        m_source->writeLine(perl_begin_cmt_block);
+        m_source->Indent();
+        m_source->writeLine(code);
+        m_source->Unindent();
+        m_source->writeLine(perl_end_cmt_block);
+        m_source->Indent();
+    }
+}
+
+// This function simply generates unhandled event handlers in a multi-string comment.
+
 void BaseCodeGenerator::GenPythonEventHandlers(EventVector& events)
 {
     ASSERT_MSG(events.size(), "GenPythonEventHandlers() shouldn't be called if there are no events");
@@ -954,7 +1165,10 @@ void BaseCodeGenerator::GenPythonEventHandlers(EventVector& events)
             code_lines.emplace(set_code);
 
             code.Str(set_code).Eol();
-            auto foo = event->get_name();
+#if defined(_DEBUG)
+            auto& dbg_event_name = event->get_name();
+            wxUnusedVar(dbg_event_name);
+#endif  // _DEBUG
             if (event->get_name() == "CloseButtonClicked")
             {
                 code.Tab().Str("self.EndModal(wx.ID_CLOSE)").Eol().Eol();
@@ -1124,3 +1338,173 @@ void BaseCodeGenerator::GenRubyEventHandlers(EventVector& events)
     }
     m_header->Unindent();
 }
+
+// This function simply generates unhandled event handlers in a multi-string comment.
+
+void BaseCodeGenerator::GenRustEventHandlers(EventVector& events)
+{
+    ASSERT_MSG(events.size(), "GenRustEventHandlers() shouldn't be called if there are no events");
+    if (events.empty())
+    {
+        return;
+    }
+
+    // Multiple events can be bound to the same function, so use a set to make sure we only generate each function once.
+    std::unordered_set<std::string> code_lines;
+
+    Code code(m_form_node, GEN_LANG_RUST);
+    auto sort_event_handlers = [](NodeEvent* a, NodeEvent* b)
+    {
+        return (EventHandlerDlg::GetRustValue(a->get_value()) < EventHandlerDlg::GetRustValue(b->get_value()));
+    };
+
+    // Sort events by function name
+    std::sort(events.begin(), events.end(), sort_event_handlers);
+
+    bool found_user_handlers = false;
+    if (m_panel_type == NOT_PANEL)
+    {
+        tt_view_vector org_file;
+        auto [path, has_base_file] = Project.GetOutputPath(m_form_node, GEN_LANG_PERL);
+
+        if (has_base_file && path.extension().empty())
+        {
+            path += ".rs";
+        }
+
+        // If the user has defined any event handlers, add them to the code_lines set so we
+        // don't generate them again.
+        if (has_base_file && org_file.ReadFile(path))
+        {
+            size_t line_index;
+            for (line_index = 0; line_index < org_file.size(); ++line_index)
+            {
+                if (org_file[line_index].is_sameprefix(cpp_rust_end_cmt_line))
+                {
+                    break;
+                }
+            }
+            for (++line_index; line_index < org_file.size(); ++line_index)
+            {
+                auto handler = org_file[line_index].view_nonspace();
+                if (org_file[line_index].view_nonspace().starts_with("fn "))
+                {
+                    code_lines.emplace(handler);
+                    found_user_handlers = true;
+                }
+            }
+        }
+    }
+
+    bool is_all_events_implemented = true;
+    if (found_user_handlers)
+    {
+        for (auto& event: events)
+        {
+            auto handler = EventHandlerDlg::GetRustValue(event->get_value());
+            // Ignore lambda's
+            if (handler.starts_with("[rust:lambda]"))
+                continue;
+
+            tt_string set_code;
+            // If the user doesn't use the `event` parameter, they may use '_' instead to indicate
+            // an unused parameter.
+            set_code << "fn " << handler << " {";
+            if (code_lines.find(set_code) != code_lines.end())
+                continue;
+            set_code << "fn " << handler << " {";
+            if (code_lines.find(set_code) != code_lines.end())
+                continue;
+
+            // At least one event wasn't implemented, so stop looking for more
+            is_all_events_implemented = false;
+
+            code.Str(
+                "// Unimplemented Event handler functions\n// Copy any listed and paste them below the comment block, or "
+                "to your inherited class.");
+            code.Eol().Str("/*").Eol();
+            break;
+        }
+        if (is_all_events_implemented)
+        {
+            // If the user has defined all the event handlers, then we don't need to output anything else.
+            return;
+        }
+    }
+    else
+    {
+        // The user hasn't defined their own event handlers in this module
+        is_all_events_implemented = false;
+
+        code.Str("// Unimplemented Event handler functions\n// Copy any listed and paste them below the comment block, or "
+                 "to your inherited class.");
+        code.Eol().Str("/*").Eol();
+    }
+    m_source->writeLine(code);
+
+    code.clear();
+    if (!is_all_events_implemented)
+    {
+        for (auto& event: events)
+        {
+            auto handler = EventHandlerDlg::GetRustValue(event->get_value());
+            // Ignore lambda's
+            if (handler.empty() || handler.starts_with("[rust:lambda]"))
+                continue;
+
+            tt_string set_code;
+            // If the user doesn't use the `event` parameter, they may use '_' instead to indicate
+            // an unused parameter.
+            set_code << "fn " << handler << " {";
+            if (code_lines.find(set_code) != code_lines.end())
+                continue;
+            if (code_lines.find(set_code) != code_lines.end())
+                continue;
+            code_lines.emplace(set_code);
+
+            code.Str(set_code).Eol();
+#if defined(_DEBUG)
+            auto& dbg_event_name = event->get_name();
+            wxUnusedVar(dbg_event_name);
+#endif  // _DEBUG
+            code.OpenBrace();
+            if (event->get_name() == "CloseButtonClicked")
+            {
+                code.Tab().Str("self.EndModal(wxID_CLOSE);").Eol().Eol();
+            }
+            else if (event->get_name() == "YesButtonClicked")
+            {
+                code.Tab().Str("self.EndModal(wxID_YES);").Eol().Eol();
+            }
+            else if (event->get_name() == "NoButtonClicked")
+            {
+                code.Tab().Str("self.EndModal(wxID_NO);").Eol().Eol();
+            }
+            else
+            {
+                code.Tab().Str("event.Skip();").Eol().Eol();
+            }
+            code.CloseBrace();
+        }
+    }
+
+    // Write the unimplemented event handlers to the source file without the
+    // comment block to make it easier for the user to cut and paste and/or add
+    // them to an inherited class.
+    if (found_user_handlers && !is_all_events_implemented)
+    {
+        m_header->writeLine("# Unimplemented Event handler functions");
+    }
+    else
+    {
+        m_header->writeLine("# Event handler functions");
+    }
+    m_header->writeLine(code);
+
+    if (!is_all_events_implemented)
+    {
+        code.Eol(eol_if_needed).Str("/*").Eol().Eol();
+        m_source->writeLine(code);
+        m_source->writeLine("*/");
+    }
+}
diff --git a/src/generate/gen_frame.cpp b/src/generate/gen_frame.cpp
index 1c7a7d2c2..10903247c 100644
--- a/src/generate/gen_frame.cpp
+++ b/src/generate/gen_frame.cpp
@@ -131,6 +131,21 @@ bool FrameFormGenerator::ConstructionCode(Code& code)
 
         code.Eol().Eol() += "my $self = $class->SUPER::new($parent, $id, $title, $pos, $size, $style, $name);";
     }
+    else if (code.is_rust())
+    {
+        code.Str("#[derive(Clone)]").Eol().Str("struct ").NodeName();
+        code.OpenBrace();
+        code.Str("base: wx::WeakRef<wx::Frame>").Eol();
+        code.CloseBrace().Eol();
+        code.Str("impl ").NodeName();
+        code.OpenBrace();
+        code.Str("fn new(");
+        code.Str(
+            "parent: &wx::Window, id: i32, title: &str, pos: wx::Point, size: wx::Size, style: i32, name: &str) -> Self");
+        code.OpenBrace();
+        code.Str("let frame = wx::Frame::builder(parent, id, title, pos, size, style, name).build();").Eol();
+        return true;
+    }
     else
     {
         code.AddComment("Unknown language", true);
@@ -302,6 +317,12 @@ bool FrameFormGenerator::AfterChildrenCode(Code& code)
         code.Eol(eol_if_needed).FormFunction("Centre(").AddConstant(center).EndFunction();
     }
 
+    if (code.is_rust())
+    {
+        code.Eol(eol_if_needed).NodeName();
+        code.OpenBrace().Str("base: frame.to_weak_ref()").CloseBrace();
+    }
+
     return true;
 }
 
diff --git a/src/generate/gen_menu.cpp b/src/generate/gen_menu.cpp
index 02a18b85e..b012764b3 100644
--- a/src/generate/gen_menu.cpp
+++ b/src/generate/gen_menu.cpp
@@ -1,7 +1,7 @@
 /////////////////////////////////////////////////////////////////////////////
 // Purpose:   Menu Generator
 // Author:    Ralph Walden
-// Copyright: Copyright (c) 2020-2023 KeyWorks Software (Ralph Walden)
+// Copyright: Copyright (c) 2020-2025 KeyWorks Software (Ralph Walden)
 // License:   Apache License -- see ../../LICENSE
 /////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/generate/gen_menuitem.cpp b/src/generate/gen_menuitem.cpp
index b55eacd76..045793470 100644
--- a/src/generate/gen_menuitem.cpp
+++ b/src/generate/gen_menuitem.cpp
@@ -229,7 +229,12 @@ bool MenuItemGenerator::SettingsCode(Code& code)
         }
         else if (code.is_perl())
         {
-            code.AddComment("wxPerl does not support bundle, currently wxUE does not support non-bundle bitmaps");
+            code.AddComment("# TODO: wxBitmapBundle in wxPerl not currently supported");
+        }
+        else if (code.is_rust())
+        {
+            code.AddComment(
+                "wxRust does not currently support wxBitmapBundle, currently wxUE does not support non-bundle bitmaps");
         }
         else
         {
@@ -448,3 +453,15 @@ bool MenuItemGenerator::modifyProperty(NodeProperty* prop, tt_string_view value)
     }
     return false;
 }
+
+bool MenuItemGenerator::GetImports(Node* /* node */, std::set<std::string>& set_imports, GenLang language)
+{
+    if (language == GEN_LANG_PERL)
+    {
+        // REVIEW: [Randalphwa - 01-09-2025] Currently, wxEVT_UPDATE_UI cannot be imported from the
+        // Wx::Event module.
+        set_imports.emplace("use Wx::Event qw(EVT_MENU);");
+        return true;
+    }
+    return false;
+}
diff --git a/src/generate/gen_menuitem.h b/src/generate/gen_menuitem.h
index c6f626bc8..31d92523a 100644
--- a/src/generate/gen_menuitem.h
+++ b/src/generate/gen_menuitem.h
@@ -1,7 +1,7 @@
 /////////////////////////////////////////////////////////////////////////////
 // Purpose:   Menu Item  Generator
 // Author:    Ralph Walden
-// Copyright: Copyright (c) 2020-2022 KeyWorks Software (Ralph Walden)
+// Copyright: Copyright (c) 2020-2025 KeyWorks Software (Ralph Walden)
 // License:   Apache License -- see ../../LICENSE
 /////////////////////////////////////////////////////////////////////////////
 
@@ -22,4 +22,6 @@ class MenuItemGenerator : public BaseGenerator
     bool modifyProperty(NodeProperty* prop, tt_string_view value) override;
 
     int GenXrcObject(Node*, pugi::xml_node& /* object */, size_t /* xrc_flags */) override;
+
+    bool GetImports(Node*, std::set<std::string>& set_imports, GenLang language) override;
 };
diff --git a/src/generate/gen_perl.cpp b/src/generate/gen_perl.cpp
index 1f04bb482..f5c2b91cc 100644
--- a/src/generate/gen_perl.cpp
+++ b/src/generate/gen_perl.cpp
@@ -82,10 +82,10 @@ bool HasPerlMapConstant(std::string_view value)
     return false;
 }
 
-// This *must* be written on a line by itself with *no* indentation.
+// This *MUST* be written without any indendation
 const char* perl_begin_cmt_block = "=pod";
 
-// This *must* be written on a line by itself with *no* indentation.
+// This *MUST* be written without any indendation
 const char* perl_end_cmt_block = "=cut";
 
 void BaseCodeGenerator::GeneratePerlClass(PANEL_PAGE panel_type)
@@ -349,13 +349,13 @@ void BaseCodeGenerator::GeneratePerlClass(PANEL_PAGE panel_type)
         m_source->writeLine("# Event handlers");
         GenSrcEventBinding(m_form_node, m_events);
 
-        m_source->writeLine("\tend", indent::none);
+        m_source->writeLine("\t# end Event handlers\n", indent::none);
         m_source->SetLastLineBlank();
 
         m_source->ResetIndent();
         m_source->writeLine();
         m_source->Indent();
-        // GenPerlEventHandlers(events);
+        GenPerlEventHandlers(m_events);
     }
     else
     {
@@ -374,7 +374,15 @@ void BaseCodeGenerator::GeneratePerlClass(PANEL_PAGE panel_type)
     m_source->ResetIndent();
     m_source->writeLine("\treturn $self;", indent::none);
     m_source->writeLine("}\n\n", indent::none);
-    m_source->writeLine("1;", indent::none);
+
+    // Only add this when writing to disk. Otherwise, it needs to be added after
+    // the comment block, and only if there is no user code after the comment
+    // block. This is to ensure that the user can add event handlers that are
+    // part of the package.
+    if (panel_type != NOT_PANEL)
+    {
+        m_source->writeLine("1;", indent::none);
+    }
 
     m_header->ResetIndent();
 
diff --git a/src/generate/gen_rust.cpp b/src/generate/gen_rust.cpp
index ee385089b..bc3a3909f 100644
--- a/src/generate/gen_rust.cpp
+++ b/src/generate/gen_rust.cpp
@@ -213,7 +213,6 @@ void BaseCodeGenerator::GenerateRustClass(PANEL_PAGE panel_type)
         m_source->writeLine("// Event handlers");
         GenSrcEventBinding(m_form_node, m_events);
 
-        m_source->writeLine("\tend", indent::none);
         m_source->SetLastLineBlank();
 
         m_source->ResetIndent();
@@ -237,7 +236,9 @@ void BaseCodeGenerator::GenerateRustClass(PANEL_PAGE panel_type)
 
     // Make certain indentation is reset after all construction code is written
     m_source->ResetIndent();
-    m_source->writeLine("}\n\n", indent::none);
+
+    //
+    // m_source->writeLine("}\n\n", indent::none);
 
     m_header->ResetIndent();
 
diff --git a/src/generate/menu_widgets.cpp b/src/generate/menu_widgets.cpp
index 8a9d53b4e..427fcbca7 100644
--- a/src/generate/menu_widgets.cpp
+++ b/src/generate/menu_widgets.cpp
@@ -193,6 +193,10 @@ bool MenuBarGenerator::ConstructionCode(Code& code)
     {
         code.Add(code.node()->as_string(prop_style));
     }
+    else if (code.is_rust())
+    {
+        code.Add("0");
+    }
     code.EndFunction();
 
     return true;
diff --git a/src/wxui/eventhandler_dlg_base.cpp b/src/wxui/eventhandler_dlg_base.cpp
index 2b70f8de7..e24fd6c3f 100644
--- a/src/wxui/eventhandler_dlg_base.cpp
+++ b/src/wxui/eventhandler_dlg_base.cpp
@@ -489,37 +489,37 @@ bool EventHandlerDlgBase::Create(wxWindow* parent, wxWindowID id, const wxString
 
     auto* page_sizer5 = new wxBoxSizer(wxVERTICAL);
 
-    m_php_radio_use_function = new wxRadioButton(m_rust_bookpage, wxID_ANY, "Use function", wxDefaultPosition, wxDefaultSize,
+    m_rust_radio_use_function = new wxRadioButton(m_rust_bookpage, wxID_ANY, "Use function", wxDefaultPosition, wxDefaultSize,
         wxRB_SINGLE);
-    m_php_function_box = new wxStaticBoxSizer(new wxStaticBox(m_rust_bookpage, wxID_ANY, m_php_radio_use_function),
+    m_rust_function_box = new wxStaticBoxSizer(new wxStaticBox(m_rust_bookpage, wxID_ANY, m_rust_radio_use_function),
         wxVERTICAL);
 
     auto* box_sizer13 = new wxBoxSizer(wxHORIZONTAL);
 
-    m_rust_text_function = new wxTextCtrl(m_php_function_box->GetStaticBox(), wxID_ANY, wxEmptyString);
+    m_rust_text_function = new wxTextCtrl(m_rust_function_box->GetStaticBox(), wxID_ANY, wxEmptyString);
     box_sizer13->Add(m_rust_text_function, wxSizerFlags(1).Expand().Border(wxALL));
 
-    auto* btn13 = new wxButton(m_php_function_box->GetStaticBox(), wxID_ANY, "Default");
+    auto* btn13 = new wxButton(m_rust_function_box->GetStaticBox(), wxID_ANY, "Default");
     box_sizer13->Add(btn13, wxSizerFlags().Border(wxALL));
 
-    auto* btn14 = new wxButton(m_php_function_box->GetStaticBox(), wxID_ANY, "None");
+    auto* btn14 = new wxButton(m_rust_function_box->GetStaticBox(), wxID_ANY, "None");
     box_sizer13->Add(btn14, wxSizerFlags().Border(wxALL));
 
-    m_php_function_box->Add(box_sizer13, wxSizerFlags().Expand().Border(wxALL));
+    m_rust_function_box->Add(box_sizer13, wxSizerFlags().Expand().Border(wxALL));
 
-    m_php_radio_use_anon_func = new wxRadioButton(m_php_function_box->GetStaticBox(), wxID_ANY, "Anonymous function",
+    m_rust_radio_use_anon_func = new wxRadioButton(m_rust_function_box->GetStaticBox(), wxID_ANY, "Anonymous function",
         wxDefaultPosition, wxDefaultSize, wxRB_SINGLE);
-    m_php_lambda_box = new wxStaticBoxSizer(new wxStaticBox(m_php_function_box->GetStaticBox(), wxID_ANY,
-        m_php_radio_use_anon_func), wxVERTICAL);
+    m_rust_lambda_box = new wxStaticBoxSizer(new wxStaticBox(m_rust_function_box->GetStaticBox(), wxID_ANY,
+        m_rust_radio_use_anon_func), wxVERTICAL);
 
     auto* box_sizer5 = new wxBoxSizer(wxHORIZONTAL);
 
-    m_php_lambda_box->Add(box_sizer5, wxSizerFlags().Border(wxALL));
+    m_rust_lambda_box->Add(box_sizer5, wxSizerFlags().Border(wxALL));
 
-    auto* staticText5 = new wxStaticText(m_php_lambda_box->GetStaticBox(), wxID_ANY, "Function:");
-    m_php_lambda_box->Add(staticText5, wxSizerFlags().Border(wxALL));
+    auto* staticText5 = new wxStaticText(m_rust_lambda_box->GetStaticBox(), wxID_ANY, "Function:");
+    m_rust_lambda_box->Add(staticText5, wxSizerFlags().Border(wxALL));
 
-    m_rust_stc_lambda = new wxStyledTextCtrl(m_php_lambda_box->GetStaticBox());
+    m_rust_stc_lambda = new wxStyledTextCtrl(m_rust_lambda_box->GetStaticBox());
     {
         m_rust_stc_lambda->SetLexer(wxSTC_LEX_RUST);
         m_rust_stc_lambda->SetEOLMode(wxSTC_EOL_LF);
@@ -542,11 +542,11 @@ bool EventHandlerDlgBase::Create(wxWindow* parent, wxWindowID id, const wxString
         m_rust_stc_lambda->SetBackSpaceUnIndents(true);
     }
     m_rust_stc_lambda->SetMinSize(FromDIP(wxSize(400, -1)));
-    m_php_lambda_box->Add(m_rust_stc_lambda, wxSizerFlags(1).Expand().DoubleBorder(wxALL));
+    m_rust_lambda_box->Add(m_rust_stc_lambda, wxSizerFlags(1).Expand().DoubleBorder(wxALL));
 
-    m_php_function_box->Add(m_php_lambda_box, wxSizerFlags(1).Expand().Border(wxALL));
+    m_rust_function_box->Add(m_rust_lambda_box, wxSizerFlags(1).Expand().Border(wxALL));
 
-    page_sizer5->Add(m_php_function_box, wxSizerFlags().Expand().Border(wxALL));
+    page_sizer5->Add(m_rust_function_box, wxSizerFlags().Expand().Border(wxALL));
     m_rust_bookpage->SetSizerAndFit(page_sizer5);
 
     parent_sizer->Add(box_sizer, wxSizerFlags(1).Expand().Border(wxALL));
@@ -610,12 +610,12 @@ bool EventHandlerDlgBase::Create(wxWindow* parent, wxWindowID id, const wxString
     m_py_radio_use_lambda->Bind(wxEVT_RADIOBUTTON, &EventHandlerDlgBase::OnUsePythonLambda, this);
     m_lua_radio_use_function->Bind(wxEVT_RADIOBUTTON, &EventHandlerDlgBase::OnUseRubyFunction, this);
     m_perl_radio_use_function->Bind(wxEVT_RADIOBUTTON, &EventHandlerDlgBase::OnUseRubyFunction, this);
-    m_php_radio_use_function->Bind(wxEVT_RADIOBUTTON, &EventHandlerDlgBase::OnUseRubyFunction, this);
     m_ruby_radio_use_function->Bind(wxEVT_RADIOBUTTON, &EventHandlerDlgBase::OnUseRubyFunction, this);
     m_lua_radio_use_anon_func->Bind(wxEVT_RADIOBUTTON, &EventHandlerDlgBase::OnUseRubyLambda, this);
     m_ruby_radio_use_lambda->Bind(wxEVT_RADIOBUTTON, &EventHandlerDlgBase::OnUseRubyLambda, this);
     m_haskell_radio_use_lambda->Bind(wxEVT_RADIOBUTTON, &EventHandlerDlgBase::OnUseRubyLambda, this);
-    m_php_radio_use_anon_func->Bind(wxEVT_RADIOBUTTON, &EventHandlerDlgBase::OnUseRustLambda, this);
+    m_rust_radio_use_function->Bind(wxEVT_RADIOBUTTON, &EventHandlerDlgBase::OnUseRustFunction, this);
+    m_rust_radio_use_anon_func->Bind(wxEVT_RADIOBUTTON, &EventHandlerDlgBase::OnUseRustLambda, this);
     m_cpp_text_function->Bind(wxEVT_TEXT, &EventHandlerDlgBase::OnChange, this);
     m_fortran_text_function->Bind(wxEVT_TEXT, &EventHandlerDlgBase::OnChange, this);
     m_haskell_text_function->Bind(wxEVT_TEXT, &EventHandlerDlgBase::OnChange, this);
diff --git a/src/wxui/eventhandler_dlg_base.h b/src/wxui/eventhandler_dlg_base.h
index a1fce4b28..9b65e3485 100644
--- a/src/wxui/eventhandler_dlg_base.h
+++ b/src/wxui/eventhandler_dlg_base.h
@@ -58,6 +58,7 @@ class EventHandlerDlgBase : public wxDialog
     virtual void OnUsePythonLambda(wxCommandEvent& event) { event.Skip(); }
     virtual void OnUseRubyFunction(wxCommandEvent& event) { event.Skip(); }
     virtual void OnUseRubyLambda(wxCommandEvent& event) { event.Skip(); }
+    virtual void OnUseRustFunction(wxCommandEvent& event) { event.Skip(); }
     virtual void OnUseRustLambda(wxCommandEvent& event) { event.Skip(); }
 
     // Class member variables
@@ -93,10 +94,6 @@ class EventHandlerDlgBase : public wxDialog
     wxStaticBoxSizer* m_perl_lambda_box;
     wxRadioButton* m_perl_radio_use_function;
     wxStaticBoxSizer* m_perl_function_box;
-    wxRadioButton* m_php_radio_use_anon_func;
-    wxStaticBoxSizer* m_php_lambda_box;
-    wxRadioButton* m_php_radio_use_function;
-    wxStaticBoxSizer* m_php_function_box;
     wxRadioButton* m_py_radio_use_function;
     wxStaticBoxSizer* m_py_function_box;
     wxRadioButton* m_py_radio_use_lambda;
@@ -105,6 +102,10 @@ class EventHandlerDlgBase : public wxDialog
     wxStaticBoxSizer* m_ruby_function_box;
     wxRadioButton* m_ruby_radio_use_lambda;
     wxStaticBoxSizer* m_ruby_lambda_box;
+    wxRadioButton* m_rust_radio_use_anon_func;
+    wxStaticBoxSizer* m_rust_lambda_box;
+    wxRadioButton* m_rust_radio_use_function;
+    wxStaticBoxSizer* m_rust_function_box;
     wxStaticText* m_static_bind_text;
     wxStyledTextCtrl* m_cpp_stc_lambda;
     wxStyledTextCtrl* m_fortran_stc_lambda;
diff --git a/src/wxui/wxUiEditor.wxui b/src/wxui/wxUiEditor.wxui
index 25629ae4d..96775363e 100644
--- a/src/wxui/wxUiEditor.wxui
+++ b/src/wxui/wxUiEditor.wxui
@@ -4563,9 +4563,9 @@
                     class_access="protected:"
                     label="Use function"
                     radiobtn_var_name="m_rust_radio_use_function"
-                    var_name="m_php_function_box"
+                    var_name="m_rust_function_box"
                     flags="wxEXPAND"
-                    wxEVT_RADIOBUTTON="OnUseRubyFunction">
+                    wxEVT_RADIOBUTTON="OnUseRustFunction">
                     <node
                       class="wxBoxSizer"
                       var_name="box_sizer13"
diff --git a/src/wxui/wxue_data.cpp b/src/wxui/wxue_data.cpp
index c9c718be2..ad9f6a550 100644
--- a/src/wxui/wxue_data.cpp
+++ b/src/wxui/wxue_data.cpp
@@ -1037,9 +1037,9 @@ namespace wxue_data
             218,42,155,143,73,244,70,83,86,133,116,213,60,197,158,163,247,255,245,255,82,192,229,161
         };
 
-    // ../xml/interfaces.xml (52240 bytes)
-    const unsigned char interfaces[10726] {
-            120,218,237,125,107,111,219,200,146,232,253,41,68,128,69,236,29,71,73,38,59,192,221,236,76,0,69,86,108,221,200,
+    // ../xml/interfaces.xml (52219 bytes)
+    const unsigned char interfaces[10722] {
+            120,218,237,125,107,111,219,200,146,232,253,41,68,128,69,236,29,71,73,38,59,192,189,217,153,0,138,172,216,218,200,
             178,33,201,78,230,96,1,130,34,91,18,215,20,169,195,71,100,31,236,253,239,183,94,221,108,74,20,37,249,145,205,156,
             155,47,137,44,245,163,186,186,186,222,93,253,251,153,138,85,234,229,73,122,170,166,97,28,230,97,18,103,31,126,159,
             169,216,241,35,47,203,254,120,241,37,140,131,100,229,116,191,169,56,207,94,56,249,253,82,253,241,34,140,115,149,
@@ -1144,7 +1144,7 @@ namespace wxue_data
             51,161,127,6,20,112,123,149,196,75,72,41,165,209,180,234,203,92,77,96,165,212,87,141,3,237,52,42,213,184,150,211,
             37,1,193,3,132,108,68,44,64,140,57,127,144,126,8,159,24,85,24,9,45,40,255,21,153,24,106,175,36,169,144,137,44,192,
             152,12,151,120,126,97,12,47,198,164,81,74,157,37,167,25,105,142,165,39,198,232,135,200,114,45,48,94,124,120,211,
-            32,5,226,196,197,236,91,180,37,38,169,197,109,235,17,134,138,170,52,119,168,185,115,244,127,255,227,184,38,37,118,
+            32,5,226,196,197,236,91,180,37,38,169,197,109,235,17,134,138,170,52,119,168,185,115,244,127,255,253,184,38,37,118,
             147,74,108,98,101,243,73,178,180,241,252,3,157,169,187,92,137,75,92,75,16,125,173,65,152,81,149,248,137,86,39,112,
             132,111,215,87,88,203,104,235,217,202,30,252,22,118,198,21,11,195,173,216,49,54,134,58,136,30,222,64,177,0,43,74,
             7,203,131,138,157,66,65,3,180,28,13,41,234,236,93,19,99,32,17,198,129,108,73,146,197,48,6,102,238,86,49,129,40,
@@ -1170,37 +1170,37 @@ namespace wxue_data
             4,140,188,213,28,22,88,241,167,109,51,137,193,196,3,77,154,18,239,203,78,134,138,138,140,25,168,201,152,208,106,
             180,142,159,179,104,32,95,42,106,220,168,17,236,52,208,48,242,150,230,169,119,144,108,158,114,151,167,225,67,50,
             127,3,39,210,211,61,154,25,201,64,79,192,143,244,72,7,177,164,26,228,159,123,217,173,130,237,253,159,66,190,204,
-            255,255,39,242,251,133,119,8,226,163,194,123,26,164,227,188,250,195,255,233,141,27,144,143,83,62,26,241,48,200,
-            19,32,29,71,121,44,194,175,84,122,16,169,195,231,232,137,44,0,24,169,73,255,199,137,30,175,253,227,242,30,143,105,
-            26,230,177,168,30,98,228,228,32,189,18,44,225,39,210,43,179,188,81,173,132,137,158,64,173,132,229,61,133,90,153,
-            229,143,68,117,231,151,95,246,64,175,9,139,186,160,76,100,155,153,231,213,148,140,74,186,66,158,38,17,178,11,51,
-            34,105,159,162,57,102,148,168,160,67,174,50,182,131,25,77,146,18,71,58,75,92,160,155,192,74,212,164,37,111,186,
-            142,81,183,161,176,39,76,107,156,32,218,157,89,205,198,123,215,122,219,122,179,145,163,247,174,245,107,237,183,
-            239,232,91,250,181,193,41,74,254,178,0,86,133,137,22,247,26,67,75,47,159,219,132,184,150,13,192,187,148,20,249,
-            18,116,31,211,153,244,85,79,135,23,76,250,4,225,211,195,164,116,242,127,120,37,85,31,153,226,0,14,78,200,89,173,
-            18,8,218,68,84,40,136,181,230,235,147,11,116,18,121,241,45,103,168,74,6,29,153,181,140,245,12,39,50,93,28,41,100,
-            160,227,152,219,244,120,237,109,57,0,49,85,159,205,38,110,26,96,93,60,14,88,201,44,81,119,91,242,88,171,70,21,109,
-            9,69,31,50,201,37,193,35,88,141,195,160,175,84,146,160,56,4,186,78,137,45,127,185,121,217,161,229,251,53,223,221,
-            221,193,151,216,190,129,8,37,200,251,196,43,176,3,139,155,43,152,111,194,58,175,251,174,110,161,115,94,212,188,
-            41,221,96,185,4,115,55,6,155,87,197,51,164,25,94,87,97,39,189,154,85,121,206,172,0,99,7,219,19,83,92,11,251,208,
-            247,60,78,203,185,72,128,125,226,55,229,25,89,165,30,22,164,192,18,57,58,160,127,239,4,137,92,78,240,41,233,11,
-            79,142,12,241,226,195,219,183,77,44,129,3,205,75,127,190,119,148,194,147,216,242,182,60,32,71,119,48,32,139,145,
-            74,167,250,239,69,146,111,201,165,179,50,156,182,138,174,142,136,171,50,127,182,146,204,132,142,91,155,150,45,225,
-            69,64,100,98,225,163,128,218,185,10,145,103,218,196,182,41,236,68,199,162,224,19,229,137,192,255,42,247,235,111,
-            108,208,129,126,214,44,40,92,118,73,70,213,195,124,120,250,201,0,19,27,200,48,198,208,101,204,5,140,54,50,95,48,
-            214,210,2,5,8,163,177,176,15,49,93,11,229,164,136,37,85,0,34,59,222,3,210,44,38,36,23,34,204,150,161,123,39,136,
-            112,216,129,247,239,129,146,223,191,207,138,9,25,248,141,97,111,180,199,119,25,247,101,162,140,87,228,201,43,43,
-            197,186,69,253,133,40,129,117,80,9,34,228,26,116,226,108,103,207,142,136,50,141,115,80,60,207,154,25,139,65,81,
-            154,86,181,210,83,9,182,149,199,117,128,140,248,176,186,43,66,82,248,120,153,59,193,255,230,165,205,222,42,19,143,
-            209,234,40,102,99,9,68,22,42,229,140,16,232,34,246,73,180,19,117,34,138,237,136,164,120,159,16,88,229,154,175,9,
-            236,70,247,201,215,97,103,79,143,212,78,241,93,226,209,102,32,119,146,236,200,244,252,124,130,27,136,126,130,34,
-            2,206,170,75,151,102,118,145,115,151,82,200,216,93,246,41,140,248,38,181,228,35,48,153,160,215,15,99,108,138,26,
-            217,234,23,57,255,184,24,17,222,206,105,140,148,11,96,129,219,236,214,11,179,146,182,109,135,25,149,147,67,15,35,
-            77,136,128,208,133,114,201,99,46,19,15,77,8,75,244,227,53,108,148,218,55,133,105,183,121,251,60,48,112,14,216,104,
-            11,29,28,253,160,203,87,20,109,54,40,163,197,68,137,135,103,191,245,122,135,47,143,189,150,123,217,35,220,180,217,
-            28,169,234,58,250,130,132,182,50,128,133,24,63,169,228,17,1,78,211,34,174,73,23,217,208,121,254,77,44,133,127,219,
-            97,19,72,188,135,117,88,216,139,8,132,76,29,98,69,221,199,159,153,47,88,185,147,88,149,46,175,82,133,190,77,105,
-            133,205,26,162,77,63,172,242,244,239,123,160,78,75,248,199,42,47,204,50,45,233,109,105,47,149,212,23,10,98,88,118,
+            255,255,39,242,251,133,119,8,226,163,194,123,26,164,227,188,250,195,127,244,198,13,200,199,41,31,141,120,24,228,
+            9,144,142,163,60,22,225,87,42,61,136,212,225,115,244,68,22,0,140,212,164,255,227,68,143,215,254,113,121,143,199,
+            52,13,243,88,84,15,49,114,114,144,94,9,150,240,19,233,149,89,222,168,86,194,68,79,160,86,194,242,158,66,173,204,
+            242,71,162,186,243,203,47,123,160,215,132,69,93,80,38,178,205,204,243,106,74,70,37,93,33,79,147,8,217,133,25,145,
+            180,79,209,28,51,74,84,208,33,87,25,219,193,140,38,73,137,35,157,37,46,208,77,96,37,106,210,146,55,93,199,168,219,
+            80,216,19,166,53,78,16,237,206,172,102,227,189,107,189,109,189,217,200,209,123,215,250,181,246,219,119,244,45,253,
+            218,224,20,37,127,89,0,171,194,68,139,123,141,161,165,151,207,109,66,92,203,6,224,93,74,138,124,9,186,143,233,76,
+            250,170,167,195,11,38,125,130,240,233,97,82,58,249,63,188,146,170,143,76,113,0,7,39,228,172,86,9,4,109,34,42,20,
+            196,90,243,245,201,5,58,137,188,248,150,51,84,37,131,142,204,90,198,122,134,19,153,46,142,20,50,208,113,204,109,
+            122,188,246,182,28,128,152,170,207,102,19,55,13,176,46,30,7,172,100,150,168,187,45,121,172,85,163,138,182,132,162,
+            15,153,228,146,224,17,172,198,97,208,87,42,73,80,28,2,93,167,196,150,191,220,188,236,208,242,253,154,239,238,238,
+            224,75,108,223,64,132,18,228,125,226,21,216,129,197,205,21,204,55,97,157,215,125,87,183,208,57,47,106,222,148,110,
+            176,92,130,185,27,131,205,171,226,25,210,12,175,171,176,147,94,205,170,60,103,86,128,177,131,237,137,41,174,133,
+            125,232,123,30,167,229,92,36,192,62,241,155,242,140,172,82,15,11,82,96,137,28,29,208,191,119,130,68,46,39,248,148,
+            244,133,39,71,134,120,241,225,237,219,38,150,192,129,230,165,63,223,59,74,225,73,108,121,91,30,144,163,59,24,144,
+            197,72,165,83,253,247,34,201,183,228,210,89,25,78,91,69,87,71,196,85,153,63,91,73,102,66,199,173,77,203,150,240,
+            34,32,50,177,240,81,64,237,92,133,200,51,109,98,219,20,118,162,99,81,240,137,242,68,224,127,149,251,245,55,54,232,
+            64,63,107,22,20,46,187,36,163,234,97,62,60,253,100,128,137,13,100,24,99,232,50,230,2,70,27,153,47,24,107,105,129,
+            2,132,209,88,216,135,152,174,133,114,82,196,146,42,0,145,29,239,1,105,22,19,146,11,17,102,203,208,189,19,68,56,
+            236,192,251,247,64,201,239,223,103,197,132,12,252,198,176,55,218,227,187,140,251,50,81,198,43,242,228,149,149,98,
+            221,162,254,66,148,192,58,168,4,17,114,13,58,113,182,179,103,71,68,153,198,57,40,158,103,205,140,197,160,40,77,
+            171,90,233,169,4,219,202,227,58,64,70,124,88,221,21,33,41,124,188,204,157,224,127,243,210,102,111,149,137,199,104,
+            117,20,179,177,4,34,11,149,114,70,8,116,17,251,36,218,137,58,17,197,118,68,82,188,79,8,172,114,205,215,4,118,163,
+            251,228,235,176,179,167,71,106,167,248,46,241,104,51,144,59,73,118,100,122,126,62,193,13,68,63,65,17,1,103,213,
+            165,75,51,187,200,185,75,41,100,236,46,251,20,70,124,147,90,242,17,152,76,208,235,135,49,54,69,141,108,245,139,
+            156,127,92,140,8,111,231,52,70,202,5,176,192,109,118,235,133,89,73,219,182,195,140,202,201,161,135,145,38,68,64,
+            232,66,185,228,49,151,137,135,38,132,37,250,241,26,54,74,237,155,194,180,219,188,125,30,24,56,7,108,180,133,14,
+            142,126,208,229,43,138,54,27,148,209,98,162,196,195,179,223,122,189,195,151,199,94,203,189,236,17,110,218,108,142,
+            84,117,29,125,65,66,91,25,192,66,140,159,84,242,136,0,167,105,17,215,164,139,108,232,60,255,38,150,194,191,237,
+            176,9,36,222,195,58,44,236,69,4,66,166,14,177,162,238,227,207,204,23,172,220,73,172,74,151,87,169,66,223,166,180,
+            194,102,13,209,166,31,86,121,250,63,123,160,78,75,248,199,42,47,204,50,45,233,109,105,47,149,212,23,10,98,88,118,
             180,100,212,174,217,228,77,1,177,189,8,24,27,62,154,124,41,96,113,48,241,130,233,91,99,230,190,5,82,126,11,223,
             210,255,13,251,66,129,153,231,34,104,19,40,219,26,18,250,97,137,249,127,55,17,179,220,58,198,168,100,2,98,121,185,
             51,31,29,128,128,205,77,58,64,188,43,208,40,40,213,70,131,166,175,48,107,135,71,237,150,191,217,181,133,255,51,
@@ -1209,178 +1209,178 @@ namespace wxue_data
             26,149,182,143,166,81,29,126,123,54,26,157,11,160,207,69,163,50,254,86,26,213,243,255,53,105,84,67,255,195,208,
             104,191,240,246,162,79,104,247,104,218,196,40,225,193,116,201,221,180,27,222,250,171,201,199,6,192,62,23,125,234,
             168,97,237,37,18,152,247,199,117,75,190,217,133,178,31,134,40,49,182,185,159,201,135,81,206,71,27,124,24,157,60,
-            152,46,223,180,254,253,237,214,104,209,46,2,165,232,236,179,89,128,58,218,90,107,255,225,204,127,77,222,73,160,
-            255,48,52,138,65,225,61,173,58,188,64,244,104,171,14,144,123,48,141,190,3,171,238,183,183,68,143,248,161,81,253,
-            7,32,159,207,130,147,152,116,189,5,151,229,127,81,130,36,208,127,16,130,252,196,187,130,62,246,75,201,238,219,47,
-            245,10,187,185,187,227,212,102,80,50,215,180,239,53,227,116,12,132,127,207,32,246,37,69,169,167,83,248,219,20,243,
-            88,100,165,217,138,94,79,130,169,222,62,33,104,247,138,31,239,4,120,87,72,249,41,32,53,209,153,122,223,255,78,24,
-            227,3,34,67,79,1,111,115,184,101,39,184,251,197,98,158,16,210,198,200,202,78,112,243,67,66,47,135,1,189,237,124,
-            138,182,241,128,35,186,159,202,176,215,154,133,214,133,145,87,88,181,149,57,195,144,18,219,126,186,197,179,115,
-            250,33,203,223,211,107,254,164,8,176,92,233,79,134,2,242,207,62,0,1,251,249,88,159,114,249,67,227,120,125,162,197,
-            99,4,232,1,43,223,25,107,124,186,69,115,52,237,240,21,111,225,81,251,4,250,246,2,94,143,100,56,236,163,183,4,107,
-            115,1,132,88,38,106,143,157,240,162,112,22,47,172,242,143,147,48,167,235,38,27,198,122,187,223,59,27,184,118,81,
-            217,118,164,139,158,80,105,107,157,194,75,69,247,167,242,24,17,74,56,188,193,157,231,114,85,44,215,21,173,8,206,
-            19,199,11,176,114,162,85,112,99,146,164,184,143,33,165,150,180,106,74,195,50,32,86,117,217,122,56,172,162,60,207,
-            8,70,165,74,110,61,32,92,210,251,249,65,169,150,204,173,135,133,139,229,126,7,96,58,244,222,77,51,48,62,86,200,
-            77,191,27,48,238,249,229,176,247,183,203,193,184,221,111,134,107,158,164,225,63,48,220,29,125,119,16,111,186,195,
-            113,175,179,11,64,96,44,57,86,30,122,22,240,26,114,94,169,109,182,7,167,48,240,119,99,82,193,144,23,235,222,205,
-            133,170,165,131,97,36,220,107,87,121,106,171,23,159,182,173,221,44,182,97,117,66,94,177,181,75,245,92,89,189,228,
-            48,153,142,180,242,157,248,171,212,89,44,234,138,121,202,158,96,59,121,189,14,100,64,228,205,202,114,29,252,94,
-            96,110,231,174,161,140,145,142,216,182,90,104,210,20,165,250,173,44,11,5,244,195,165,136,231,128,49,231,244,170,
-            167,11,71,82,214,231,111,13,235,160,174,110,205,106,182,167,147,85,22,181,7,12,89,203,105,71,43,248,95,183,1,52,
-            80,87,88,248,111,39,206,219,55,152,209,247,246,183,29,249,56,136,136,221,228,202,15,118,84,170,227,226,89,211,64,
-            170,187,165,23,139,119,102,26,202,147,109,114,212,168,236,151,50,69,137,176,95,221,17,31,157,183,175,186,123,204,
-            224,97,9,64,174,129,101,42,197,112,101,105,42,175,189,192,231,64,37,7,7,111,245,121,232,161,201,29,50,21,235,166,
-            253,212,251,218,61,117,47,122,3,126,39,212,174,150,27,225,251,140,88,226,51,21,23,10,166,2,159,169,188,45,252,225,
-            163,202,114,252,153,234,137,34,197,45,208,255,178,210,101,175,200,147,37,53,119,201,141,197,245,124,113,85,89,121,
-            149,154,175,136,154,225,249,158,181,12,90,86,51,165,163,238,221,131,22,87,45,248,194,223,73,5,3,170,174,44,15,180,
-            49,242,184,60,21,215,253,65,100,76,84,38,163,79,48,13,21,171,240,232,154,55,148,96,79,213,86,248,249,61,143,202,
-            146,115,189,15,27,116,76,248,40,185,37,50,79,248,34,213,151,13,248,70,2,165,76,87,49,91,135,250,97,119,212,29,222,
-            116,221,209,85,187,211,117,187,55,221,129,219,251,228,158,247,78,79,187,131,237,59,193,245,64,113,253,88,3,86,136,
-            12,57,245,60,12,2,152,124,37,21,173,225,27,46,173,78,8,23,180,17,135,72,140,206,73,122,98,89,103,90,251,197,178,
-            98,58,13,253,16,125,78,60,188,32,220,247,108,169,32,72,193,170,50,120,242,168,162,55,130,38,229,100,155,106,97,
-            7,247,128,3,41,139,135,101,195,105,131,230,120,37,85,238,135,100,230,109,195,84,1,158,117,66,89,229,105,210,29,
-            130,8,255,76,82,187,26,157,205,71,207,97,82,58,70,132,2,125,43,133,200,48,203,83,149,83,153,93,167,28,67,159,94,
-            70,169,129,210,78,81,36,233,137,41,186,196,114,223,216,47,86,202,144,244,198,98,115,30,70,178,178,244,113,13,236,
-            16,128,213,88,103,246,209,156,53,155,68,197,34,174,25,167,67,63,28,50,20,192,3,20,80,55,22,93,179,166,107,56,120,
-            182,177,93,89,240,142,207,9,244,219,157,11,25,237,53,60,175,104,175,25,182,152,58,65,184,224,43,13,123,152,59,187,
-            139,56,235,83,121,82,170,77,146,40,106,56,22,178,155,10,7,68,191,104,224,44,11,122,244,20,165,153,166,64,57,98,
-            214,171,185,228,234,151,199,50,215,248,40,16,235,7,231,205,137,243,18,248,240,69,24,35,80,47,121,106,160,176,34,
-            141,245,59,65,27,29,189,172,124,77,8,245,189,202,124,73,77,7,84,29,176,196,237,9,240,246,165,188,158,150,196,186,
-            4,53,22,175,159,205,26,205,203,144,138,127,238,127,99,239,167,149,249,211,202,252,105,101,254,180,50,127,90,153,
-            63,173,204,159,86,230,79,43,243,167,149,249,211,202,252,241,172,204,13,93,119,26,169,187,25,44,148,196,218,132,
-            222,112,166,123,79,252,139,139,63,17,103,74,247,80,129,191,205,202,7,215,138,53,107,200,72,90,104,227,28,161,113,
-            26,222,169,40,59,174,60,71,231,171,200,178,74,201,32,109,54,240,230,13,51,90,202,199,182,57,15,158,111,6,150,34,
-            74,45,180,252,236,121,151,94,152,114,5,51,109,170,46,22,30,8,22,190,238,42,117,245,141,37,200,79,224,40,124,199,
-            11,143,5,110,28,85,57,133,249,147,19,71,191,157,96,155,239,152,248,195,140,141,139,145,243,5,217,227,245,186,126,
-            8,94,44,130,46,37,138,84,119,121,234,105,38,251,205,11,35,79,168,203,90,241,235,173,203,68,187,248,33,203,76,145,
-            15,252,224,107,68,242,198,163,38,209,217,173,249,109,192,163,160,229,25,156,3,226,45,116,201,91,184,26,242,104,
-            48,74,233,132,134,49,93,194,54,131,81,237,175,34,214,63,31,189,148,249,238,95,30,107,130,35,206,179,41,69,215,53,
-            215,33,50,42,44,66,167,71,160,233,131,58,102,185,169,151,119,196,245,176,95,127,80,208,206,205,179,120,0,30,59,
-            70,60,126,69,104,203,56,88,155,183,124,78,177,162,39,81,21,54,30,181,177,238,118,236,154,205,192,221,117,23,86,
-            57,154,141,130,44,165,203,34,148,178,33,186,243,230,30,48,104,82,102,70,23,251,231,186,127,47,55,247,255,229,49,
-            101,1,162,247,34,147,55,138,2,229,135,72,146,115,41,53,205,19,235,87,185,152,204,45,199,218,209,203,24,203,141,
-            202,200,176,211,37,40,8,27,233,109,182,242,83,82,171,60,142,176,169,121,244,187,95,221,179,225,229,151,139,203,
-            211,174,59,184,28,24,245,131,169,49,72,20,201,19,27,22,27,134,18,130,90,189,166,50,250,232,170,219,233,125,234,
-            149,250,21,79,49,79,226,4,68,170,230,9,154,20,94,19,109,160,238,76,50,189,29,4,103,210,2,104,142,104,198,250,10,
-            104,24,116,7,137,236,251,152,98,71,7,195,17,177,69,175,46,113,157,2,251,217,175,204,118,158,225,27,247,56,227,14,
-            114,107,94,162,101,80,241,226,244,249,20,23,167,202,184,154,239,218,156,141,136,61,65,117,74,123,173,248,233,79,
-            131,43,24,0,179,51,165,127,253,166,108,221,134,70,185,61,198,167,90,111,176,106,146,151,39,123,9,103,221,214,213,
-            89,99,219,235,57,112,225,142,181,106,198,229,83,90,165,26,231,152,81,107,56,108,57,35,252,235,185,56,89,253,169,
-            62,133,159,233,7,109,127,175,205,188,121,44,70,21,144,249,47,253,242,75,13,13,128,226,63,160,76,59,201,90,145,167,
-            58,172,10,146,88,182,137,94,59,15,125,131,84,2,105,115,60,56,253,105,190,99,168,30,236,195,76,165,187,134,178,52,
-            150,199,13,4,130,114,246,116,35,57,79,55,92,17,139,97,247,132,88,51,99,62,25,250,204,136,207,176,240,39,70,40,23,
-            72,217,49,214,167,40,161,90,71,244,144,230,174,17,167,216,248,113,3,234,3,217,164,57,171,220,157,22,177,191,253,
-            125,165,79,242,171,73,102,197,87,101,55,158,155,210,60,161,182,38,208,225,115,100,135,206,1,242,233,6,219,214,143,
-            79,175,14,78,238,235,182,147,44,248,45,136,148,178,46,225,218,29,10,130,201,243,125,181,180,94,73,52,92,181,245,
-            159,241,127,198,250,193,6,41,157,177,240,238,8,58,54,70,179,100,219,171,211,186,221,115,174,66,222,209,220,127,
-            21,102,17,130,226,93,139,192,98,76,225,90,80,108,115,9,245,176,178,87,175,12,209,161,162,183,160,39,28,103,228,
-            16,50,183,23,244,15,98,228,36,252,34,164,54,199,121,89,45,231,213,91,126,181,217,94,184,1,207,88,245,160,223,189,
-            122,219,248,228,176,22,152,89,126,95,202,103,237,111,179,165,37,168,144,0,33,74,61,106,42,181,30,81,41,40,247,138,
-            190,90,23,106,117,58,102,175,143,30,115,91,185,28,36,214,12,57,121,39,232,209,172,122,231,24,117,111,143,58,189,
-            94,217,63,126,69,95,160,214,157,122,62,61,230,72,182,3,141,138,174,202,34,111,26,172,127,117,222,182,7,243,162,
-            229,220,123,204,96,131,235,139,238,176,215,217,24,147,222,190,195,55,57,30,52,244,105,239,172,55,30,217,131,238,
-            51,158,115,77,143,150,100,68,108,71,199,20,106,7,181,13,95,50,34,47,8,122,123,27,38,173,89,202,30,179,114,53,106,
-            113,9,106,170,94,226,161,192,170,100,97,92,100,175,151,81,1,26,61,136,45,182,249,16,150,151,234,37,210,209,203,
-            238,203,114,236,6,208,122,131,78,255,26,116,216,126,111,52,182,142,162,99,21,70,67,82,230,211,103,200,157,87,156,
-            105,15,61,189,187,26,198,75,126,217,61,97,221,25,187,81,29,53,160,67,113,220,210,171,65,152,177,160,214,73,255,
-            253,251,145,202,123,82,62,173,1,220,238,215,173,224,170,187,167,7,151,188,127,219,1,238,222,237,4,88,227,183,115,
-            222,30,62,28,201,244,212,23,67,108,54,21,97,15,75,216,157,35,180,164,203,95,129,62,249,123,121,101,249,248,217,
-            246,226,7,92,218,35,246,13,206,170,123,211,238,187,227,243,203,235,81,123,112,58,114,71,221,171,246,176,61,190,
-            28,238,150,182,45,231,11,87,136,197,32,21,177,121,122,152,132,74,211,23,252,246,13,157,114,116,127,83,160,178,124,
-            210,0,253,194,25,28,226,172,20,92,90,170,9,218,116,75,34,95,88,118,122,239,28,9,69,251,69,74,46,100,170,36,168,
-            74,201,86,59,168,65,228,113,211,250,255,214,29,94,130,136,112,63,246,219,131,207,143,212,51,0,45,108,126,26,180,
-            120,165,254,134,254,69,189,219,150,193,106,140,88,212,78,82,47,206,34,79,34,187,120,214,233,141,44,214,129,164,
-            168,139,124,87,81,11,117,154,213,230,16,213,233,155,240,48,184,116,199,195,118,175,223,27,156,17,78,186,163,253,
-            53,150,94,245,149,120,128,33,140,16,98,156,83,89,209,34,39,85,139,4,47,7,146,195,213,134,60,71,167,1,5,127,136,
-            164,53,41,96,182,142,93,99,16,163,103,24,5,149,129,203,119,9,81,245,1,208,50,169,6,93,106,56,116,35,165,90,102,
-            181,162,229,149,79,111,136,147,87,28,31,165,230,209,232,236,248,152,36,145,130,77,249,177,253,29,187,77,156,203,
-            101,245,33,48,221,250,153,172,157,166,233,118,27,62,27,187,32,135,244,47,191,11,63,168,161,185,89,202,124,158,132,
-            190,250,233,228,219,199,201,103,153,126,154,76,77,203,127,102,239,196,6,209,8,154,126,108,162,249,62,168,192,210,
-            200,63,153,213,119,66,54,40,198,201,178,175,190,169,232,11,37,30,212,161,155,179,201,77,182,208,205,216,109,119,
-            198,189,155,246,184,251,162,28,166,13,160,224,155,137,221,111,170,60,211,237,216,241,228,123,121,7,150,242,182,
-            98,157,202,162,243,44,80,115,196,88,146,188,206,69,137,27,164,212,73,103,122,170,61,80,230,79,90,203,38,88,157,
-            254,229,168,235,126,233,13,78,47,191,88,160,117,176,130,65,5,174,250,238,189,206,229,128,18,133,76,207,30,104,96,
-            225,63,170,125,249,14,172,137,0,154,140,145,187,139,209,151,19,244,220,140,63,59,24,27,207,182,0,121,209,254,218,
-            187,168,78,115,129,174,167,245,121,58,172,205,71,242,36,154,65,31,197,78,43,111,40,84,166,102,13,252,114,244,245,
-            117,39,241,19,175,25,148,203,155,10,24,160,125,86,64,56,43,47,102,87,182,139,94,104,251,182,117,27,96,88,208,147,
-            247,29,56,148,100,66,182,199,105,100,173,135,74,46,140,60,3,71,19,177,233,228,27,220,172,97,131,20,113,192,6,45,
-            187,97,213,238,104,220,30,142,15,88,187,129,144,210,34,56,228,9,93,144,46,57,209,253,57,129,237,98,118,222,67,64,
-            77,150,6,159,12,40,63,70,250,60,160,142,206,43,167,110,52,79,86,21,48,71,230,220,91,25,86,33,25,64,43,186,12,192,
-            73,94,45,103,144,228,168,64,153,107,23,134,244,49,38,11,28,16,111,0,216,139,93,99,29,33,31,218,192,57,34,143,60,
-            126,60,166,144,176,2,132,176,211,157,171,34,192,122,182,44,165,119,218,175,176,129,32,218,137,241,236,62,195,12,
-            58,157,123,23,6,219,57,238,118,78,187,254,214,79,121,77,62,168,175,219,164,177,8,120,203,241,91,237,123,176,222,
-            20,178,10,74,128,137,72,193,240,213,93,75,191,117,19,6,229,187,44,81,50,1,163,67,188,249,96,36,78,195,59,45,16,
-            51,21,77,169,174,123,239,212,109,15,254,108,116,134,131,184,137,183,188,250,1,170,113,146,81,69,165,242,213,119,
-            233,160,197,149,172,72,210,96,245,83,32,71,152,79,71,175,158,51,242,110,184,211,241,134,91,60,166,156,194,106,134,
-            33,157,208,205,120,48,230,30,26,65,53,193,124,188,95,127,251,23,253,8,32,63,251,195,163,109,170,173,72,88,213,174,
-            239,222,237,217,53,242,210,153,90,235,11,211,210,215,27,93,249,83,3,182,119,95,26,50,73,213,118,134,70,21,217,45,
-            167,141,85,32,146,44,164,183,50,89,123,32,170,176,222,108,84,244,222,194,2,104,202,231,33,116,2,43,25,166,120,84,
-            57,185,52,214,73,157,242,42,242,150,48,214,222,80,75,84,134,28,224,156,114,179,9,127,93,144,41,201,202,145,201,
-            35,179,229,193,93,90,53,219,214,75,44,113,164,175,102,36,49,40,91,5,150,255,88,75,10,5,108,97,220,40,92,243,234,
-            24,181,171,244,231,152,20,223,160,196,29,162,166,86,219,219,142,138,10,188,58,125,248,187,193,234,180,205,182,115,
-            66,178,115,148,73,138,54,54,64,14,3,155,69,89,57,237,56,248,20,230,199,176,103,247,21,202,201,100,186,218,119,74,
-            24,208,250,200,89,77,162,219,240,20,195,55,221,79,237,235,254,216,206,26,21,182,193,101,170,136,118,57,7,140,22,
-            123,11,63,34,201,76,76,42,23,202,156,147,134,59,41,50,209,168,119,113,213,55,209,181,83,73,205,7,246,69,245,78,
-            100,56,47,77,10,9,187,104,172,195,14,82,79,151,199,209,177,213,36,226,183,83,100,151,180,31,180,9,128,235,193,231,
-            50,97,218,2,32,43,226,91,165,65,160,9,169,229,163,39,28,182,123,163,50,147,204,154,48,245,66,242,116,154,9,185,
-            229,227,87,56,110,143,203,160,152,53,161,190,47,81,132,185,81,180,61,42,124,143,1,51,246,140,210,194,105,128,61,
-            225,112,190,232,12,242,56,106,218,248,241,121,247,162,110,223,99,126,78,184,30,54,1,234,68,7,147,180,63,30,58,231,
-            232,236,199,250,57,6,128,175,87,168,147,220,0,153,123,107,175,195,120,244,14,137,193,245,127,56,244,32,56,102,232,
-            82,182,154,30,109,131,10,214,94,184,253,164,31,22,10,99,142,52,224,50,133,61,148,163,83,228,75,96,58,129,177,21,
-            38,249,101,74,161,110,88,223,170,1,107,118,40,218,32,45,78,100,144,19,205,20,180,122,175,179,0,53,54,77,68,124,
-            141,181,175,223,96,26,182,7,163,171,246,176,59,24,27,91,111,131,17,104,103,63,103,213,159,48,227,11,179,178,94,
-            36,234,146,169,242,21,110,231,18,239,149,136,30,188,155,68,198,237,143,24,12,184,233,14,71,101,194,174,188,17,105,
-            237,164,239,113,62,142,162,151,157,111,21,233,50,0,19,150,216,84,124,9,86,223,103,168,155,229,75,123,48,30,81,84,
-            205,14,53,240,248,116,235,137,89,122,201,209,101,225,43,47,102,243,4,29,14,148,20,57,247,210,215,56,189,232,249,
-            186,0,21,124,149,57,175,248,138,3,126,71,127,71,225,45,108,125,251,35,210,38,93,200,147,155,183,104,28,20,25,231,
-            92,154,50,86,65,232,69,201,12,32,254,22,206,152,188,200,248,164,14,164,12,96,134,235,198,203,136,40,66,236,19,41,
-            87,83,98,197,129,10,147,196,36,145,51,43,255,86,187,80,188,52,149,75,32,248,26,23,7,200,89,249,200,114,122,230,
-            5,23,1,237,233,130,11,235,35,184,186,73,226,165,129,13,45,38,72,112,126,196,9,191,23,201,210,16,197,154,51,224,
-            102,4,0,24,14,75,16,177,38,55,125,13,153,99,216,94,92,248,104,30,78,243,87,240,87,221,118,222,140,58,195,203,50,
-            139,245,186,186,74,42,180,200,158,168,242,198,69,230,3,51,137,38,94,186,110,17,153,110,190,23,35,25,235,210,167,
-            164,169,11,135,42,239,154,208,118,240,197,154,172,88,242,235,33,122,100,60,157,169,184,188,146,229,171,8,253,64,
-            230,146,77,40,108,167,244,32,172,167,173,239,189,38,235,78,135,181,170,177,174,97,16,129,149,150,75,85,73,47,147,
-            164,24,193,24,89,119,124,118,26,197,73,187,255,165,253,231,136,140,80,119,244,177,82,60,86,78,198,220,203,172,149,
-            159,232,231,31,244,171,79,96,190,121,164,37,204,13,135,90,24,243,142,243,131,17,217,18,82,59,10,91,64,187,165,245,
-            183,161,148,202,101,117,192,65,82,204,16,189,194,113,248,165,122,234,83,238,2,254,106,8,14,172,26,190,94,100,98,
-            199,165,89,30,226,243,239,24,237,150,35,88,227,250,185,142,67,100,49,30,39,115,99,162,57,206,60,151,139,244,101,
-            210,187,145,35,117,216,236,244,123,87,192,124,122,253,211,97,169,126,212,108,48,238,92,140,80,79,193,2,191,165,
-            107,22,69,86,166,139,77,60,255,118,198,234,17,59,244,82,69,188,86,238,68,198,101,45,0,254,89,126,36,65,65,27,176,
-            155,27,127,186,238,247,221,97,247,170,221,3,113,112,57,128,143,246,101,191,77,144,97,201,120,223,132,115,5,84,142,
-            81,215,32,245,86,107,155,103,222,143,227,128,43,93,212,34,103,155,161,18,238,134,64,211,213,60,185,193,181,110,
-            198,114,173,60,70,136,190,237,213,114,214,92,123,18,12,151,100,122,88,27,108,230,47,206,175,180,127,246,242,249,
-            58,225,180,160,178,11,132,42,74,116,192,108,59,186,41,26,208,115,130,113,237,254,110,55,33,69,1,167,219,56,123,
-            170,225,95,70,110,247,43,198,197,123,167,237,113,23,80,222,185,30,142,122,55,221,254,159,230,22,138,21,150,22,87,
-            190,122,61,70,129,12,86,63,134,148,198,201,235,79,105,178,224,229,29,29,179,191,105,149,164,183,184,0,206,179,183,
-            10,69,84,112,122,68,47,11,230,148,145,111,238,247,29,75,9,20,115,17,16,29,116,200,223,233,24,195,112,69,154,193,
-            185,136,16,174,204,87,113,192,143,32,211,83,146,197,164,73,14,211,90,63,246,47,59,159,233,26,99,153,54,6,167,4,
-            239,81,197,65,183,116,160,33,110,189,25,201,186,98,185,66,121,163,31,181,182,111,247,161,22,242,50,91,255,14,133,
-            153,83,209,35,104,33,84,127,89,174,51,234,225,73,214,230,90,217,224,238,82,245,5,59,107,225,132,121,4,114,176,74,
-            184,166,69,74,244,193,240,53,172,153,244,172,30,172,216,168,116,36,68,172,44,99,38,241,140,210,124,22,232,131,195,
-            171,144,188,40,173,198,49,45,10,126,223,115,199,5,30,152,138,208,34,85,45,44,145,65,98,128,186,174,66,86,162,248,
-            202,24,223,111,207,110,233,130,137,206,88,240,68,17,121,61,77,249,217,58,157,100,98,1,104,112,93,42,39,78,132,39,
-            153,210,64,252,212,203,230,58,47,76,90,226,179,196,10,204,234,228,94,85,158,225,34,162,220,142,180,171,225,101,
-            167,59,26,137,7,209,122,86,79,128,17,29,67,78,44,108,139,143,206,54,244,22,202,174,157,152,75,167,228,254,192,250,
-            221,24,214,225,116,27,237,135,164,252,165,11,121,214,18,157,114,96,106,234,153,205,61,148,221,64,94,247,220,235,
-            43,60,194,163,253,65,189,238,1,229,4,38,160,211,8,239,53,53,188,238,213,193,204,19,35,8,245,128,111,103,88,121,
-            146,68,121,184,172,198,196,168,234,185,11,71,219,91,150,143,172,182,243,28,243,202,192,160,226,46,250,48,110,119,
-            27,233,39,161,234,46,244,159,150,250,130,70,145,60,119,46,121,132,164,167,137,150,38,1,147,202,17,39,154,146,9,
-            248,105,173,100,90,173,136,131,44,196,188,74,5,116,187,194,71,105,36,167,147,85,144,84,177,82,5,63,207,240,41,78,
-            163,129,24,178,221,117,245,150,156,236,117,235,67,135,125,38,126,248,138,123,121,199,136,120,52,88,200,187,120,
-            245,179,72,75,63,86,71,254,94,115,234,149,61,28,238,177,219,159,87,106,18,251,78,98,233,30,251,78,50,77,74,199,
-            53,190,188,85,83,154,2,155,148,78,133,50,144,18,154,68,46,91,35,103,191,192,26,17,176,189,195,26,57,90,107,68,2,
-            52,46,95,94,12,227,57,149,49,218,40,152,84,251,222,104,140,201,97,46,66,185,126,32,170,103,193,172,0,255,228,140,
-            50,158,142,0,245,184,26,25,124,251,42,195,138,85,100,67,80,203,245,181,214,249,46,139,9,249,221,234,163,212,98,
-            223,145,49,166,203,223,123,226,168,35,9,133,23,85,56,28,33,223,34,193,83,181,2,68,142,84,74,91,128,5,166,159,27,
-            5,137,64,143,123,234,121,69,151,228,71,33,238,249,252,241,72,228,2,66,225,209,114,254,196,1,67,121,164,138,107,
-            42,4,130,15,243,226,50,45,150,134,230,238,250,46,178,204,227,74,83,189,252,38,92,184,84,170,36,219,177,39,229,19,
-            19,65,16,234,164,47,93,227,68,236,124,96,47,185,45,128,196,160,53,56,179,218,19,51,232,80,197,123,80,169,66,246,
-            208,74,152,118,27,156,188,166,186,34,209,35,131,79,41,84,47,231,199,70,24,225,154,95,5,208,79,174,234,145,27,156,
-            189,155,229,243,13,102,106,60,249,90,143,221,161,150,138,166,108,66,77,252,120,110,181,208,30,226,39,45,226,88,
-            140,161,173,30,45,176,161,238,14,25,8,219,111,142,114,225,249,135,12,2,205,113,12,1,234,191,113,204,255,134,239,
-            118,188,85,123,17,132,255,212,241,196,159,129,156,191,86,32,167,249,108,51,1,191,150,248,121,146,158,2,81,196,180,
-            111,217,135,255,245,255,0,172,26,142,135
+            152,46,223,181,222,188,249,141,66,64,240,127,147,205,130,32,62,155,177,167,3,171,181,166,30,206,252,215,100,147,
+            4,250,15,67,142,24,255,221,211,128,195,187,66,143,54,224,0,185,15,33,199,214,111,111,153,30,225,67,163,166,15,64,
+            62,159,177,38,225,231,122,99,45,203,255,162,4,73,160,255,32,4,249,137,119,5,221,233,151,146,200,183,95,150,21,118,
+            115,119,135,164,205,160,100,153,105,55,107,198,153,23,8,255,158,241,234,75,10,72,79,167,240,183,169,219,177,200,
+            74,11,21,29,156,4,83,189,41,66,208,238,21,42,222,9,240,174,232,241,83,64,106,2,49,245,110,254,157,48,198,7,4,129,
+            158,2,222,230,200,202,78,112,247,11,187,60,33,164,141,65,148,157,224,230,135,68,89,14,3,122,219,249,20,197,226,
+            1,71,116,63,149,97,175,53,11,173,11,35,175,176,106,43,73,134,33,37,182,253,116,139,103,63,244,67,150,191,167,131,
+            252,73,17,96,121,205,159,12,5,228,138,125,0,2,246,115,167,62,229,242,135,198,199,250,68,139,199,96,207,3,86,190,
+            51,172,248,116,139,230,192,217,225,43,222,194,163,246,137,233,237,5,188,30,201,112,216,71,111,9,150,225,2,8,177,
+            34,212,30,59,225,69,225,44,94,88,149,30,39,97,78,55,75,54,236,242,118,191,119,54,112,237,250,177,237,72,215,55,
+            161,42,214,58,91,151,234,235,79,229,221,33,148,112,120,89,59,207,229,86,88,174,139,87,17,156,39,142,23,96,145,68,
+            171,182,198,36,73,113,31,67,202,34,105,213,84,129,101,64,172,66,178,245,112,88,245,119,158,17,140,74,65,220,122,
+            64,184,122,247,243,131,82,173,142,91,15,11,215,197,253,14,192,116,232,105,155,102,96,124,44,134,155,126,55,96,220,
+            243,203,97,239,111,151,131,113,187,223,12,215,60,73,195,127,96,100,59,250,238,32,222,116,135,227,94,103,23,128,
+            192,88,114,44,50,244,44,224,53,164,183,82,219,108,15,78,97,224,239,198,164,130,33,47,214,189,155,107,82,75,7,195,
+            72,184,215,174,74,212,86,47,62,109,91,187,89,108,195,234,132,188,98,107,151,234,185,178,122,201,97,50,29,105,229,
+            59,241,87,41,169,88,212,213,237,148,61,193,118,242,80,29,200,128,200,155,149,149,57,248,105,192,220,78,83,67,25,
+            35,29,177,109,181,166,164,169,63,245,91,89,1,10,232,135,171,14,207,1,99,206,233,85,79,215,136,164,4,207,38,31,23,
+            117,117,107,86,179,61,115,172,178,168,61,96,200,90,78,59,90,193,255,186,13,160,129,186,194,194,127,59,113,222,190,
+            193,228,189,183,191,237,72,189,65,68,236,38,87,126,155,163,82,8,23,207,154,6,82,221,45,189,88,188,51,211,80,94,
+            103,147,163,70,21,190,148,169,63,132,253,234,142,248,232,188,125,213,221,99,6,15,171,253,113,185,43,83,20,134,139,
+            72,83,37,237,5,190,252,41,233,54,120,129,207,67,15,77,238,144,169,88,55,237,167,222,215,238,169,123,209,27,240,
+            147,160,118,97,220,8,159,98,196,106,158,169,184,80,48,235,247,76,229,109,225,15,31,85,150,227,207,84,58,20,41,110,
+            129,254,151,149,174,112,69,158,44,41,175,75,110,44,46,221,139,171,202,202,91,211,124,27,212,12,207,87,170,101,208,
+            178,112,41,29,117,239,30,180,184,106,109,23,254,78,138,21,80,33,101,121,139,141,145,199,149,168,184,196,15,34,99,
+            162,50,25,125,130,25,167,88,112,71,151,183,161,92,122,42,172,194,47,237,121,84,129,156,75,123,216,160,99,110,71,
+            201,45,145,121,194,23,169,190,87,192,151,15,40,59,186,138,217,58,212,15,187,163,238,240,166,235,142,174,218,157,
+            174,219,189,233,14,220,222,39,247,188,119,122,218,29,108,223,9,46,253,137,235,199,114,175,66,100,200,169,231,97,
+            16,192,228,43,41,94,13,223,112,21,117,66,184,160,141,56,68,98,116,78,210,19,203,146,210,218,47,150,21,211,105,232,
+            135,232,115,226,225,5,225,190,103,75,5,65,10,22,144,193,147,71,197,187,17,52,169,28,219,84,246,58,184,7,28,72,5,
+            60,172,16,78,27,52,199,219,167,114,21,36,51,207,24,166,10,240,172,115,199,42,175,144,238,16,68,248,103,146,218,
+            133,231,108,62,122,14,147,210,49,34,20,232,11,40,68,134,89,158,170,156,42,234,58,229,24,250,244,50,74,13,148,118,
+            54,34,73,79,204,198,37,150,251,198,126,156,82,134,164,231,20,155,83,46,146,149,165,143,107,96,135,0,172,198,58,
+            179,143,230,4,217,36,42,22,113,205,56,29,250,225,144,161,0,30,160,128,186,177,232,70,53,221,184,193,179,141,237,
+            202,218,118,124,78,160,223,238,180,199,104,175,225,121,69,123,205,176,197,212,9,194,5,223,94,216,195,220,217,93,
+            175,89,159,202,147,82,109,146,156,80,195,177,144,221,84,56,32,250,69,3,103,89,208,251,166,40,205,52,5,202,17,179,
+            30,200,37,87,191,188,139,185,198,71,129,88,63,56,111,78,156,151,192,135,47,194,24,129,122,201,83,3,133,21,105,172,
+            159,4,218,232,232,101,229,195,65,168,239,85,230,75,106,58,160,234,128,213,108,79,128,183,47,229,161,180,36,214,
+            213,166,177,78,253,108,214,104,94,134,84,231,115,255,203,121,63,173,204,159,86,230,79,43,243,167,149,249,211,202,
+            252,105,101,254,180,50,127,90,153,63,173,204,159,86,230,143,103,101,110,232,186,211,72,221,205,96,161,36,214,38,
+            244,92,51,93,113,226,95,92,252,137,56,83,186,135,10,252,109,86,190,173,86,172,89,67,70,210,66,27,231,8,141,211,
+            240,78,69,217,113,229,229,57,95,69,150,85,74,6,105,179,129,55,111,152,209,82,62,182,205,121,240,124,51,176,20,81,
+            106,161,229,103,207,187,244,194,148,139,149,105,83,117,177,240,64,176,240,205,86,41,161,111,44,65,126,237,70,225,
+            147,93,120,44,112,227,168,160,41,204,159,156,56,250,153,4,219,124,199,196,31,102,108,92,119,156,239,194,30,175,
+            151,240,67,240,98,17,116,41,81,164,186,203,83,79,51,217,111,94,24,121,66,93,214,138,95,111,93,38,218,197,15,89,
+            102,138,124,224,7,95,35,146,55,30,53,137,206,110,205,111,3,30,5,45,207,224,28,16,111,161,251,220,194,213,144,71,
+            131,81,74,39,52,140,233,190,181,25,140,202,124,21,177,254,249,232,165,204,119,255,242,88,19,28,113,158,77,41,186,
+            174,185,14,145,81,97,189,57,61,2,77,31,212,49,203,77,189,188,35,174,135,253,250,131,130,118,110,94,192,3,240,216,
+            49,226,241,131,65,91,198,193,50,188,229,203,137,21,61,137,10,174,241,168,141,37,182,99,215,108,6,238,174,187,176,
+            42,207,108,212,94,41,93,22,161,84,8,209,157,55,247,128,65,147,138,50,186,174,63,151,248,123,185,185,255,47,143,
+            41,11,16,189,23,153,60,71,20,40,63,68,146,156,75,85,105,158,88,63,192,197,100,110,57,214,142,94,198,88,89,84,70,
+            134,157,46,65,65,216,72,111,179,149,159,146,90,229,29,132,77,205,163,223,253,234,158,13,47,191,92,92,158,118,221,
+            193,229,192,168,31,76,141,65,162,72,158,216,176,216,48,148,16,212,234,53,149,209,71,87,221,78,239,83,175,212,175,
+            120,138,121,18,39,32,82,53,79,208,164,240,154,104,3,117,103,146,233,237,32,56,147,22,64,115,68,51,214,87,64,195,
+            160,59,72,100,223,199,20,59,58,24,142,136,45,122,96,137,75,18,216,47,124,101,182,243,12,159,179,199,25,119,144,
+            91,243,18,45,131,138,23,167,207,167,184,56,85,198,133,123,215,230,108,68,236,9,170,83,218,107,197,175,124,26,92,
+            193,0,152,157,41,253,235,55,101,235,54,52,202,237,49,190,202,122,131,5,146,188,60,217,75,56,235,182,174,206,26,
+            219,94,186,129,107,116,172,21,46,46,95,205,42,213,56,199,140,90,195,97,203,25,225,95,207,197,201,234,79,245,41,
+            252,76,63,104,251,123,109,230,205,99,49,170,128,204,127,233,71,94,106,104,0,20,255,1,101,218,73,214,138,188,202,
+            97,21,139,196,10,77,244,176,121,232,27,164,18,72,155,227,193,233,79,243,29,67,245,96,31,102,42,221,53,148,165,177,
+            60,110,32,16,148,179,167,27,201,121,186,225,138,88,12,187,39,196,154,25,243,201,208,103,70,124,134,133,63,49,66,
+            185,22,202,142,177,62,69,9,149,53,162,55,51,119,141,56,197,198,143,27,80,31,200,38,205,89,229,238,180,136,253,237,
+            79,41,125,146,95,77,50,43,62,32,187,241,178,148,230,9,181,229,127,14,159,35,59,116,14,144,79,55,216,182,126,124,
+            122,96,112,114,95,183,157,100,193,111,65,164,84,112,9,215,238,80,16,76,158,239,171,165,245,32,162,225,170,173,255,
+            140,255,51,214,111,51,72,149,140,133,119,71,208,177,49,154,37,219,30,152,214,237,158,115,21,242,100,230,254,171,
+            48,139,16,20,239,90,4,214,93,10,215,130,98,155,75,168,135,149,189,122,101,136,14,21,189,5,189,214,56,35,135,144,
+            185,189,160,127,16,35,39,225,199,31,181,57,206,203,106,57,175,222,242,3,205,246,194,13,120,198,170,7,253,238,213,
+            219,198,215,133,181,192,204,242,251,82,62,107,127,155,45,45,65,133,4,8,81,234,81,83,41,235,136,74,65,185,87,244,
+            213,186,80,171,211,49,123,125,244,152,219,202,229,32,177,102,200,201,59,65,239,99,213,59,199,168,123,123,212,233,
+            245,202,254,241,43,250,2,181,238,212,243,233,221,70,178,29,104,84,116,85,22,121,211,96,253,171,243,182,61,152,23,
+            45,231,222,99,6,27,92,95,116,135,189,206,198,152,244,204,29,62,191,241,160,161,79,123,103,189,241,200,30,116,159,
+            241,156,107,122,159,36,35,98,59,58,166,80,59,168,109,248,104,17,121,65,208,219,219,48,105,205,82,246,152,149,11,
+            79,139,75,80,83,245,18,15,5,22,32,11,227,34,123,189,140,10,208,232,65,108,177,205,135,176,188,84,47,145,142,94,
+            118,95,150,99,55,128,214,27,116,250,215,160,195,246,123,163,177,117,20,29,171,6,26,146,50,159,62,67,238,188,226,
+            76,123,232,233,137,213,48,94,242,35,238,9,235,206,216,141,74,166,1,29,138,227,150,30,8,194,140,5,181,78,250,239,
+            223,143,84,222,147,74,105,13,224,118,191,110,5,87,221,61,61,184,228,253,219,14,112,247,110,39,192,26,191,157,243,
+            246,240,225,72,166,87,189,24,98,179,169,8,123,88,194,238,28,161,37,93,254,10,244,201,223,203,131,202,199,207,182,
+            23,63,224,210,30,177,111,112,86,221,155,118,223,29,159,95,94,143,218,131,211,145,59,234,94,181,135,237,241,229,
+            112,183,180,109,57,95,184,24,44,6,169,136,205,211,27,36,84,133,190,224,103,110,232,148,163,251,155,2,149,229,235,
+            5,232,23,206,224,16,103,165,224,210,82,77,208,166,91,18,249,194,178,211,123,231,72,40,218,47,82,114,33,83,209,64,
+            85,74,182,218,65,13,34,143,155,214,255,183,238,240,18,68,132,251,177,223,30,124,126,164,158,1,104,97,243,211,160,
+            197,43,245,55,244,47,234,221,182,12,86,99,196,162,118,146,122,113,22,121,18,217,197,179,78,207,97,177,14,36,245,
+            91,228,187,138,90,168,211,172,54,135,168,78,223,132,135,193,165,59,30,182,123,253,222,224,140,112,210,29,237,175,
+            177,244,170,15,194,3,12,97,132,16,227,156,202,138,22,57,169,90,36,120,57,144,28,174,54,228,57,58,13,40,248,67,36,
+            173,73,1,179,117,236,114,130,24,61,195,40,168,12,92,62,65,136,170,15,128,150,73,225,231,82,195,161,27,41,213,138,
+            170,21,45,175,124,101,67,156,188,226,248,40,53,143,70,103,199,199,36,137,20,108,202,143,237,239,216,109,226,92,
+            46,171,111,126,233,214,207,100,237,52,77,183,219,240,217,216,5,57,164,127,249,93,248,65,13,205,205,170,229,243,
+            36,244,213,79,39,223,62,78,62,203,244,211,100,106,90,254,51,123,39,54,136,70,208,244,99,19,205,247,65,5,86,65,254,
+            201,172,190,19,178,65,49,78,150,125,245,77,69,95,40,241,160,14,221,156,77,110,178,133,110,198,110,187,51,238,221,
+            180,199,221,23,229,48,109,0,5,159,71,236,126,83,229,153,110,199,142,39,223,203,147,175,148,183,21,235,84,22,157,
+            103,129,154,35,198,146,228,33,46,74,220,32,165,78,58,211,171,236,129,50,127,210,90,54,193,234,244,47,71,93,247,
+            75,111,112,122,249,197,2,173,131,21,12,42,112,213,119,239,117,46,7,148,40,100,122,246,64,3,11,255,81,237,203,119,
+            96,77,4,208,100,140,220,93,140,190,156,160,231,102,252,217,193,216,120,182,5,200,139,246,215,222,69,117,154,11,
+            116,61,173,207,211,97,109,62,146,215,207,12,250,40,118,90,121,46,161,50,53,107,224,151,163,175,175,59,137,159,120,
+            205,160,92,222,84,192,0,237,179,2,194,89,121,49,187,178,93,244,24,219,183,173,219,0,195,130,158,188,239,192,161,
+            36,19,178,61,78,35,107,61,84,114,97,228,197,55,154,136,77,39,223,224,102,13,27,164,136,3,54,104,217,13,171,118,
+            71,227,246,112,124,192,218,13,132,148,22,193,33,79,232,130,116,201,137,238,207,9,108,23,179,243,30,2,106,178,52,
+            248,100,64,249,221,209,231,1,117,116,94,57,117,163,121,178,170,128,57,50,231,222,202,176,10,201,0,90,209,101,0,
+            78,242,106,57,131,36,71,5,202,92,187,48,164,143,49,89,224,128,120,3,192,94,236,26,235,8,249,208,6,206,17,121,228,
+            241,227,49,133,132,21,32,132,157,238,92,21,1,214,179,101,41,189,211,126,133,13,4,209,78,140,203,43,247,58,247,46,
+            12,182,115,220,237,156,118,253,89,159,242,154,124,80,95,183,73,99,17,240,150,227,183,218,247,96,61,31,100,21,148,
+            0,19,145,130,225,171,187,150,126,214,38,12,202,39,88,162,100,2,70,135,120,243,193,72,156,134,119,90,32,102,42,154,
+            82,9,247,222,169,219,30,252,217,232,12,7,113,19,111,121,224,3,84,227,36,163,138,74,229,3,239,210,65,139,43,89,145,
+            164,193,234,87,63,142,48,159,142,30,56,103,228,221,112,167,227,13,183,120,76,57,133,213,12,67,58,161,155,241,96,
+            204,61,52,130,106,130,249,120,191,254,246,47,250,189,63,126,225,135,71,219,84,91,145,176,170,93,223,189,219,179,
+            107,228,165,51,181,214,23,166,165,175,55,186,242,167,6,108,239,190,52,100,146,170,237,12,141,42,178,91,78,27,171,
+            64,36,89,72,207,98,178,246,64,84,97,61,207,168,232,105,133,5,208,148,207,67,232,4,86,50,76,241,168,114,114,105,
+            172,147,58,229,1,228,45,97,172,189,161,150,168,12,57,192,57,229,102,19,254,186,32,83,146,149,35,147,71,102,203,
+            219,186,180,106,182,173,151,88,226,72,95,205,72,98,80,182,10,44,255,177,150,20,10,216,194,184,81,184,230,213,49,
+            106,87,233,207,49,41,190,65,137,59,68,77,173,182,183,29,21,21,120,117,250,240,119,131,213,105,155,109,231,132,100,
+            231,40,147,20,109,108,128,28,6,54,139,178,114,218,113,240,41,204,143,97,207,238,43,148,147,201,116,181,79,146,48,
+            160,245,145,179,154,68,183,225,41,134,111,186,159,218,215,253,177,157,53,42,108,131,203,84,17,237,114,14,24,45,
+            246,22,126,68,146,153,152,84,46,148,57,39,13,119,82,100,162,81,239,226,170,111,162,107,167,146,154,15,236,139,234,
+            157,200,112,94,154,20,18,118,209,88,135,29,164,158,46,143,163,99,171,73,196,207,164,200,46,105,63,104,19,0,215,
+            131,207,101,194,180,5,64,86,196,183,74,131,64,19,82,203,71,79,56,108,247,70,101,38,153,53,97,234,133,228,233,52,
+            19,114,203,199,175,112,220,30,151,65,49,107,66,125,95,162,8,115,163,104,123,84,227,30,3,102,236,25,165,133,211,
+            0,123,194,225,124,209,25,228,113,212,180,241,227,243,238,69,221,190,199,252,114,112,61,108,2,212,137,14,38,105,
+            127,60,116,206,209,217,143,245,115,12,0,95,175,80,39,185,1,50,247,214,30,130,241,232,201,17,131,235,127,119,232,
+            237,111,204,208,165,108,53,61,218,6,21,172,61,102,251,73,191,33,20,198,28,105,192,101,10,123,40,71,167,200,151,
+            192,116,2,99,43,76,242,203,148,66,221,176,190,85,3,214,236,80,180,65,90,156,200,32,39,154,41,104,245,94,103,1,106,
+            108,154,136,248,26,107,95,191,193,52,108,15,70,87,237,97,119,48,54,182,222,6,35,208,206,126,206,170,63,97,198,23,
+            102,101,189,72,212,37,83,229,43,220,206,37,222,43,17,61,120,55,137,140,219,31,49,24,112,211,29,142,202,132,93,121,
+            14,210,218,73,223,227,124,28,69,143,56,223,42,210,101,0,38,44,177,169,248,18,172,190,207,80,55,203,151,246,96,60,
+            162,168,154,29,106,224,241,233,214,19,179,244,146,163,203,194,87,94,204,230,9,58,28,40,41,114,238,165,175,113,122,
+            209,243,117,1,42,248,42,115,94,241,21,7,252,142,254,142,194,91,216,250,246,71,164,77,186,144,39,55,111,209,56,40,
+            50,206,185,52,101,172,130,208,139,146,25,64,252,45,156,49,121,145,241,73,29,72,25,192,12,215,141,71,16,81,132,216,
+            39,82,174,166,196,138,3,21,38,137,73,34,103,86,254,173,118,161,120,105,42,151,64,240,225,45,14,144,179,242,145,
+            229,244,162,11,46,2,218,211,5,23,214,71,112,117,147,196,75,3,27,90,76,144,224,252,136,19,126,26,146,165,33,138,
+            53,103,192,205,8,0,48,28,150,32,98,77,110,250,26,50,199,176,189,184,240,209,60,156,230,175,224,175,186,237,188,
+            25,117,134,151,101,22,235,117,117,149,84,104,145,61,81,229,141,139,204,7,102,18,77,188,116,221,34,50,221,124,47,
+            70,50,214,165,79,73,83,23,14,85,222,53,161,237,224,139,53,89,177,228,135,66,244,200,120,58,83,113,121,37,203,87,
+            17,250,129,204,37,155,80,216,78,233,65,88,79,91,223,123,77,214,157,14,107,85,99,93,195,32,2,43,45,151,170,146,94,
+            38,73,49,130,49,178,238,248,236,52,138,147,118,255,75,251,207,17,25,161,238,232,99,165,120,172,156,140,185,151,
+            89,43,63,209,47,61,232,7,158,192,124,243,72,75,152,27,14,181,48,230,29,231,7,35,178,37,164,118,20,182,128,118,75,
+            235,111,67,41,149,203,234,128,131,164,152,33,122,133,227,240,163,244,212,167,220,5,252,213,16,28,88,53,124,189,
+            200,196,142,75,179,60,196,151,222,49,218,45,71,176,198,245,115,29,135,200,98,60,78,230,198,68,115,156,121,46,23,
+            233,203,164,119,35,71,234,176,217,233,247,174,128,249,244,250,167,195,82,253,168,217,96,220,185,24,161,158,130,
+            5,126,75,215,44,138,172,76,23,155,120,254,237,140,213,35,118,232,165,138,120,173,220,137,140,203,90,0,252,179,252,
+            72,130,130,54,96,55,55,254,116,221,239,187,195,238,85,187,7,226,224,114,0,31,237,203,126,155,32,195,146,241,190,
+            9,231,10,168,28,163,174,65,234,173,214,54,207,60,21,199,1,87,186,168,69,206,54,67,37,220,13,129,166,171,121,114,
+            131,107,221,140,229,90,121,140,16,125,219,171,229,172,185,246,36,24,46,201,244,176,54,216,204,95,156,95,105,255,
+            236,229,243,117,194,105,65,101,23,8,85,148,232,128,217,118,116,83,52,160,151,3,227,218,253,221,110,66,138,2,78,
+            183,113,246,84,195,191,140,220,238,87,140,139,247,78,219,227,46,160,188,115,61,28,245,110,186,253,63,205,45,20,
+            43,44,45,174,124,245,122,140,2,25,172,126,12,41,141,147,215,159,210,100,193,203,59,58,102,127,211,42,73,111,113,
+            1,156,103,111,21,138,168,224,244,136,30,17,204,41,35,223,220,239,59,150,18,40,230,34,32,58,232,144,191,211,49,134,
+            225,138,52,131,115,17,33,92,153,175,226,128,223,59,166,87,35,139,73,147,28,166,181,126,236,95,118,62,211,53,198,
+            50,109,12,78,9,222,163,138,131,110,233,64,67,220,122,51,146,117,197,114,133,242,70,191,95,109,223,238,67,45,228,
+            101,182,254,29,10,51,167,162,71,208,66,168,254,178,92,103,212,195,147,172,205,181,178,193,221,165,234,11,118,214,
+            194,9,243,8,228,96,149,112,77,139,148,232,131,225,107,88,51,233,89,61,88,177,81,233,72,136,88,89,198,76,226,25,
+            165,249,44,208,7,135,87,33,121,81,90,141,99,90,20,252,190,231,142,11,60,48,21,161,69,170,90,88,34,131,196,0,117,
+            93,133,172,68,241,149,49,190,223,158,221,210,5,19,157,177,224,137,34,242,122,154,242,11,117,58,201,196,2,208,224,
+            186,84,78,156,8,79,50,165,129,248,169,151,205,117,94,152,180,196,23,136,21,152,213,201,189,170,188,184,69,68,185,
+            29,105,87,195,203,78,119,52,18,15,162,245,130,158,0,35,58,134,156,88,216,22,31,157,109,232,45,148,93,59,49,151,
+            78,201,253,129,245,187,49,172,195,233,54,218,15,73,249,75,23,242,130,37,58,229,192,212,212,51,155,123,40,187,129,
+            188,238,185,215,87,120,132,71,251,131,122,221,3,202,9,76,64,167,17,222,107,106,120,221,171,131,153,39,70,16,234,
+            1,223,206,176,242,36,137,242,112,89,141,137,81,213,115,23,142,182,183,44,223,83,109,231,57,230,149,129,65,197,93,
+            244,97,220,238,54,210,175,63,213,93,232,63,45,245,5,141,34,121,217,92,242,8,73,79,19,45,77,2,38,149,35,78,52,37,
+            19,240,43,90,201,180,90,17,7,89,136,121,128,10,232,118,133,239,207,72,78,39,171,32,169,98,165,10,126,158,225,171,
+            155,70,3,49,100,187,235,234,45,57,217,235,214,135,14,251,76,252,240,21,247,242,142,17,241,104,176,144,119,241,234,
+            103,145,150,126,172,142,252,189,230,212,43,123,56,220,99,183,63,175,212,36,246,157,196,210,61,246,157,100,154,148,
+            142,107,124,100,171,166,52,5,54,41,157,10,101,32,37,52,137,92,182,70,206,126,129,53,34,96,123,135,53,114,180,214,
+            136,4,104,92,190,188,24,198,115,42,99,180,81,48,169,246,105,209,24,147,195,92,132,114,253,64,84,207,130,89,1,254,
+            201,25,101,60,29,1,234,113,53,50,248,246,85,134,21,171,200,134,160,150,235,107,173,243,93,22,19,242,187,213,71,
+            169,197,190,35,99,76,151,191,247,196,81,71,18,10,47,170,112,56,66,190,69,130,167,106,5,136,28,169,148,182,0,11,
+            76,191,44,10,18,129,222,241,212,243,138,46,201,143,66,220,243,249,227,145,200,5,132,194,163,229,252,137,3,134,242,
+            30,21,215,84,8,4,31,230,113,101,90,44,13,205,221,245,93,100,153,199,149,166,122,249,77,184,112,169,84,73,182,99,
+            79,202,39,38,130,32,212,73,95,186,198,137,216,249,192,94,114,91,0,137,65,107,112,102,181,39,102,208,161,138,247,
+            160,82,133,236,161,149,48,237,54,56,121,77,117,69,162,71,6,159,82,168,94,206,143,141,48,194,53,191,10,160,95,87,
+            213,35,55,56,123,55,203,231,27,204,212,120,242,181,30,187,67,45,21,77,217,132,154,248,157,220,106,161,61,196,79,
+            90,196,177,24,67,91,61,90,96,67,221,29,50,16,182,223,28,229,194,243,15,25,4,154,227,24,2,212,127,227,152,255,13,
+            223,237,120,150,246,34,8,255,169,227,137,63,3,57,127,173,64,78,243,217,102,2,126,45,241,243,36,61,5,162,136,105,
+            223,178,15,255,235,255,1,214,153,136,69
         };
 
     // ../xml/mdi.xml (5631 bytes)
@@ -2137,7 +2137,7 @@ namespace wxue_data
     }
     std::string get_interfaces()
     {
-        return std::string((const char*) get_data(interfaces, sizeof(interfaces), 52240).get(), 52240);
+        return std::string((const char*) get_data(interfaces, sizeof(interfaces), 52219).get(), 52219);
     }
     std::string get_mdi()
     {
diff --git a/src/wxui/wxue_data.h b/src/wxui/wxue_data.h
index 1e09facb3..d457d2819 100644
--- a/src/wxui/wxue_data.h
+++ b/src/wxui/wxue_data.h
@@ -46,7 +46,7 @@ namespace wxue_data
     // ../xml/forms.xml
     extern const unsigned char forms[6368]; // 34953
     // ../xml/interfaces.xml
-    extern const unsigned char interfaces[10726]; // 52240
+    extern const unsigned char interfaces[10722]; // 52219
     // ../xml/mdi.xml
     extern const unsigned char mdi[1791]; // 5631
     // ../xml/pickers.xml
diff --git a/src/wxui/wxui_code.cmake b/src/wxui/wxui_code.cmake
index f7e9cec51..5ad7670d2 100644
--- a/src/wxui/wxui_code.cmake
+++ b/src/wxui/wxui_code.cmake
@@ -72,18 +72,24 @@ set (wxue_generated_code
 
 set (wxue_generated_code_data
 
-    ${CMAKE_CURRENT_LIST_DIR}/../xml/forms.xml
-    ${CMAKE_CURRENT_LIST_DIR}/../xml/widgets.xml
-    ${CMAKE_CURRENT_LIST_DIR}/../xml/containers.xml
-    ${CMAKE_CURRENT_LIST_DIR}/../xml/bars.xml
-    ${CMAKE_CURRENT_LIST_DIR}/../xml/project.xml
-    ${CMAKE_CURRENT_LIST_DIR}/../xml/sizers.xml
-    ${CMAKE_CURRENT_LIST_DIR}/../xml/text_ctrls.xml
-    ${CMAKE_CURRENT_LIST_DIR}/../xml/buttons.xml
-    ${CMAKE_CURRENT_LIST_DIR}/../xml/boxes.xml
-    ${CMAKE_CURRENT_LIST_DIR}/../xml/data_ctrls.xml
-    ${CMAKE_CURRENT_LIST_DIR}/../xml/mdi.xml
-    ${CMAKE_CURRENT_LIST_DIR}/../xml/pickers.xml
-    ${CMAKE_CURRENT_LIST_DIR}/../xml/interfaces.xml
+    ${CMAKE_CURRENT_LIST_DIR}/../../.gitignore
+    ${CMAKE_CURRENT_LIST_DIR}/../res/console_pch.h
+    ${CMAKE_CURRENT_LIST_DIR}/../res/.gitattributes
+    ${CMAKE_CURRENT_LIST_DIR}/../res/readme.md
+    ${CMAKE_CURRENT_LIST_DIR}/../res/license.txt
+    ${CMAKE_CURRENT_LIST_DIR}/../res/.clang-format
+    ${CMAKE_CURRENT_LIST_DIR}/../res/CMakeLists.txt
+    ${CMAKE_CURRENT_LIST_DIR}/../res/CMakePresets.json
+    ${CMAKE_CURRENT_LIST_DIR}/../res/gui_pch.h
+    ${CMAKE_CURRENT_LIST_DIR}/../res/project.manifest
+    ${CMAKE_CURRENT_LIST_DIR}/../res/assertion_dlg.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/../res/assertion_dlg.h
+    ${CMAKE_CURRENT_LIST_DIR}/../res/console.rc
+    ${CMAKE_CURRENT_LIST_DIR}/../res/window.rc
+    ${CMAKE_CURRENT_LIST_DIR}/../res/wxConsole.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/../res/wxConsole.h
+    ${CMAKE_CURRENT_LIST_DIR}/../res/wxMain.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/../res/wxMain.h
+    ${CMAKE_CURRENT_LIST_DIR}/../res/rust_launch.json
 
 )