From 499ef68c0ca2a1f4f4fa43e958107f217838e198 Mon Sep 17 00:00:00 2001 From: Vincent Sanders Date: Thu, 5 Sep 2019 21:44:27 +0100 Subject: remove unsused junk gtk_history_window structure and functions --- frontends/gtk/scaffolding.c | 5 ----- frontends/gtk/scaffolding.h | 25 +++++-------------------- frontends/gtk/toolbar.c | 6 ++++++ 3 files changed, 11 insertions(+), 25 deletions(-) diff --git a/frontends/gtk/scaffolding.c b/frontends/gtk/scaffolding.c index 14ed23058..1022e76df 100644 --- a/frontends/gtk/scaffolding.c +++ b/frontends/gtk/scaffolding.c @@ -1310,11 +1310,6 @@ GtkWidget *nsgtk_scaffolding_urlbar(struct nsgtk_scaffolding *g) return NULL;//g->url_bar; } -/* exported interface documented in gtk/scaffolding.h */ -GtkToolbar *nsgtk_scaffolding_toolbar(struct nsgtk_scaffolding *g) -{ - return NULL;//g->tool_bar; -} /* exported interface documented in gtk/scaffolding.h */ struct gtk_search *nsgtk_scaffolding_search(struct nsgtk_scaffolding *g) diff --git a/frontends/gtk/scaffolding.h b/frontends/gtk/scaffolding.h index 16aaf0310..89212a351 100644 --- a/frontends/gtk/scaffolding.h +++ b/frontends/gtk/scaffolding.h @@ -29,20 +29,12 @@ struct gui_search_web_table; struct nsurl; - -struct gtk_history_window { - struct nsgtk_scaffolding *g; - GtkWindow *window; - GtkScrolledWindow *scrolled; - GtkDrawingArea *drawing_area; -}; - struct gtk_search { - GtkToolbar *bar; - GtkEntry *entry; - GtkToolButton *buttons[3]; /* back, forward, */ - GtkCheckButton *checkAll; /* close */ - GtkCheckButton *caseSens; + GtkToolbar *bar; + GtkEntry *entry; + GtkToolButton *buttons[3]; /* back, forward, */ + GtkCheckButton *checkAll; + GtkCheckButton *caseSens; }; @@ -101,18 +93,11 @@ GtkNotebook *nsgtk_scaffolding_notebook(struct nsgtk_scaffolding *g); */ GtkWidget *nsgtk_scaffolding_urlbar(struct nsgtk_scaffolding *g); -/** - * Get the gtk toolbar from a scaffold. - */ -GtkToolbar *nsgtk_scaffolding_toolbar(struct nsgtk_scaffolding *g); - struct gtk_search *nsgtk_scaffolding_search(struct nsgtk_scaffolding *g); GtkMenuBar *nsgtk_scaffolding_menu_bar(struct nsgtk_scaffolding *g); -struct gtk_history_window *nsgtk_scaffolding_history_window(struct nsgtk_scaffolding *g); - struct gui_window *nsgtk_scaffolding_top_level(struct nsgtk_scaffolding *g); diff --git a/frontends/gtk/toolbar.c b/frontends/gtk/toolbar.c index f595c05d9..5a7d252ad 100644 --- a/frontends/gtk/toolbar.c +++ b/frontends/gtk/toolbar.c @@ -233,6 +233,12 @@ nsgtk_toolbar_##name##_data_minus(GtkWidget *widget, \ #undef TOOLBAR_ITEM +/* exported interface documented in gtk/scaffolding.h */ +static GtkToolbar *nsgtk_scaffolding_toolbar(struct nsgtk_scaffolding *g) +{ + return NULL;//g->tool_bar; +} + /** * get default image for buttons / menu items from gtk stock items. * -- cgit v1.2.3