Moved CodeQuickTester.CreateMenuBar method to CreateMenus function

G33kDude · Aug 18, 2017 · 848f3ef · 848f3ef
1 parent 42322b7
commit 848f3ef
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 18 deletions.
diff --git a/lib/CQT.ahk b/lib/CQT.ahk
@@ -52,7 +52,7 @@ class CodeQuickTester
 		Gui, New, +Resize +hWndhMainWindow -AlwaysOnTop
 		this.AlwaysOnTop := False
 		this.hMainWindow := hMainWindow
-		this.Menus := this.CreateMenuBar(Menus)
+		this.Menus := CreateMenus(Menus)
 		Gui, Menu, % this.Menus[1]
 		Gui, Margin, 5, 5
 
@@ -144,23 +144,6 @@ class CodeQuickTester
 		}
 	}
 
-	CreateMenuBar(Menu)
-	{
-		static MenuName := 0
-		Menus := ["CQT_" MenuName++]
-		for each, Item in Menu
-		{
-			Ref := Item[2]
-			if IsObject(Ref) && Ref._NewEnum()
-			{
-				SubMenus := this.CreateMenuBar(Ref)
-				Menus.Push(SubMenus*), Ref := ":" SubMenus[1]
-			}
-			Menu, % Menus[1], Add, % Item[1], %Ref%
-		}
-		return Menus
-	}
-
 	RunButton()
 	{
 		if (this.Exec.Status == 0) ; Running

diff --git a/lib/Utils.ahk b/lib/Utils.ahk
@@ -96,3 +96,20 @@ UriEncode(Uri, RE="[0-9A-Za-z]") {
 		Res .= (Chr:=Chr(Code)) ~= RE ? Chr : Format("%{:02X}", Code)
 	Return, Res
 }
+
+CreateMenus(Menu)
+{
+	static MenuName := 0
+	Menus := ["Menu_" MenuName++]
+	for each, Item in Menu
+	{
+		Ref := Item[2]
+		if IsObject(Ref) && Ref._NewEnum()
+		{
+			SubMenus := CreateMenus(Ref)
+			Menus.Push(SubMenus*), Ref := ":" SubMenus[1]
+		}
+		Menu, % Menus[1], Add, % Item[1], %Ref%
+	}
+	return Menus
+}