diff options
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/frames.h | 2 | ||||
| -rw-r--r-- | desktop/gui_window.h | 3 | ||||
| -rw-r--r-- | desktop/scrollbar.c | 10 | ||||
| -rw-r--r-- | desktop/scrollbar.h | 2 | ||||
| -rw-r--r-- | desktop/selection.c | 2 | ||||
| -rw-r--r-- | desktop/textarea.c | 1 | ||||
| -rw-r--r-- | desktop/textarea.h | 3 | ||||
| -rw-r--r-- | desktop/textinput.c | 1 |
8 files changed, 11 insertions, 13 deletions
diff --git a/desktop/frames.h b/desktop/frames.h index d5aca073e..15efb7d67 100644 --- a/desktop/frames.h +++ b/desktop/frames.h @@ -23,8 +23,6 @@ #ifndef _NETSURF_DESKTOP_FRAMES_H_ #define _NETSURF_DESKTOP_FRAMES_H_ -#include "desktop/browser.h" - struct scrollbar_msg_data; void browser_window_create_iframes(struct browser_window *bw, diff --git a/desktop/gui_window.h b/desktop/gui_window.h index e38923dbb..f5240a6b4 100644 --- a/desktop/gui_window.h +++ b/desktop/gui_window.h @@ -60,6 +60,7 @@ struct browser_window; struct form_control; struct rect; struct hlcache_handle; +enum gui_pointer_shape; /** * Graphical user interface window function table. @@ -204,7 +205,7 @@ struct gui_window_table { /** * Change mouse pointer shape */ - void (*set_pointer)(struct gui_window *g, gui_pointer_shape shape); + void (*set_pointer)(struct gui_window *g, enum gui_pointer_shape shape); /** * Place the caret in a browser window. diff --git a/desktop/scrollbar.c b/desktop/scrollbar.c index c4da77cc0..bbf9ebfab 100644 --- a/desktop/scrollbar.c +++ b/desktop/scrollbar.c @@ -25,15 +25,17 @@ #include <stdbool.h> #include <stdlib.h> +#include "utils/log.h" +#include "utils/messages.h" +#include "utils/utils.h" +#include "utils/nsoption.h" + +#include "desktop/browser.h" #include "desktop/system_colour.h" #include "desktop/mouse.h" #include "desktop/scrollbar.h" -#include "utils/nsoption.h" #include "desktop/plotters.h" #include "desktop/plot_style.h" -#include "utils/log.h" -#include "utils/messages.h" -#include "utils/utils.h" struct scrollbar { diff --git a/desktop/scrollbar.h b/desktop/scrollbar.h index fb1773761..bfe90d9b5 100644 --- a/desktop/scrollbar.h +++ b/desktop/scrollbar.h @@ -26,8 +26,6 @@ #include <stdbool.h> #include <limits.h> -#include "desktop/browser.h" - #define SCROLLBAR_WIDTH 16 /* Region dependent values for scrollbar_scroll function */ diff --git a/desktop/selection.c b/desktop/selection.c index 8ed850a59..0f395a7a2 100644 --- a/desktop/selection.c +++ b/desktop/selection.c @@ -37,8 +37,8 @@ #include "render/font.h" #include "render/textplain.h" -#include "desktop/browser_private.h" #include "desktop/mouse.h" +#include "desktop/browser_private.h" #include "desktop/plotters.h" #include "desktop/save_text.h" #include "desktop/selection.h" diff --git a/desktop/textarea.c b/desktop/textarea.c index 625a58f9c..8d4fd137d 100644 --- a/desktop/textarea.c +++ b/desktop/textarea.c @@ -31,6 +31,7 @@ #include "utils/utf8.h" #include "utils/utils.h" +#include "desktop/browser.h" #include "desktop/mouse.h" #include "desktop/textarea.h" #include "desktop/textinput.h" diff --git a/desktop/textarea.h b/desktop/textarea.h index 1c24dd1cc..0927f4bbb 100644 --- a/desktop/textarea.h +++ b/desktop/textarea.h @@ -26,9 +26,6 @@ #include <stdint.h> #include <stdbool.h> -#include "desktop/browser.h" -#include "desktop/plot_style.h" - struct textarea; diff --git a/desktop/textinput.c b/desktop/textinput.c index 852fb3fc8..31cf9e071 100644 --- a/desktop/textinput.c +++ b/desktop/textinput.c @@ -38,6 +38,7 @@ #include "render/html_internal.h" #include "render/layout.h" +#include "desktop/mouse.h" #include "desktop/browser_private.h" #include "desktop/textinput.h" #include "desktop/gui_window.h" |