From f502ca3e6940c4c587e964f5ad6b06115fd6fd00 Mon Sep 17 00:00:00 2001
From: Vincent Sanders <vince@kyllikki.org>
Date: Thu, 16 Oct 2014 22:22:51 +0100
Subject: update beos frontend to cope with updated operation table

---
 beos/about.cpp       |  1 +
 beos/download.cpp    |  2 +-
 beos/gui.cpp         | 24 +++++++++++++-----------
 beos/login.cpp       |  2 +-
 beos/scaffolding.cpp |  2 +-
 beos/window.cpp      |  3 +++
 beos/window.h        |  1 -
 7 files changed, 20 insertions(+), 15 deletions(-)

(limited to 'beos')

diff --git a/beos/about.cpp b/beos/about.cpp
index bfa9908c7..7db71453d 100644
--- a/beos/about.cpp
+++ b/beos/about.cpp
@@ -26,6 +26,7 @@ extern "C" {
 #include "testament.h"
 #include "utils/useragent.h"
 #include "curl/curlver.h"
+#include "desktop/gui_clipboard.h"
 }
 #include "beos/about.h"
 #include "beos/scaffolding.h"
diff --git a/beos/download.cpp b/beos/download.cpp
index af5b49840..791da3558 100644
--- a/beos/download.cpp
+++ b/beos/download.cpp
@@ -22,7 +22,7 @@
 
 extern "C" {
 #include "desktop/download.h"
-#include "desktop/gui.h"
+#include "desktop/gui_download.h"
 #include "utils/utils.h"
 }
 #include "beos/download.h"
diff --git a/beos/gui.cpp b/beos/gui.cpp
index 22b06b336..dab0e6097 100644
--- a/beos/gui.cpp
+++ b/beos/gui.cpp
@@ -44,6 +44,14 @@
 
 extern "C" {
 
+#include "utils/nsoption.h"
+#include "utils/filename.h"
+#include "utils/log.h"
+#include "utils/messages.h"
+#include "utils/url.h"
+#include "utils/utf8.h"
+#include "utils/utils.h"
+
 #include "content/content.h"
 #include "content/content_protected.h"
 #include "content/fetch.h"
@@ -52,21 +60,16 @@ extern "C" {
 #include "content/hlcache.h"
 #include "content/urldb.h"
 #include "desktop/browser_private.h"
-#include "desktop/gui.h"
+#include "desktop/gui_misc.h"
+#include "desktop/gui_clipboard.h"
+#include "desktop/gui_search.h"
+#include "desktop/gui_fetch.h"
 #include "desktop/netsurf.h"
-#include "utils/nsoption.h"
-
 #include "render/form.h"
-#include "utils/filename.h"
-#include "utils/log.h"
-#include "utils/messages.h"
-#include "utils/url.h"
-#include "utils/utf8.h"
-#include "utils/utils.h"
+
 }
 
 #include "beos/gui.h"
-
 #include "beos/gui_options.h"
 //#include "beos/completion.h"
 #include "beos/window.h"
@@ -77,7 +80,6 @@ extern "C" {
 #include "beos/fetch_rsrc.h"
 #include "beos/scaffolding.h"
 
-
 static void *myrealloc(void *ptr, size_t len, void *pw);
 
 //TODO: use resources
diff --git a/beos/login.cpp b/beos/login.cpp
index a82fd54a3..7689c9d35 100644
--- a/beos/login.cpp
+++ b/beos/login.cpp
@@ -31,10 +31,10 @@ extern "C" {
 #include "content/content.h"
 #include "content/urldb.h"
 #include "desktop/browser.h"
-#include "desktop/gui.h"
 #include "utils/messages.h"
 #include "utils/url.h"
 #include "utils/utils.h"
+#include "desktop/gui_clipboard.h"
 }
 #include "beos/gui.h"
 #include "beos/scaffolding.h"
diff --git a/beos/scaffolding.cpp b/beos/scaffolding.cpp
index 4881e8a41..05dc7d8bd 100644
--- a/beos/scaffolding.cpp
+++ b/beos/scaffolding.cpp
@@ -54,7 +54,6 @@ extern "C" {
 #include "content/content.h"
 #include "desktop/browser_history.h"
 #include "desktop/browser_private.h"
-#include "desktop/gui.h"
 #include "desktop/netsurf.h"
 #include "desktop/version.h"
 #include "desktop/plotters.h"
@@ -65,6 +64,7 @@ extern "C" {
 #include "utils/messages.h"
 #include "utils/utils.h"
 #include "utils/log.h"
+#include "desktop/gui_clipboard.h"
 }
 #include "beos/about.h"
 #include "beos/bitmap.h"
diff --git a/beos/window.cpp b/beos/window.cpp
index 50ee9af96..44dd8e5ac 100644
--- a/beos/window.cpp
+++ b/beos/window.cpp
@@ -32,6 +32,9 @@ extern "C" {
 #include "utils/types.h"
 #include "utils/utf8.h"
 #include "utils/utils.h"
+#include "desktop/mouse.h"
+#include "desktop/gui_window.h"
+#include "desktop/gui_clipboard.h"
 }
 #include "beos/about.h"
 #include "beos/window.h"
diff --git a/beos/window.h b/beos/window.h
index af814d817..0aec92ff1 100644
--- a/beos/window.h
+++ b/beos/window.h
@@ -21,7 +21,6 @@
 
 extern "C" {
 #include "content/content.h"
-#include "desktop/gui.h"
 #include "desktop/browser.h"
 }
 #include "beos/scaffolding.h"
-- 
cgit v1.2.3