From 8057dc67cb11c865cb5daf2142fbef35631e7c6d Mon Sep 17 00:00:00 2001 From: Ole Loots Date: Mon, 16 Sep 2013 02:26:43 +0200 Subject: Replaced atari_treeview wrapper with a new one (removed all modules which used the old tree API) --- atari/treeview.h | 82 +++++++++++++++++++++++--------------------------------- 1 file changed, 34 insertions(+), 48 deletions(-) mode change 100755 => 100644 atari/treeview.h (limited to 'atari/treeview.h') diff --git a/atari/treeview.h b/atari/treeview.h old mode 100755 new mode 100644 index 664b3a4d1..f8e4c4264 --- a/atari/treeview.h +++ b/atari/treeview.h @@ -1,55 +1,41 @@ -/* - * Copyright 2010 Ole Loots - * - * This file is part of NetSurf, http://www.netsurf-browser.org/ - * - * NetSurf is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 2 of the License. - * - * NetSurf is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . +/* + * Copyright 2013 Ole Loots + * + * This file is part of NetSurf, http://www.netsurf-browser.org/ + * + * NetSurf is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 2 of the License. + * + * NetSurf is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . */ -#ifndef NS_ATARI_TREEVIEW_H -#define NS_ATARI_TREEVIEW_H - -#include -#include "desktop/tree.h" -#include "atari/gui.h" -#include "atari/gemtk/gemtk.h" - -#define ATARI_TREEVIEW_WIDGETS (CLOSER | MOVER | SIZER| NAME | FULLER | SMALLER | VSLIDE | HSLIDE | UPARROW | DNARROW | LFARROW | RTARROW) - -struct atari_treeview -{ - struct tree * tree; - GUIWIN * window; - bool disposing; - bool redraw; - GRECT rdw_area; - POINT extent; - POINT click; - POINT startdrag; - gemtk_wm_event_handler_f user_func; +#ifndef NSATARI_TREEVIEW_H +#define NSATARI_TREEVIEW_H + +struct atari_treeview_callbacks { + nserror (*init)(struct core_window *cw, + struct core_window_callback_table * default_callbacks); + void (*fini)(struct core_window *cw); + void (*draw)(struct core_window *cw); + void (*keypress)(struct core_window *cw); + void (*mouse)(struct core_window *cw); + gemtk_wm_event_handler_f gemtk_user_func; }; -typedef struct atari_treeview * NSTREEVIEW; - -NSTREEVIEW atari_treeview_create( uint32_t flags, GUIWIN *win, - gemtk_wm_event_handler_f user_func); -void atari_treeview_destroy( NSTREEVIEW tv ); -void atari_treeview_open( NSTREEVIEW tv ); -void atari_treeview_close( NSTREEVIEW tv ); -void atari_treeview_request_redraw(int x, int y, int w, int h, void *pw); -void atari_treeview_redraw( NSTREEVIEW tv ); -bool atari_treeview_mevent( NSTREEVIEW tv, browser_mouse_state bms, int x, int y); +struct atari_treeview_callbacks; +struct atari_treeview_window; +struct atari_treeview_window * +atari_treeview_create(GUIWIN *win, struct atari_treeview_callbacks * callbacks, + uint32_t flags); +void atari_treeview_delete(struct atari_treeview_window * cw); +#endif //NSATARI_TREEVIEW_H -#endif -- cgit v1.2.3