From 6d2854aa81eaa4fbb1be6ac0a396735d7b48436d Mon Sep 17 00:00:00 2001
From: John Lindal <github@newplanetsoftware.com>
Date: Sun, 25 Feb 2024 21:35:41 -0800
Subject: [PATCH] jx: enforce title of classes derived from JXSearchTextDialog

---
 .ace-version                            |  2 +-
 libjx/code/JXSearchTextDialog.cpp       |  3 ++-
 libjx/code/JXSearchTextDialog.jxl       | 35 +++++++++++++++++++++++--
 libjx/libjx.jcc                         |  2 +-
 libjx/strings/JXSearchTextDialog_layout |  1 -
 libjx/strings/jx_strings                |  1 +
 6 files changed, 38 insertions(+), 6 deletions(-)

diff --git a/.ace-version b/.ace-version
index 0e7b60da8..ad955e95b 100644
--- a/.ace-version
+++ b/.ace-version
@@ -1 +1 @@
-7.1.2
\ No newline at end of file
+7.1.3
\ No newline at end of file
diff --git a/libjx/code/JXSearchTextDialog.cpp b/libjx/code/JXSearchTextDialog.cpp
index 22426648e..cfa6469a0 100644
--- a/libjx/code/JXSearchTextDialog.cpp
+++ b/libjx/code/JXSearchTextDialog.cpp
@@ -262,7 +262,7 @@ JXSearchTextDialog::BuildWindow()
 {
 // begin JXLayout
 
-	auto* window = jnew JXWindow(this, 450,300, JGetString("WindowTitle::JXSearchTextDialog::JXLayout"));
+	auto* window = jnew JXWindow(this, 450,300, JString::empty);
 
 	auto* searchInputLabel =
 		jnew JXStaticText(JGetString("searchInputLabel::JXSearchTextDialog::JXLayout"), window,
@@ -439,6 +439,7 @@ JXSearchTextDialog::SetObjects
 	)
 {
 	JXWindow* window = searchInput->GetWindow();
+	window->SetTitle(JGetString("WindowTitle::JXSearchTextDialog"));
 	window->SetCloseAction(JXWindow::kDeactivateDirector);
 	window->PlaceAsDialogWindow();
 	window->LockCurrentMinSize();
diff --git a/libjx/code/JXSearchTextDialog.jxl b/libjx/code/JXSearchTextDialog.jxl
index 69b438c21..94d8c61bf 100644
--- a/libjx/code/JXSearchTextDialog.jxl
+++ b/libjx/code/JXSearchTextDialog.jxl
@@ -1,14 +1,15 @@
-jx_layout_editor 5
+jx_layout_editor 8
 450
 300
 "JXLayout"
-"Search text"
+""
 ""
 ""
 0
 
 1
 0
+0
 "StaticText"
 0
 0
@@ -26,6 +27,7 @@ jx_layout_editor 5
 
 1
 0
+0
 "CustomWidget"
 1
 0
@@ -41,6 +43,7 @@ jx_layout_editor 5
 
 1
 0
+0
 "StaticText"
 1
 0
@@ -58,6 +61,7 @@ jx_layout_editor 5
 
 1
 0
+0
 "CustomWidget"
 1
 0
@@ -73,6 +77,7 @@ jx_layout_editor 5
 
 1
 0
+0
 "InputField"
 2
 0
@@ -89,9 +94,12 @@ jx_layout_editor 5
 ""
 0
 0
+0
+""
 
 1
 0
+0
 "HistoryMenu"
 1
 0
@@ -105,6 +113,7 @@ jx_layout_editor 5
 
 1
 0
+0
 "TextButton"
 1
 0
@@ -118,6 +127,7 @@ jx_layout_editor 5
 
 1
 0
+0
 "CustomWidget"
 1
 0
@@ -133,6 +143,7 @@ jx_layout_editor 5
 
 1
 0
+0
 "StaticText"
 1
 0
@@ -150,6 +161,7 @@ jx_layout_editor 5
 
 1
 0
+0
 "CustomWidget"
 1
 0
@@ -165,6 +177,7 @@ jx_layout_editor 5
 
 1
 0
+0
 "StaticText"
 0
 0
@@ -182,6 +195,7 @@ jx_layout_editor 5
 
 1
 0
+0
 "InputField"
 2
 0
@@ -198,9 +212,12 @@ jx_layout_editor 5
 ""
 0
 0
+0
+""
 
 1
 0
+0
 "TextButton"
 1
 0
@@ -214,6 +231,7 @@ jx_layout_editor 5
 
 1
 0
+0
 "TextButton"
 1
 0
@@ -227,6 +245,7 @@ jx_layout_editor 5
 
 1
 0
+0
 "HistoryMenu"
 1
 0
@@ -240,6 +259,7 @@ jx_layout_editor 5
 
 1
 0
+0
 "TextCheckbox"
 0
 0
@@ -253,6 +273,7 @@ jx_layout_editor 5
 
 1
 0
+0
 "TextCheckbox"
 0
 0
@@ -266,6 +287,7 @@ jx_layout_editor 5
 
 1
 0
+0
 "TextCheckbox"
 0
 0
@@ -279,6 +301,7 @@ jx_layout_editor 5
 
 1
 0
+0
 "TextCheckbox"
 0
 0
@@ -292,6 +315,7 @@ jx_layout_editor 5
 
 1
 0
+0
 "TextCheckbox"
 0
 0
@@ -305,6 +329,7 @@ jx_layout_editor 5
 
 1
 0
+0
 "TextCheckbox"
 0
 0
@@ -318,6 +343,7 @@ jx_layout_editor 5
 
 1
 0
+0
 "TextCheckbox"
 0
 0
@@ -331,6 +357,7 @@ jx_layout_editor 5
 
 1
 0
+0
 "TextCheckbox"
 0
 0
@@ -344,6 +371,7 @@ jx_layout_editor 5
 
 1
 0
+0
 "TextCheckbox"
 0
 0
@@ -357,6 +385,7 @@ jx_layout_editor 5
 
 1
 0
+0
 "TextButton"
 0
 0
@@ -370,6 +399,7 @@ jx_layout_editor 5
 
 1
 0
+0
 "TextButton"
 0
 0
@@ -383,6 +413,7 @@ jx_layout_editor 5
 
 1
 0
+0
 "TextButton"
 0
 0
diff --git a/libjx/libjx.jcc b/libjx/libjx.jcc
index b47cc3ed1..563117dea 100644
--- a/libjx/libjx.jcc
+++ b/libjx/libjx.jcc
@@ -1,4 +1,4 @@
-jx_browser_data 94
+jx_browser_data 95
 # project tree
 0 "root"
 T
diff --git a/libjx/strings/JXSearchTextDialog_layout b/libjx/strings/JXSearchTextDialog_layout
index fb556c287..656993001 100644
--- a/libjx/strings/JXSearchTextDialog_layout
+++ b/libjx/strings/JXSearchTextDialog_layout
@@ -23,7 +23,6 @@ itsHelpButton::JXSearchTextDialog::JXLayout "Help"
 itsPreserveCaseCB::shortcuts::JXSearchTextDialog::JXLayout "#P"
 replaceInputLabel::JXSearchTextDialog::JXLayout "Replace with:"
 itsPreserveCaseCB::JXSearchTextDialog::JXLayout "Preserve case"
-WindowTitle::JXSearchTextDialog::JXLayout "Search text"
 itsReplaceAllInSelButton::JXSearchTextDialog::JXLayout "in selection"
 itsQRefButton::JXSearchTextDialog::JXLayout "Quick Ref"
 itsEntireWordCB::shortcuts::JXSearchTextDialog::JXLayout "#E"
diff --git a/libjx/strings/jx_strings b/libjx/strings/jx_strings
index 54904dbf9..2acf8c964 100644
--- a/libjx/strings/jx_strings
+++ b/libjx/strings/jx_strings
@@ -340,6 +340,7 @@ VariableSizeLabel::JXFontSizeMenu	"Other..."
 
 # JXSearchTextDialog
 
+WindowTitle::JXSearchTextDialog				"Search Text"
 CloseShortcut::JXSearchTextDialog			"#W^["
 IgnoreCaseShortcut::JXSearchTextDialog		"#I"
 WrapSearchShortcut::JXSearchTextDialog		"#S"