From c08ef5f984fe785b6e13df204046b455489f8810 Mon Sep 17 00:00:00 2001 From: Vincent Sanders Date: Thu, 1 Jun 2017 23:57:09 +0100 Subject: make windows frontend use corewindow API for local history window --- frontends/windows/window.c | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) (limited to 'frontends/windows/window.c') diff --git a/frontends/windows/window.c b/frontends/windows/window.c index 6ba61c546..976974cfa 100644 --- a/frontends/windows/window.c +++ b/frontends/windows/window.c @@ -49,7 +49,7 @@ #include "windows/drawable.h" #include "windows/font.h" #include "windows/prefs.h" -#include "windows/localhistory.h" +#include "windows/local_history.h" #include "windows/hotlist.h" #include "windows/cookies.h" #include "windows/global_history.h" @@ -879,6 +879,7 @@ static void nsws_window_update_forward_back(struct gui_window *w) MAKELONG((back ? TBSTATE_ENABLED : TBSTATE_INDETERMINATE), 0)); } + nsw32_local_history_hide(); } @@ -1148,7 +1149,7 @@ nsws_window_command(HWND hwnd, break; case IDM_NAV_LOCALHISTORY: - gw->localhistory = nsws_window_create_localhistory(gw); + nsw32_local_history_present(gw->main, gw->bw); break; case IDM_NAV_GLOBALHISTORY: @@ -1436,6 +1437,7 @@ nsws_window_event_callback(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) case WM_NCDESTROY: RemoveProp(hwnd, TEXT("GuiWnd")); + nsw32_local_history_hide(); browser_window_destroy(gw->bw); if (--open_windows <= 0) { win32_set_quit(true); @@ -1948,12 +1950,3 @@ HWND gui_window_main_window(struct gui_window *w) return NULL; return w->main; } - - -/* exported interface documented in windows/window.h */ -struct nsws_localhistory *gui_window_localhistory(struct gui_window *w) -{ - if (w == NULL) - return NULL; - return w->localhistory; -} -- cgit v1.2.3