From 27b6096dcd8a38fa0200cec6dfe25f05529efa7c Mon Sep 17 00:00:00 2001 From: Michael Drake Date: Fri, 11 Feb 2011 19:35:16 +0000 Subject: Move stuct rect out of box.h and tree.c. svn path=/trunk/netsurf/; revision=11647 --- desktop/shape.h | 32 ++++++++++++++++++++++++++++++++ desktop/tree.c | 5 ----- render/box.h | 6 +----- 3 files changed, 33 insertions(+), 10 deletions(-) create mode 100644 desktop/shape.h diff --git a/desktop/shape.h b/desktop/shape.h new file mode 100644 index 000000000..c322602b9 --- /dev/null +++ b/desktop/shape.h @@ -0,0 +1,32 @@ +/* + * Copyright 2011 Michael Drake + * + * 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 . + */ + +/** \file + * Core mouse state. + */ + +#ifndef _NETSURF_DESKTOP_SHAPE_H_ +#define _NETSURF_DESKTOP_SHAPE_H_ + +/* Rectangle coordinates */ +struct rect { + int x0, y0; + int x1, y1; +}; + +#endif diff --git a/desktop/tree.c b/desktop/tree.c index fc194b830..ddffef698 100644 --- a/desktop/tree.c +++ b/desktop/tree.c @@ -159,11 +159,6 @@ struct tree { callbacks */ }; -struct rect { - int x0; int y0; /* Top left coordinate */ - int x1; int y1; /* Bottom right coordinate */ -}; - void tree_set_icon_dir(char *icon_dir) { LOG(("Tree icon directory set to %s", icon_dir)); diff --git a/render/box.h b/render/box.h index 5889645b2..7cde3728f 100644 --- a/render/box.h +++ b/render/box.h @@ -92,6 +92,7 @@ #include #include "desktop/browser.h" +#include "desktop/shape.h" #include "css/css.h" struct box; @@ -110,11 +111,6 @@ typedef enum { BOX_INLINE_END, BOX_NONE } box_type; -struct rect { - int x0, y0; - int x1, y1; -}; - /* Sides of a box */ enum box_side { TOP, RIGHT, BOTTOM, LEFT }; -- cgit v1.2.3