summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--desktop/browser.c2
-rw-r--r--desktop/gui_factory.c2
-rw-r--r--desktop/selection.c2
-rw-r--r--desktop/textinput.c2
-rw-r--r--frontends/amiga/arexx.c2
-rw-r--r--frontends/amiga/bitmap.c2
-rw-r--r--frontends/amiga/clipboard.c2
-rwxr-xr-xfrontends/amiga/cookies.c2
-rw-r--r--frontends/amiga/download.c2
-rw-r--r--frontends/amiga/drag.h2
-rw-r--r--frontends/amiga/file.c2
-rw-r--r--frontends/amiga/font_scan.c2
-rw-r--r--frontends/amiga/gui.c2
-rw-r--r--frontends/amiga/gui.h2
-rwxr-xr-xfrontends/amiga/gui_options.c2
-rwxr-xr-xfrontends/amiga/history.c2
-rwxr-xr-xfrontends/amiga/history_local.c2
-rwxr-xr-xfrontends/amiga/hotlist.c2
-rwxr-xr-xfrontends/amiga/login.c2
-rw-r--r--frontends/amiga/menu.c2
-rwxr-xr-xfrontends/amiga/misc.c2
-rw-r--r--frontends/amiga/plotters.c2
-rw-r--r--frontends/amiga/print.c2
-rwxr-xr-xfrontends/amiga/search.c2
-rw-r--r--frontends/amiga/sslcert.c2
-rw-r--r--frontends/amiga/theme.c2
-rw-r--r--frontends/amiga/tree.c2
-rw-r--r--frontends/atari/gui.c2
-rw-r--r--frontends/beos/window.cpp2
-rw-r--r--frontends/cocoa/gui.m2
-rw-r--r--frontends/framebuffer/gui.c2
-rw-r--r--frontends/gtk/window.c2
-rw-r--r--frontends/monkey/browser.c2
-rw-r--r--frontends/riscos/global_history.c2
-rw-r--r--frontends/riscos/help.c2
-rw-r--r--frontends/riscos/hotlist.c2
-rw-r--r--frontends/riscos/save.c2
-rw-r--r--frontends/riscos/textselection.c2
-rw-r--r--frontends/riscos/window.c2
-rw-r--r--frontends/windows/plot.c2
-rw-r--r--frontends/windows/window.c2
-rw-r--r--include/netsurf/window.h (renamed from desktop/gui_window.h)0
42 files changed, 41 insertions, 41 deletions
diff --git a/desktop/browser.c b/desktop/browser.c
index 2ee36fd7d..bb39ee393 100644
--- a/desktop/browser.c
+++ b/desktop/browser.c
@@ -71,7 +71,7 @@
#include "desktop/plotters.h"
#include "desktop/theme.h"
#include "desktop/gui_misc.h"
-#include "desktop/gui_window.h"
+#include "netsurf/window.h"
#include "desktop/gui_internal.h"
diff --git a/desktop/gui_factory.c b/desktop/gui_factory.c
index 0aba19751..5ee6326ed 100644
--- a/desktop/gui_factory.c
+++ b/desktop/gui_factory.c
@@ -33,7 +33,7 @@
#include "desktop/gui_download.h"
#include "desktop/gui_fetch.h"
#include "desktop/gui_misc.h"
-#include "desktop/gui_window.h"
+#include "netsurf/window.h"
#include "netsurf/search.h"
#include "desktop/gui_clipboard.h"
#include "desktop/gui_utf8.h"
diff --git a/desktop/selection.c b/desktop/selection.c
index e2bd74722..8f064d4a6 100644
--- a/desktop/selection.c
+++ b/desktop/selection.c
@@ -43,7 +43,7 @@
#include "desktop/save_text.h"
#include "desktop/selection.h"
#include "desktop/gui_clipboard.h"
-#include "desktop/gui_window.h"
+#include "netsurf/window.h"
#include "desktop/gui_internal.h"
/**
diff --git a/desktop/textinput.c b/desktop/textinput.c
index bd51d5a0a..015c66936 100644
--- a/desktop/textinput.c
+++ b/desktop/textinput.c
@@ -41,7 +41,7 @@
#include "desktop/mouse.h"
#include "desktop/browser_private.h"
#include "desktop/textinput.h"
-#include "desktop/gui_window.h"
+#include "netsurf/window.h"
#include "desktop/gui_internal.h"
/* Define to enable textinput debug */
diff --git a/frontends/amiga/arexx.c b/frontends/amiga/arexx.c
index c5b5ab42d..38274f1ae 100644
--- a/frontends/amiga/arexx.c
+++ b/frontends/amiga/arexx.c
@@ -35,7 +35,7 @@
#include "utils/nsurl.h"
#include "content/hlcache.h"
#include "desktop/browser.h"
-#include "desktop/gui_window.h"
+#include "netsurf/window.h"
#include "desktop/version.h"
#include "amiga/arexx.h"
diff --git a/frontends/amiga/bitmap.c b/frontends/amiga/bitmap.c
index cf342d8c7..506ae33bc 100644
--- a/frontends/amiga/bitmap.c
+++ b/frontends/amiga/bitmap.c
@@ -49,7 +49,7 @@
#include "utils/messages.h"
#include "content/hlcache.h"
#include "desktop/mouse.h"
-#include "desktop/gui_window.h"
+#include "netsurf/window.h"
#include "netsurf/bitmap.h"
#include "amiga/gui.h"
diff --git a/frontends/amiga/clipboard.c b/frontends/amiga/clipboard.c
index 12ceb0f09..f906e5f76 100644
--- a/frontends/amiga/clipboard.c
+++ b/frontends/amiga/clipboard.c
@@ -34,7 +34,7 @@
#include "desktop/browser.h"
#include "desktop/plotters.h"
#include "desktop/textinput.h"
-#include "desktop/gui_window.h"
+#include "netsurf/window.h"
#include "desktop/gui_clipboard.h"
#include "amiga/bitmap.h"
diff --git a/frontends/amiga/cookies.c b/frontends/amiga/cookies.c
index 0ca17413e..3181d0ffe 100755
--- a/frontends/amiga/cookies.c
+++ b/frontends/amiga/cookies.c
@@ -20,7 +20,7 @@
#include "desktop/cookie_manager.h"
#include "desktop/mouse.h"
-#include "desktop/gui_window.h"
+#include "netsurf/window.h"
#include "amiga/cookies.h"
#include "amiga/tree.h"
diff --git a/frontends/amiga/download.c b/frontends/amiga/download.c
index c646a5fa2..2b7d0e3e7 100644
--- a/frontends/amiga/download.c
+++ b/frontends/amiga/download.c
@@ -52,7 +52,7 @@
#include "desktop/save_complete.h"
#include "desktop/browser.h"
#include "desktop/mouse.h"
-#include "desktop/gui_window.h"
+#include "netsurf/window.h"
#include "desktop/gui_download.h"
#include "content/handlers/image/ico.h"
diff --git a/frontends/amiga/drag.h b/frontends/amiga/drag.h
index 59a1a8467..b8ccec160 100644
--- a/frontends/amiga/drag.h
+++ b/frontends/amiga/drag.h
@@ -20,7 +20,7 @@
#define AMIGA_DRAG_H
#include <exec/types.h>
#include "desktop/browser.h"
-#include "desktop/gui_window.h"
+#include "netsurf/window.h"
#define AMI_DRAG_THRESHOLD 10
diff --git a/frontends/amiga/file.c b/frontends/amiga/file.c
index 8957ecfe6..3b5d5410b 100644
--- a/frontends/amiga/file.c
+++ b/frontends/amiga/file.c
@@ -33,7 +33,7 @@
#include "desktop/save_complete.h"
#include "desktop/save_pdf.h"
#include "desktop/save_text.h"
-#include "desktop/gui_window.h"
+#include "netsurf/window.h"
#include "amiga/gui.h"
#include "amiga/bitmap.h"
diff --git a/frontends/amiga/font_scan.c b/frontends/amiga/font_scan.c
index b65798d6e..12fb6071d 100644
--- a/frontends/amiga/font_scan.c
+++ b/frontends/amiga/font_scan.c
@@ -49,7 +49,7 @@
#include "utils/log.h"
#include "utils/messages.h"
#include "desktop/mouse.h"
-#include "desktop/gui_window.h"
+#include "netsurf/window.h"
#include "amiga/font_scan.h"
#include "amiga/gui.h"
diff --git a/frontends/amiga/gui.c b/frontends/amiga/gui.c
index b3f417180..88a06c628 100644
--- a/frontends/amiga/gui.c
+++ b/frontends/amiga/gui.c
@@ -112,7 +112,7 @@
#include "desktop/searchweb.h"
#include "desktop/textinput.h"
#include "desktop/tree.h"
-#include "desktop/gui_window.h"
+#include "netsurf/window.h"
#include "desktop/gui_fetch.h"
#include "desktop/gui_misc.h"
diff --git a/frontends/amiga/gui.h b/frontends/amiga/gui.h
index d301ac574..10e89cd9b 100644
--- a/frontends/amiga/gui.h
+++ b/frontends/amiga/gui.h
@@ -25,7 +25,7 @@
#include <dos/dos.h>
#include <devices/inputevent.h>
-#include "desktop/gui_window.h"
+#include "netsurf/window.h"
#include "desktop/mouse.h"
#include "amiga/menu.h"
diff --git a/frontends/amiga/gui_options.c b/frontends/amiga/gui_options.c
index 9402a3fa7..f921b093a 100755
--- a/frontends/amiga/gui_options.c
+++ b/frontends/amiga/gui_options.c
@@ -63,7 +63,7 @@
#include "utils/nsoption.h"
#include "desktop/browser.h"
#include "desktop/searchweb.h"
-#include "desktop/gui_window.h"
+#include "netsurf/window.h"
#include "amiga/file.h"
#include "amiga/font.h"
diff --git a/frontends/amiga/history.c b/frontends/amiga/history.c
index 72b69d435..61425f3d5 100755
--- a/frontends/amiga/history.c
+++ b/frontends/amiga/history.c
@@ -21,7 +21,7 @@
#include "utils/errors.h"
#include "desktop/mouse.h"
-#include "desktop/gui_window.h"
+#include "netsurf/window.h"
#include "amiga/history.h"
#include "amiga/tree.h"
diff --git a/frontends/amiga/history_local.c b/frontends/amiga/history_local.c
index 3016cbf16..3be097fa5 100755
--- a/frontends/amiga/history_local.c
+++ b/frontends/amiga/history_local.c
@@ -47,7 +47,7 @@
#include "desktop/browser_history.h"
#include "desktop/browser.h"
#include "desktop/plotters.h"
-#include "desktop/gui_window.h"
+#include "netsurf/window.h"
#include "graphics/rpattr.h"
#include "amiga/libs.h"
diff --git a/frontends/amiga/hotlist.c b/frontends/amiga/hotlist.c
index 79e679f77..71720cbf4 100755
--- a/frontends/amiga/hotlist.c
+++ b/frontends/amiga/hotlist.c
@@ -22,7 +22,7 @@
#include "utils/nsurl.h"
#include "desktop/hotlist.h"
#include "desktop/mouse.h"
-#include "desktop/gui_window.h"
+#include "netsurf/window.h"
#include "amiga/hotlist.h"
#include "amiga/tree.h"
diff --git a/frontends/amiga/login.c b/frontends/amiga/login.c
index a4c0d62bb..34585159c 100755
--- a/frontends/amiga/login.c
+++ b/frontends/amiga/login.c
@@ -42,7 +42,7 @@
#include "utils/errors.h"
#include "content/urldb.h"
#include "desktop/mouse.h"
-#include "desktop/gui_window.h"
+#include "netsurf/window.h"
#include "amiga/gui.h"
#include "amiga/libs.h"
diff --git a/frontends/amiga/menu.c b/frontends/amiga/menu.c
index 4a30c4878..969a65d38 100644
--- a/frontends/amiga/menu.c
+++ b/frontends/amiga/menu.c
@@ -51,7 +51,7 @@
#include "desktop/hotlist.h"
#include "desktop/browser.h"
#include "desktop/mouse.h"
-#include "desktop/gui_window.h"
+#include "netsurf/window.h"
#include "desktop/textinput.h"
#include "desktop/version.h"
diff --git a/frontends/amiga/misc.c b/frontends/amiga/misc.c
index 2c233584d..1fc037332 100755
--- a/frontends/amiga/misc.c
+++ b/frontends/amiga/misc.c
@@ -36,7 +36,7 @@
#include "utils/nsurl.h"
#include "utils/url.h"
-#include "desktop/gui_window.h"
+#include "netsurf/window.h"
#include "amiga/gui.h"
#include "amiga/misc.h"
diff --git a/frontends/amiga/plotters.c b/frontends/amiga/plotters.c
index fb9c92394..1f7408100 100644
--- a/frontends/amiga/plotters.c
+++ b/frontends/amiga/plotters.c
@@ -39,7 +39,7 @@
#include "utils/log.h"
#include "netsurf/css.h"
#include "desktop/mouse.h"
-#include "desktop/gui_window.h"
+#include "netsurf/window.h"
#include "amiga/plotters.h"
#include "amiga/bitmap.h"
diff --git a/frontends/amiga/print.c b/frontends/amiga/print.c
index fcccc91e2..ef70fe73e 100644
--- a/frontends/amiga/print.c
+++ b/frontends/amiga/print.c
@@ -54,7 +54,7 @@
#include "desktop/print.h"
#include "desktop/gui_layout.h"
#include "desktop/mouse.h"
-#include "desktop/gui_window.h"
+#include "netsurf/window.h"
#include "content/hlcache.h"
#include "amiga/plotters.h"
diff --git a/frontends/amiga/search.c b/frontends/amiga/search.c
index 71ed0033d..2ecb7af53 100755
--- a/frontends/amiga/search.c
+++ b/frontends/amiga/search.c
@@ -51,7 +51,7 @@
#include "desktop/browser.h"
#include "desktop/search.h"
#include "desktop/mouse.h"
-#include "desktop/gui_window.h"
+#include "netsurf/window.h"
#include "netsurf/search.h"
#include "amiga/libs.h"
diff --git a/frontends/amiga/sslcert.c b/frontends/amiga/sslcert.c
index 699ce71b8..ca6501a1a 100644
--- a/frontends/amiga/sslcert.c
+++ b/frontends/amiga/sslcert.c
@@ -21,7 +21,7 @@
#include "utils/nsurl.h"
#include "content/llcache.h"
#include "desktop/mouse.h"
-#include "desktop/gui_window.h"
+#include "netsurf/window.h"
#include "desktop/sslcert_viewer.h"
#include "amiga/tree.h"
diff --git a/frontends/amiga/theme.c b/frontends/amiga/theme.c
index ab32b23dd..f4fed128e 100644
--- a/frontends/amiga/theme.c
+++ b/frontends/amiga/theme.c
@@ -42,7 +42,7 @@
#include "utils/utils.h"
#include "desktop/searchweb.h"
#include "desktop/mouse.h"
-#include "desktop/gui_window.h"
+#include "netsurf/window.h"
#include "amiga/gui.h"
#include "amiga/drag.h"
diff --git a/frontends/amiga/tree.c b/frontends/amiga/tree.c
index f147b5e5c..05c2fa7c5 100644
--- a/frontends/amiga/tree.c
+++ b/frontends/amiga/tree.c
@@ -59,7 +59,7 @@
#include "desktop/cookie_manager.h"
#include "desktop/global_history.h"
#include "desktop/hotlist.h"
-#include "desktop/gui_window.h"
+#include "netsurf/window.h"
#include "desktop/sslcert_viewer.h"
#include "amiga/gui.h"
diff --git a/frontends/atari/gui.c b/frontends/atari/gui.c
index 810c7646f..9e6fd5ea8 100644
--- a/frontends/atari/gui.c
+++ b/frontends/atari/gui.c
@@ -36,7 +36,7 @@
#include "desktop/treeview.h"
#include "desktop/browser.h"
#include "desktop/gui_layout.h"
-#include "desktop/gui_window.h"
+#include "netsurf/window.h"
#include "desktop/gui_clipboard.h"
#include "desktop/gui_fetch.h"
#include "desktop/gui_misc.h"
diff --git a/frontends/beos/window.cpp b/frontends/beos/window.cpp
index 62624f077..2938b154a 100644
--- a/frontends/beos/window.cpp
+++ b/frontends/beos/window.cpp
@@ -33,7 +33,7 @@ extern "C" {
#include "desktop/mouse.h"
#include "desktop/textinput.h"
#include "desktop/plotters.h"
-#include "desktop/gui_window.h"
+#include "netsurf/window.h"
#include "desktop/gui_clipboard.h"
}
diff --git a/frontends/cocoa/gui.m b/frontends/cocoa/gui.m
index c24357dbf..326e286b2 100644
--- a/frontends/cocoa/gui.m
+++ b/frontends/cocoa/gui.m
@@ -22,7 +22,7 @@
#import "utils/utils.h"
#import "utils/log.h"
#import "desktop/mouse.h"
-#import "desktop/gui_window.h"
+#import "netsurf/window.h"
#import "desktop/gui_misc.h"
#import "desktop/browser.h"
#import "desktop/textinput.h"
diff --git a/frontends/framebuffer/gui.c b/frontends/framebuffer/gui.c
index b0b98c546..4a8b7a645 100644
--- a/frontends/framebuffer/gui.c
+++ b/frontends/framebuffer/gui.c
@@ -38,7 +38,7 @@
#include "desktop/textinput.h"
#include "desktop/browser_history.h"
#include "desktop/plotters.h"
-#include "desktop/gui_window.h"
+#include "netsurf/window.h"
#include "desktop/gui_misc.h"
#include "desktop/netsurf.h"
#include "content/urldb.h"
diff --git a/frontends/gtk/window.c b/frontends/gtk/window.c
index de333d1b0..5d49eebf3 100644
--- a/frontends/gtk/window.c
+++ b/frontends/gtk/window.c
@@ -43,7 +43,7 @@
#include "desktop/mouse.h"
#include "desktop/searchweb.h"
#include "desktop/textinput.h"
-#include "desktop/gui_window.h"
+#include "netsurf/window.h"
#include "desktop/plotters.h"
#include "render/form.h"
diff --git a/frontends/monkey/browser.c b/frontends/monkey/browser.c
index dfd2dcf6c..4ae35a1fa 100644
--- a/frontends/monkey/browser.c
+++ b/frontends/monkey/browser.c
@@ -26,7 +26,7 @@
#include "utils/log.h"
#include "utils/messages.h"
#include "desktop/mouse.h"
-#include "desktop/gui_window.h"
+#include "netsurf/window.h"
#include "desktop/browser.h"
#include "desktop/plotters.h"
#include "content/hlcache.h"
diff --git a/frontends/riscos/global_history.c b/frontends/riscos/global_history.c
index c469847e0..88c071c23 100644
--- a/frontends/riscos/global_history.c
+++ b/frontends/riscos/global_history.c
@@ -36,7 +36,7 @@
#include "utils/log.h"
#include "desktop/global_history.h"
#include "desktop/tree.h"
-#include "desktop/gui_window.h"
+#include "netsurf/window.h"
#include "riscos/dialog.h"
#include "riscos/global_history.h"
diff --git a/frontends/riscos/help.c b/frontends/riscos/help.c
index 73cb6957d..faabea708 100644
--- a/frontends/riscos/help.c
+++ b/frontends/riscos/help.c
@@ -28,7 +28,7 @@
#include "utils/messages.h"
#include "utils/utf8.h"
#include "desktop/mouse.h"
-#include "desktop/gui_window.h"
+#include "netsurf/window.h"
#include "riscos/treeview.h"
#include "riscos/help.h"
diff --git a/frontends/riscos/hotlist.c b/frontends/riscos/hotlist.c
index 381978faf..d4acbc687 100644
--- a/frontends/riscos/hotlist.c
+++ b/frontends/riscos/hotlist.c
@@ -39,7 +39,7 @@
#include "content/urldb.h"
#include "desktop/hotlist.h"
#include "desktop/tree.h"
-#include "desktop/gui_window.h"
+#include "netsurf/window.h"
#include "riscos/gui.h"
#include "riscos/dialog.h"
diff --git a/frontends/riscos/save.c b/frontends/riscos/save.c
index 0432b1a23..6eab31533 100644
--- a/frontends/riscos/save.c
+++ b/frontends/riscos/save.c
@@ -48,7 +48,7 @@
#include "desktop/version.h"
#include "desktop/save_complete.h"
#include "desktop/save_text.h"
-#include "desktop/gui_window.h"
+#include "netsurf/window.h"
#include "netsurf/bitmap.h"
#include "render/form.h"
diff --git a/frontends/riscos/textselection.c b/frontends/riscos/textselection.c
index 718171db0..0ddb26ddd 100644
--- a/frontends/riscos/textselection.c
+++ b/frontends/riscos/textselection.c
@@ -32,7 +32,7 @@
#include "utils/utils.h"
#include "content/hlcache.h"
#include "desktop/gui_clipboard.h"
-#include "desktop/gui_window.h"
+#include "netsurf/window.h"
#include "desktop/textinput.h"
#include "desktop/browser.h"
diff --git a/frontends/riscos/window.c b/frontends/riscos/window.c
index b6d074f55..d386685b4 100644
--- a/frontends/riscos/window.c
+++ b/frontends/riscos/window.c
@@ -64,7 +64,7 @@
#include "desktop/plotters.h"
#include "desktop/textinput.h"
#include "desktop/tree.h"
-#include "desktop/gui_window.h"
+#include "netsurf/window.h"
#include "netsurf/bitmap.h"
#include "render/form.h"
diff --git a/frontends/windows/plot.c b/frontends/windows/plot.c
index 86870ea4e..d5ddf4f37 100644
--- a/frontends/windows/plot.c
+++ b/frontends/windows/plot.c
@@ -29,7 +29,7 @@
#include "utils/utf8.h"
#include "utils/utils.h"
#include "desktop/mouse.h"
-#include "desktop/gui_window.h"
+#include "netsurf/window.h"
#include "desktop/plotters.h"
#include "windows/bitmap.h"
diff --git a/frontends/windows/window.c b/frontends/windows/window.c
index f5f13fe24..afc741ff1 100644
--- a/frontends/windows/window.c
+++ b/frontends/windows/window.c
@@ -31,7 +31,7 @@
#include "utils/messages.h"
#include "content/content.h"
#include "desktop/browser.h"
-#include "desktop/gui_window.h"
+#include "netsurf/window.h"
#include "desktop/browser_history.h"
#include "desktop/textinput.h"
diff --git a/desktop/gui_window.h b/include/netsurf/window.h
index 7ecd3c21d..7ecd3c21d 100644
--- a/desktop/gui_window.h
+++ b/include/netsurf/window.h