summaryrefslogtreecommitdiff
path: root/render
diff options
context:
space:
mode:
Diffstat (limited to 'render')
-rw-r--r--render/form.c8
-rw-r--r--render/form.h76
-rw-r--r--render/form_internal.h4
3 files changed, 6 insertions, 82 deletions
diff --git a/render/form.c b/render/form.c
index a9944265f..f8d0ce5fd 100644
--- a/render/form.c
+++ b/render/form.c
@@ -1402,7 +1402,7 @@ static nserror form__select_process_selection(html_content *html,
return ret;
}
-/* exported interface documented in render/form.h */
+/* exported interface documented in netsurf/form.h */
nserror form_select_process_selection(struct form_control *control, int item)
{
assert(control != NULL);
@@ -1410,7 +1410,7 @@ nserror form_select_process_selection(struct form_control *control, int item)
return form__select_process_selection(control->html, control, item);
}
-/* exported interface documented in render/form.h */
+/* exported interface documented in netsurf/form.h */
struct form_option *
form_select_get_option(struct form_control *control, int item)
{
@@ -1424,13 +1424,13 @@ form_select_get_option(struct form_control *control, int item)
return opt;
}
-/* exported interface documented in render/form.h */
+/* exported interface documented in netsurf/form.h */
char *form_control_get_name(struct form_control *control)
{
return control->name;
}
-/* exported interface documented in render/form.h */
+/* exported interface documented in netsurf/form.h */
nserror form_control_bounding_rect(struct form_control *control, struct rect *r)
{
box_bounds( control->box, r );
diff --git a/render/form.h b/render/form.h
deleted file mode 100644
index 744ac32e7..000000000
--- a/render/form.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * Copyright 2003 Phil Mellor <monkeyson@users.sourceforge.net>
- * Copyright 2003 James Bursa <bursa@users.sourceforge.net>
- * Copyright 2009 Paul Blokus <paul_pl@users.sourceforge.net>
- *
- * 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 <http://www.gnu.org/licenses/>.
- */
-
-/** \file
- * Form handling functions (interface).
- */
-
-#ifndef _NETSURF_RENDER_FORM_H_
-#define _NETSURF_RENDER_FORM_H_
-
-struct form_control;
-struct rect;
-
-/** Option in a select. */
-struct form_option {
- void *node; /**< Corresponding DOM node */
- bool selected;
- bool initial_selected;
- char *value;
- char *text; /**< NUL terminated. */
- struct form_option* next;
-};
-
-/**
- * Process a selection from a form select menu.
- *
- * \param control form control with menu.
- * \param item index of item selected from the menu.
- */
-nserror form_select_process_selection(struct form_control *control, int item);
-
-/**
- * get a form select menus option.
- *
- * \param control The form control.
- * \param item The index of the menu entry to return.
- * \return The form option at that index.
- */
-struct form_option *form_select_get_option(struct form_control *control, int item);
-
-/**
- * Get a form control name
- *
- * \param control The form control
- * \return The form control name
- */
-char *form_control_get_name(struct form_control *control);
-
-
-/**
- * Get a form control bounding rectangle
- *
- * \param[in] control The form control
- * \param[out] r The rectangle to place the bounds in.
- * \return NSERROR_OK on success or error code.
- */
-nserror form_control_bounding_rect(struct form_control *control, struct rect *r);
-
-#endif
diff --git a/render/form_internal.h b/render/form_internal.h
index ea46b6a78..0ffb6b46c 100644
--- a/render/form_internal.h
+++ b/render/form_internal.h
@@ -24,10 +24,10 @@
#ifndef _NETSURF_RENDER_FORM_INTERNAL_H_
#define _NETSURF_RENDER_FORM_INTERNAL_H_
-#include "render/form.h"
-
#include <stdbool.h>
+#include "netsurf/form.h"
+
struct box;
struct form_control;
struct form_option;