diff options
| author | Vincent Sanders <vince@kyllikki.org> | 2019-09-03 19:33:22 +0100 |
|---|---|---|
| committer | Daniel Silverstone <dsilvers@digital-scurf.org> | 2019-09-21 10:53:41 +0100 |
| commit | 64b2f355dc8b1779996f9cb981b1e9ddebd7d7cd (patch) | |
| tree | 8c77fdf289640b20a249978b04635228501923f8 /frontends/gtk/toolbar.c | |
| parent | ec62f346e11bc17c9d7c9955697503f309162fb3 (diff) | |
| download | netsurf-64b2f355dc8b1779996f9cb981b1e9ddebd7d7cd.tar.gz netsurf-64b2f355dc8b1779996f9cb981b1e9ddebd7d7cd.tar.bz2 | |
use toolbar_items to generate more boilerplate code through macros
Diffstat (limited to 'frontends/gtk/toolbar.c')
| -rw-r--r-- | frontends/gtk/toolbar.c | 25 |
1 files changed, 22 insertions, 3 deletions
diff --git a/frontends/gtk/toolbar.c b/frontends/gtk/toolbar.c index e27d6a89e..02097ea13 100644 --- a/frontends/gtk/toolbar.c +++ b/frontends/gtk/toolbar.c @@ -202,7 +202,7 @@ int nsgtk_toolbar_get_id_from_widget(GtkWidget *widget, struct nsgtk_scaffolding /* define data plus and data minus handlers */ -#define TOOLBAR_ITEM(identifier, name, sensitivity, clicked) \ +#define TOOLBAR_ITEM(identifier, name, sensitivity, clicked, activate) \ static gboolean \ nsgtk_toolbar_##name##_data_plus(GtkWidget *widget, \ GdkDragContext *cont, \ @@ -3058,6 +3058,19 @@ localhistory_button_clicked_cb(GtkWidget *widget, gpointer data) return TRUE; } +/** + * handler for history tool bar item clicked signal + * + * \param widget The widget the signal is being delivered to. + * \param data The toolbar context passed when the signal was connected + * \return TRUE + */ +static gboolean +history_button_clicked_cb(GtkWidget *widget, gpointer data) +{ + return localhistory_button_clicked_cb(widget, data); +} + /** * handler for global history tool bar item clicked signal @@ -3283,14 +3296,20 @@ toolbar_item_create(nsgtk_toolbar_button id, /* set item defaults from macro */ switch (id) { -#define TOOLBAR_ITEM(identifier, name, snstvty, clicked) \ +#define TOOLBAR_ITEM_y(name) \ + item->bhandler = name##_button_clicked_cb; +#define TOOLBAR_ITEM_n(name) \ + item->bhandler = NULL; +#define TOOLBAR_ITEM(identifier, name, snstvty, clicked, activate) \ case identifier: \ item->sensitivity = snstvty; \ item->dataplus = nsgtk_toolbar_##name##_data_plus; \ item->dataminus = nsgtk_toolbar_##name##_data_minus; \ - item->bhandler = clicked; \ + TOOLBAR_ITEM_ ## clicked(name) \ break; #include "gtk/toolbar_items.h" +#undef TOOLBAR_ITEM_y +#undef TOOLBAR_ITEM_n #undef TOOLBAR_ITEM case PLACEHOLDER_BUTTON: |