Make backwards compatible with Cloanto's AmigaOS 3.X

CHANGELOG.md

@@ -1,4 +1,7 @@
 # Changelog
+## 1.2.1 (2023-11-04)
+- Now fully backwards compatible with Cloanto's AmigaOS 3.X (included in Amiga Forever)
+
 ## 1.2.0 (2023-10-04)
 - Now fully backwards compatible with AmigaOS 3.9
 

README.md

@@ -27,7 +27,7 @@ You can customise the look and feel of the application, including the ability to
 
 Ensure you have the necessary system requirements:
 - An OCS/ECS/AGA **Amiga**
-- **AmigaOS 3.9** supported but **AmigaOS 3.2** or higher recommended
+- **AmigaOS 3.9** and **AmigaOS 3.X included in Amiga Forever** supported but **AmigaOS 3.2** or higher recommended
 - Motorola 68020 or higher CPU
 - Internet access using a TCP/IP stack such as **Roadshow** (http://roadshow.apc-tcp.de/index-en.php)
 - **AmiSSL 5.9** or higher (http://aminet.net/util/libs/AmiSSL-5.9-OS3.lha)

bundle/AmigaGPT/AmigaGPT.guide

@@ -398,7 +398,11 @@ Training data: Up to Sep 2021
 @node changelog "Changelog"
 @{b}Changelog@{ub}
 
-@{b}1.2.0 (2023-10-04)
+@{b}1.2.1 (2023-11-04)@{ub}
+
+- Now fully backwards compatible with Cloanto's AmigaOS 3.X (included in Amiga Forever)
+
+@{b}1.2.0 (2023-10-04)@{ub}
 
 - Now fully backwards compatible with AmigaOS 3.9
 

bundle/AmigaGPT/AmigaGPT.readme

@@ -3,7 +3,7 @@ Kurz: App zum Chatten mit ChatGPT
 Author: Cameron Armstrong (Nightfox) <cameronscottarmstrong@gmail.com>
 Uploader: Cameron Armstrong (Nightfox)  <cameronscottarmstrong@gmail.com>
 Type: util/misc
-Version: 1.2.0
+Version: 1.2.1
 Architecture: m68k-amigaos >= 3.9
 Requires: AmigaOS 3.9+/68020+ util/libs/AmiSSL-5.9-OS3.lha
 Replaces: util/misc/AmigaGPT.lha
@@ -21,7 +21,7 @@ Features:
 Requirements:
 - OCS/ECS/AGA Amiga
 - Motorola 68020 or higher CPU
-- AmigaOS 3.9 supportrd but 3.2 or higher recommended
+- AmigaOS 3.9 and AmigaOS 3.X (included in Amiga Forever) supported but 3.2 or higher recommended
 - AmiSSL 5.9 or higher (http://aminet.net/util/libs/AmiSSL-5.9-OS3.lha)
 - Internet access using a TCP/IP stack such as Roadshow 
 (http://roadshow.apc-tcp.de/index-en.php)

src/gui.c

@@ -305,7 +305,7 @@ LONG openGUILibraries() {
 	#endif
 
 	#ifdef __AMIGAOS3__
-	if ((WindowBase = OpenLibrary("window.class", 45)) == NULL) {
+	if ((WindowBase = OpenLibrary("window.class", 44)) == NULL) {
 		printf("Could not open window.class\n");
 		return RETURN_ERROR;
 	}
@@ -321,7 +321,7 @@ LONG openGUILibraries() {
 	#endif
 
 	#ifdef __AMIGAOS3__
-	if ((LayoutBase = OpenLibrary("gadgets/layout.gadget", 45)) == NULL) {
+	if ((LayoutBase = OpenLibrary("gadgets/layout.gadget", 44)) == NULL) {
 		printf("Could not open layout.gadget\n");
 		return RETURN_ERROR;
 	}
@@ -385,7 +385,7 @@ LONG openGUILibraries() {
 	#endif
 
 	#ifdef __AMIGAOS3__
-	if ((ScrollerBase = OpenLibrary("gadgets/scroller.gadget", 45)) == NULL) {
+	if ((ScrollerBase = OpenLibrary("gadgets/scroller.gadget", 44)) == NULL) {
 		printf("Could not open scroller.gadget\n");
 		return RETURN_ERROR;
 	}
@@ -401,7 +401,7 @@ LONG openGUILibraries() {
 	#endif
 
 	#ifdef __AMIGAOS3__
-	if ((StringBase = OpenLibrary("gadgets/string.gadget", 45)) == NULL) {
+	if ((StringBase = OpenLibrary("gadgets/string.gadget", 44)) == NULL) {
 		printf("Could not open string.gadget\n");
 		return RETURN_ERROR;
 	}
@@ -1461,9 +1461,7 @@ LONG startGUIRunLoop() {
 					break;
 				case WMHI_MENUPICK:
 				{
-					struct Menu *menuStrip;
-					GetAttr(WINDOW_MenuStrip, mainWindowObject, &menuStrip);
-					struct MenuItem *menuItem = ItemAddress(menuStrip, code);
+					struct MenuItem *menuItem = ItemAddress(menu, code);
 					ULONG itemIndex = GTMENUITEM_USERDATA(menuItem);
 					switch (itemIndex) {
 						case MENU_ITEM_ABOUT_ID:

src/version.h

@@ -1,2 +1,2 @@
-#define APP_VERSION "1.2.0"
-#define BUILD_NUMBER "1576"
+#define APP_VERSION "1.2.1"
+#define BUILD_NUMBER "1586"