From 19742c826aca5494a1f10e3a869190531e7ae25b Mon Sep 17 00:00:00 2001
From: Chris Young <chris@unsatisfactorysoftware.co.uk>
Date: Wed, 8 May 2019 17:51:53 +0100
Subject: Make gadget object enum private to gui.c

---
 frontends/amiga/gui.c         | 39 +++++++++++++++++++++++++++++++++++++++
 frontends/amiga/gui.h         | 39 ---------------------------------------
 frontends/amiga/gui_options.c |  3 ++-
 3 files changed, 41 insertions(+), 40 deletions(-)

diff --git a/frontends/amiga/gui.c b/frontends/amiga/gui.c
index 7cef291b0..7af15d7bd 100644
--- a/frontends/amiga/gui.c
+++ b/frontends/amiga/gui.c
@@ -193,6 +193,45 @@
 
 extern struct gui_utf8_table *amiga_utf8_table;
 
+enum
+{
+    OID_MAIN = 0,
+	OID_VSCROLL,
+	OID_HSCROLL,
+	GID_MAIN,
+	GID_TABLAYOUT,
+	GID_BROWSER,
+	GID_STATUS,
+	GID_URL,
+	GID_ICON,
+	GID_STOP,
+	GID_RELOAD,
+	GID_HOME,
+	GID_BACK,
+	GID_FORWARD,
+	GID_THROBBER,
+	GID_SEARCH_ICON,
+	GID_FAVE,
+	GID_FAVE_ADD,
+	GID_FAVE_RMV,
+	GID_CLOSETAB,
+	GID_CLOSETAB_BM,
+	GID_ADDTAB,
+	GID_ADDTAB_BM,
+	GID_TABS,
+	GID_TABS_FLAG,
+	GID_SEARCHSTRING,
+	GID_TOOLBARLAYOUT,
+	GID_HOTLIST,
+	GID_HOTLISTLAYOUT,
+	GID_HOTLISTSEPBAR,
+	GID_HSCROLL,
+	GID_HSCROLLLAYOUT,
+	GID_VSCROLL,
+	GID_VSCROLLLAYOUT,
+	GID_LAST
+};
+
 struct gui_window_2 {
 	struct ami_generic_window w;
 	struct Window *win;
diff --git a/frontends/amiga/gui.h b/frontends/amiga/gui.h
index 265698f18..359e2dc25 100644
--- a/frontends/amiga/gui.h
+++ b/frontends/amiga/gui.h
@@ -47,45 +47,6 @@ enum {
 	AMI_WIN_MAIN
 };
 
-enum
-{
-    OID_MAIN = 0,
-	OID_VSCROLL,
-	OID_HSCROLL,
-	GID_MAIN,
-	GID_TABLAYOUT,
-	GID_BROWSER,
-	GID_STATUS,
-	GID_URL,
-	GID_ICON,
-	GID_STOP,
-	GID_RELOAD,
-	GID_HOME,
-	GID_BACK,
-	GID_FORWARD,
-	GID_THROBBER,
-	GID_SEARCH_ICON,
-	GID_FAVE,
-	GID_FAVE_ADD,
-	GID_FAVE_RMV,
-	GID_CLOSETAB,
-	GID_CLOSETAB_BM,
-	GID_ADDTAB,
-	GID_ADDTAB_BM,
-	GID_TABS,
-	GID_TABS_FLAG,
-	GID_SEARCHSTRING,
-	GID_TOOLBARLAYOUT,
-	GID_HOTLIST,
-	GID_HOTLISTLAYOUT,
-	GID_HOTLISTSEPBAR,
-	GID_HSCROLL,
-	GID_HSCROLLLAYOUT,
-	GID_VSCROLL,
-	GID_VSCROLLLAYOUT,
-	GID_LAST
-};
-
 struct find_window;
 struct ami_history_local_window;
 struct ami_menu_data;
diff --git a/frontends/amiga/gui_options.c b/frontends/amiga/gui_options.c
index 7e302c357..9b6cc8d20 100755
--- a/frontends/amiga/gui_options.c
+++ b/frontends/amiga/gui_options.c
@@ -83,7 +83,8 @@
 
 enum
 {
-	GID_OPTS_MAIN = GID_MAIN,
+	OID_MAIN = 0,
+	GID_OPTS_MAIN,
 	GID_OPTS_HOMEPAGE,
 	GID_OPTS_HOMEPAGE_DEFAULT,
 	GID_OPTS_HOMEPAGE_CURRENT,
-- 
cgit v1.2.3