Update windows frontend to cope with split operations table headers

This commit is contained in:
Vincent Sanders 2014-10-16 09:51:53 +01:00
parent ac70da346c
commit f0a4422701
10 changed files with 40 additions and 46 deletions

View File

@ -24,14 +24,14 @@
#include <shlobj.h> #include <shlobj.h>
#include <windows.h> #include <windows.h>
#include "content/fetch.h"
#include "desktop/gui.h"
#include "desktop/download.h"
#include "utils/log.h" #include "utils/log.h"
#include "utils/messages.h" #include "utils/messages.h"
#include "utils/url.h" #include "utils/url.h"
#include "utils/nsurl.h" #include "utils/nsurl.h"
#include "utils/utils.h" #include "utils/utils.h"
#include "content/fetch.h"
#include "desktop/gui_download.h"
#include "desktop/download.h"
#include "windows/download.h" #include "windows/download.h"
#include "windows/gui.h" #include "windows/gui.h"

View File

@ -21,7 +21,6 @@
#include <time.h> #include <time.h>
#include <windows.h> #include <windows.h>
#include "desktop/gui.h"
extern struct gui_download_table *win32_download_table; extern struct gui_download_table *win32_download_table;

View File

@ -1,7 +1,6 @@
/* /*
* Copyright 2005 James Bursa <bursa@users.sourceforge.net> * Copyright 2009 - 2014 Vincent Sanders <vince@netsurf-browser.org>
* Copyright 2008 Vincent Sanders <vince@simtec.co.uk> * Copyright 2009 - 2013 Michael Drake <tlsa@netsurf-browser.org>
* Copyright 2009 Mark Benjamin <netsurf-browser.org.MarkBenjamin@dfgh.net>
* *
* This file is part of NetSurf, http://www.netsurf-browser.org/ * This file is part of NetSurf, http://www.netsurf-browser.org/
* *
@ -18,21 +17,24 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include <inttypes.h> /**
* \file
#include <assert.h> * Windows font handling implementation.
*/
#include "utils/config.h" #include "utils/config.h"
#include <inttypes.h>
#include <assert.h>
#include <windows.h> #include <windows.h>
#include "desktop/font.h"
#include "utils/nsoption.h" #include "utils/nsoption.h"
#include "utils/utf8.h" #include "utils/utf8.h"
#include "desktop/font.h"
#include "desktop/gui_utf8.h"
#include "windows/font.h" #include "windows/font.h"
#include "windows/gui.h"
#include "windows/plot.h" HWND font_hwnd;
nserror utf8_to_font_encoding(const struct font_desc* font, nserror utf8_to_font_encoding(const struct font_desc* font,
const char *string, const char *string,

View File

@ -20,8 +20,7 @@
#ifndef _NETSURF_WINDOWS_FONT_H_ #ifndef _NETSURF_WINDOWS_FONT_H_
#define _NETSURF_WINDOWS_FONT_H_ #define _NETSURF_WINDOWS_FONT_H_
#include <windows.h> extern HWND font_hwnd;
#include "utils/utf8.h"
struct font_desc { struct font_desc {
const char *name; const char *name;

View File

@ -17,18 +17,23 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "utils/config.h"
#include <sys/types.h> #include <sys/types.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <fcntl.h> #include <fcntl.h>
#include <unistd.h> #include <unistd.h>
#include <string.h> #include <string.h>
#include "utils/config.h"
#include <windows.h> #include <windows.h>
#include <windowsx.h> #include <windowsx.h>
#include <commctrl.h> #include <commctrl.h>
#include "utils/log.h"
#include "utils/messages.h"
#include "utils/utils.h"
#include "utils/file.h"
#include "utils/corestrings.h"
#include "utils/url.h"
#include "content/urldb.h" #include "content/urldb.h"
#include "content/fetch.h" #include "content/fetch.h"
#include "desktop/browser_history.h" #include "desktop/browser_history.h"
@ -38,12 +43,10 @@
#include "desktop/plotters.h" #include "desktop/plotters.h"
#include "desktop/textinput.h" #include "desktop/textinput.h"
#include "render/html.h" #include "render/html.h"
#include "utils/log.h" #include "desktop/gui_window.h"
#include "utils/messages.h" #include "desktop/gui_clipboard.h"
#include "utils/utils.h" #include "desktop/gui_misc.h"
#include "utils/file.h" #include "desktop/gui_fetch.h"
#include "utils/corestrings.h"
#include "utils/url.h"
#include "windows/window.h" #include "windows/window.h"
#include "windows/about.h" #include "windows/about.h"
@ -66,7 +69,6 @@ HINSTANCE hInstance; /** win32 application instance handle. */
struct gui_window *input_window = NULL; struct gui_window *input_window = NULL;
struct gui_window *search_current_window; struct gui_window *search_current_window;
struct gui_window *window_list = NULL; struct gui_window *window_list = NULL;
HWND font_hwnd;
static int open_windows = 0; static int open_windows = 0;

View File

@ -20,10 +20,6 @@
#ifndef _NETSURF_WINDOWS_GUI_H_ #ifndef _NETSURF_WINDOWS_GUI_H_
#define _NETSURF_WINDOWS_GUI_H_ #define _NETSURF_WINDOWS_GUI_H_
#include <windows.h>
#include "desktop/gui.h"
#include "windows/localhistory.h"
struct gui_file_table *win32_file_table; struct gui_file_table *win32_file_table;
extern struct gui_window_table *win32_window_table; extern struct gui_window_table *win32_window_table;
extern struct gui_clipboard_table *win32_clipboard_table; extern struct gui_clipboard_table *win32_clipboard_table;
@ -61,7 +57,6 @@ struct nsws_pointers {
extern struct gui_window *window_list; extern struct gui_window *window_list;
extern char *options_file_location; extern char *options_file_location;
extern HWND font_hwnd;
HWND gui_window_main_window(struct gui_window *); HWND gui_window_main_window(struct gui_window *);
HWND gui_window_toolbar(struct gui_window *); HWND gui_window_toolbar(struct gui_window *);

View File

@ -25,7 +25,7 @@ void nsws_localhistory_open(struct gui_window *gw);
void nsws_localhistory_close(struct gui_window *gw); void nsws_localhistory_close(struct gui_window *gw);
/* creates localhistory window */ /* creates localhistory window */
struct nsws_localhistory * nsws_window_create_localhistory(struct gui_window *gw); struct nsws_localhistory *nsws_window_create_localhistory(struct gui_window *gw);
nserror nsws_create_localhistory_class(HINSTANCE hinstance); nserror nsws_create_localhistory_class(HINSTANCE hinstance);

View File

@ -16,29 +16,28 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include <limits.h>
#include <stdbool.h>
#include "utils/config.h" #include "utils/config.h"
#include <limits.h>
#include <stdbool.h>
#include <windows.h> #include <windows.h>
#include "desktop/gui.h"
#include "utils/nsoption.h"
#include "desktop/browser.h"
#include "desktop/netsurf.h"
#include "utils/utils.h" #include "utils/utils.h"
#include "utils/log.h" #include "utils/log.h"
#include "utils/messages.h" #include "utils/messages.h"
#include "utils/filepath.h" #include "utils/filepath.h"
#include "utils/file.h" #include "utils/file.h"
#include "utils/nsurl.h" #include "utils/nsurl.h"
#include "content/fetchers/resource.h" #include "utils/nsoption.h"
#include "desktop/browser.h"
#include "desktop/gui_fetch.h"
#include "desktop/netsurf.h"
#include "windows/findfile.h" #include "windows/findfile.h"
#include "windows/drawable.h" #include "windows/drawable.h"
#include "windows/gui.h"
#include "windows/download.h" #include "windows/download.h"
#include "windows/localhistory.h"
#include "windows/gui.h"
static char **respaths; /** resource search path vector. */ static char **respaths; /** resource search path vector. */

View File

@ -17,20 +17,19 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "utils/config.h"
#include <sys/types.h> #include <sys/types.h>
#include <stdint.h> #include <stdint.h>
#include <string.h> #include <string.h>
#include <limits.h> #include <limits.h>
#include <math.h> #include <math.h>
#include "utils/config.h"
#include <windows.h> #include <windows.h>
#include "utils/log.h" #include "utils/log.h"
#include "utils/utf8.h" #include "utils/utf8.h"
#include "utils/utils.h" #include "utils/utils.h"
#include "desktop/gui.h" #include "desktop/mouse.h"
#include "desktop/gui_window.h"
#include "desktop/plotters.h" #include "desktop/plotters.h"
#include "windows/bitmap.h" #include "windows/bitmap.h"

View File

@ -17,7 +17,6 @@
*/ */
#include <windows.h> #include <windows.h>
#include "desktop/gui.h"
extern const struct plotter_table win_plotters; extern const struct plotter_table win_plotters;