confine the gui table acessor to the gui factory header

This commit is contained in:
Vincent Sanders 2014-01-14 20:05:14 +00:00
parent 8dfe225153
commit 667d4a0a49
7 changed files with 14 additions and 7 deletions

View File

@ -47,6 +47,7 @@
#include "desktop/frames.h" #include "desktop/frames.h"
#include "desktop/global_history.h" #include "desktop/global_history.h"
#include "desktop/gui.h" #include "desktop/gui.h"
#include "desktop/gui_factory.h"
#include "desktop/hotlist.h" #include "desktop/hotlist.h"
#include "desktop/knockout.h" #include "desktop/knockout.h"
#include "desktop/local_history.h" #include "desktop/local_history.h"

View File

@ -27,6 +27,7 @@
#include "content/llcache.h" #include "content/llcache.h"
#include "desktop/download.h" #include "desktop/download.h"
#include "desktop/gui.h" #include "desktop/gui.h"
#include "desktop/gui_factory.h"
#include "utils/http.h" #include "utils/http.h"
#include "utils/url.h" #include "utils/url.h"
#include "utils/utils.h" #include "utils/utils.h"

View File

@ -64,6 +64,13 @@ struct gui_window;
struct gui_download_window; struct gui_download_window;
struct browser_window; struct browser_window;
struct form_control; struct form_control;
struct ssl_cert_info;
typedef struct nsnsclipboard_styles {
size_t start; /**< Start of run */
plot_font_style_t style; /**< Style to give text run */
} nsclipboard_styles;
/** Graphical user interface window function table /** Graphical user interface window function table
* *
@ -294,7 +301,6 @@ struct gui_table {
void (*set_search_ico)(hlcache_handle *ico); void (*set_search_ico)(hlcache_handle *ico);
}; };
extern struct gui_table *guit; /* the gui vtable */
@ -325,11 +331,6 @@ void gui_create_form_select_menu(struct browser_window *bw,
*/ */
void gui_get_clipboard(char **buffer, size_t *length); void gui_get_clipboard(char **buffer, size_t *length);
typedef struct nsnsclipboard_styles {
size_t start; /**< Start of run */
plot_font_style_t style; /**< Style to give text run */
} nsclipboard_styles;
/** /**
* Core tells front end to put given text in clipboard * Core tells front end to put given text in clipboard
@ -344,7 +345,6 @@ void gui_set_clipboard(const char *buffer, size_t length,
struct ssl_cert_info;
void gui_cert_verify(nsurl *url, const struct ssl_cert_info *certs, void gui_cert_verify(nsurl *url, const struct ssl_cert_info *certs,
unsigned long num, nserror (*cb)(bool proceed, void *pw), unsigned long num, nserror (*cb)(bool proceed, void *pw),

View File

@ -25,6 +25,8 @@
struct gui_table; struct gui_table;
extern struct gui_table *guit; /* the gui vtable */
nserror gui_factory_register(struct gui_table *gt); nserror gui_factory_register(struct gui_table *gt);
#endif #endif

View File

@ -27,6 +27,7 @@
#include "content/hlcache.h" #include "content/hlcache.h"
#include "desktop/browser.h" #include "desktop/browser.h"
#include "desktop/gui.h" #include "desktop/gui.h"
#include "desktop/gui_factory.h"
#include "utils/nsoption.h" #include "utils/nsoption.h"
#include "desktop/searchweb.h" #include "desktop/searchweb.h"
#include "utils/config.h" #include "utils/config.h"

View File

@ -30,6 +30,7 @@
#include "desktop/browser_private.h" #include "desktop/browser_private.h"
#include "desktop/gui.h" #include "desktop/gui.h"
#include "desktop/gui_factory.h"
#include "desktop/mouse.h" #include "desktop/mouse.h"
#include "desktop/plotters.h" #include "desktop/plotters.h"
#include "desktop/save_text.h" #include "desktop/save_text.h"

View File

@ -31,6 +31,7 @@
#include "desktop/browser_private.h" #include "desktop/browser_private.h"
#include "desktop/gui.h" #include "desktop/gui.h"
#include "desktop/gui_factory.h"
#include "desktop/mouse.h" #include "desktop/mouse.h"
#include "desktop/scrollbar.h" #include "desktop/scrollbar.h"
#include "desktop/selection.h" #include "desktop/selection.h"