From 3b4dea6241a09f745f7c4c54c302e6b4a0052680 Mon Sep 17 00:00:00 2001 From: Vincent Sanders Date: Thu, 16 Oct 2014 09:54:49 +0100 Subject: Update framebuffer frontend to cope with split operations table headers --- framebuffer/clipboard.c | 2 +- framebuffer/fetch.c | 3 +-- framebuffer/font_freetype.c | 2 +- framebuffer/font_internal.c | 2 +- framebuffer/gui.c | 11 ++++++----- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/framebuffer/clipboard.c b/framebuffer/clipboard.c index 3729cd49b..323e8deff 100644 --- a/framebuffer/clipboard.c +++ b/framebuffer/clipboard.c @@ -27,7 +27,7 @@ #include "utils/log.h" #include "desktop/browser.h" -#include "desktop/gui.h" +#include "desktop/gui_clipboard.h" #include "framebuffer/gui.h" #include "framebuffer/clipboard.h" diff --git a/framebuffer/fetch.c b/framebuffer/fetch.c index b32a95168..6ae100734 100644 --- a/framebuffer/fetch.c +++ b/framebuffer/fetch.c @@ -29,13 +29,12 @@ #include "utils/log.h" #include "utils/filepath.h" #include "utils/file.h" -#include "desktop/gui.h" +#include "desktop/gui_fetch.h" #include "framebuffer/findfile.h" #include "framebuffer/fetch.h" - /** * Translate resource to full url. * diff --git a/framebuffer/font_freetype.c b/framebuffer/font_freetype.c index 3469a95ec..c5a18da50 100644 --- a/framebuffer/font_freetype.c +++ b/framebuffer/font_freetype.c @@ -27,7 +27,7 @@ #include "utils/utf8.h" #include "utils/log.h" #include "utils/nsoption.h" -#include "desktop/gui.h" +#include "desktop/gui_utf8.h" #include "desktop/font.h" #include "desktop/browser.h" diff --git a/framebuffer/font_internal.c b/framebuffer/font_internal.c index 4ac850448..fba298f3e 100644 --- a/framebuffer/font_internal.c +++ b/framebuffer/font_internal.c @@ -24,7 +24,7 @@ #include "utils/nsoption.h" #include "utils/utf8.h" -#include "desktop/gui.h" +#include "desktop/gui_utf8.h" #include "desktop/font.h" #include "framebuffer/gui.h" diff --git a/framebuffer/gui.c b/framebuffer/gui.c index f580347b4..db884ec13 100644 --- a/framebuffer/gui.c +++ b/framebuffer/gui.c @@ -31,11 +31,6 @@ #include #include -#include "desktop/browser_history.h" -#include "desktop/gui.h" -#include "desktop/mouse.h" -#include "desktop/plotters.h" -#include "desktop/netsurf.h" #include "utils/utils.h" #include "utils/nsoption.h" #include "utils/filepath.h" @@ -44,6 +39,12 @@ #include "utils/types.h" #include "desktop/textinput.h" #include "render/form.h" +#include "desktop/browser_history.h" +#include "desktop/mouse.h" +#include "desktop/plotters.h" +#include "desktop/gui_window.h" +#include "desktop/gui_misc.h" +#include "desktop/netsurf.h" #include "framebuffer/gui.h" #include "framebuffer/fbtk.h" -- cgit v1.2.3