From 73eb9f49b58826cac63564674494716908562bff Mon Sep 17 00:00:00 2001 From: Vincent Sanders Date: Thu, 16 Oct 2014 22:30:38 +0100 Subject: update cocoa frontend to cope with split operation tables --- cocoa/DownloadWindowController.m | 4 ++-- cocoa/NetsurfApp.m | 14 ++++++-------- cocoa/SearchWindowController.m | 2 +- cocoa/fetch.m | 2 +- cocoa/gui.m | 8 +++++--- cocoa/selection.m | 2 +- 6 files changed, 16 insertions(+), 16 deletions(-) (limited to 'cocoa') diff --git a/cocoa/DownloadWindowController.m b/cocoa/DownloadWindowController.m index e7b78a4ec..e9a13e631 100644 --- a/cocoa/DownloadWindowController.m +++ b/cocoa/DownloadWindowController.m @@ -19,9 +19,9 @@ #import "cocoa/DownloadWindowController.h" #import "cocoa/gui.h" -#import "desktop/download.h" -#import "desktop/gui.h" #import "utils/log.h" +#import "desktop/download.h" +#import "desktop/gui_download.h" @interface DownloadWindowController () diff --git a/cocoa/NetsurfApp.m b/cocoa/NetsurfApp.m index c30a77c55..3bd5f43f8 100644 --- a/cocoa/NetsurfApp.m +++ b/cocoa/NetsurfApp.m @@ -25,21 +25,19 @@ #import "cocoa/selection.h" #import "cocoa/fetch.h" -#import "desktop/gui.h" +#import "utils/filename.h" +#import "utils/log.h" +#import "utils/messages.h" +#import "utils/utils.h" #import "content/urldb.h" -#import "desktop/gui.h" -#import "desktop/mouse.h" -#import "desktop/netsurf.h" #import "utils/nsoption.h" #import "desktop/plotters.h" #import "desktop/save_complete.h" #import "desktop/textinput.h" #import "desktop/tree.h" #import "render/html.h" -#import "utils/filename.h" -#import "utils/log.h" -#import "utils/messages.h" -#import "utils/utils.h" +#import "desktop/mouse.h" +#import "desktop/netsurf.h" #ifndef NETSURF_HOMEPAGE #define NETSURF_HOMEPAGE "http://www.netsurf-browser.org/welcome/" diff --git a/cocoa/SearchWindowController.m b/cocoa/SearchWindowController.m index e4dfb737f..1c896a958 100644 --- a/cocoa/SearchWindowController.m +++ b/cocoa/SearchWindowController.m @@ -20,7 +20,7 @@ #import "cocoa/SearchWindowController.h" #import "cocoa/BrowserViewController.h" -#import "desktop/gui.h" +#import "desktop/gui_search.h" #import "desktop/browser.h" #import "desktop/search.h" diff --git a/cocoa/fetch.m b/cocoa/fetch.m index df424c3e8..278b80134 100644 --- a/cocoa/fetch.m +++ b/cocoa/fetch.m @@ -20,7 +20,7 @@ #import "utils/log.h" #import "utils/nsurl.h" -#import "desktop/gui.h" +#import "desktop/gui_fetch.h" #import "cocoa/fetch.h" diff --git a/cocoa/gui.m b/cocoa/gui.m index 440174ec0..eadf1d7d1 100644 --- a/cocoa/gui.m +++ b/cocoa/gui.m @@ -27,12 +27,14 @@ #import "cocoa/fetch.h" #import "cocoa/schedule.h" -#import "desktop/gui.h" -#import "desktop/browser_private.h" #import "utils/nsoption.h" -#import "desktop/textinput.h" #import "utils/utils.h" #import "utils/log.h" +#import "desktop/mouse.h" +#import "desktop/gui_window.h" +#import "desktop/gui_misc.h" +#import "desktop/browser_private.h" +#import "desktop/textinput.h" #import "image/ico.h" #import "content/fetchers/resource.h" #import "content/hlcache.h" diff --git a/cocoa/selection.m b/cocoa/selection.m index c8d6c7d5e..2dd0c64c5 100644 --- a/cocoa/selection.m +++ b/cocoa/selection.m @@ -21,7 +21,7 @@ #import "cocoa/BrowserViewController.h" #import "cocoa/selection.h" -#import "desktop/gui.h" +#import "desktop/gui_clipboard.h" #import "desktop/browser_private.h" -- cgit v1.2.3