summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Drake <tlsa@netsurf-browser.org>2017-06-10 17:10:07 (GMT)
committer Michael Drake <tlsa@netsurf-browser.org>2017-06-10 17:10:07 (GMT)
commit92ecc77768dc86ed6a8d2d9aa1b0f49567878b2c (patch)
tree02982f038df3a866bd59c368de2eebafcc7fab01
parent50371731e33d34d587d00e0090018bfea9cb2d9e (diff)
downloadnetsurf-92ecc77768dc86ed6a8d2d9aa1b0f49567878b2c.tar.gz
netsurf-92ecc77768dc86ed6a8d2d9aa1b0f49567878b2c.tar.bz2
Core window: Ensure all front ends initialise drag_status.
-rw-r--r--docs/core-window-interface.md4
-rw-r--r--frontends/amiga/corewindow.c1
-rw-r--r--frontends/framebuffer/corewindow.c3
-rw-r--r--frontends/framebuffer/corewindow.h2
-rw-r--r--frontends/gtk/corewindow.c4
-rw-r--r--frontends/gtk/corewindow.h2
-rw-r--r--frontends/windows/corewindow.c3
-rw-r--r--frontends/windows/corewindow.h2
8 files changed, 12 insertions, 9 deletions
diff --git a/docs/core-window-interface.md b/docs/core-window-interface.md
index 09c2999..8f6951f 100644
--- a/docs/core-window-interface.md
+++ b/docs/core-window-interface.md
@@ -156,7 +156,7 @@ frontends/example/corewindow.h
/** drag status set by core */
- core_window_drag_status drag_staus;
+ core_window_drag_status drag_status;
/** table of callbacks for core window operations */
struct core_window_callback_table *cb_table;
@@ -357,7 +357,7 @@ frontends/example/corewindow.c
example_cw_drag_status(struct core_window *cw, core_window_drag_status ds)
{
struct example_corewindow *example_cw = (struct example_corewindow *)cw;
- example_cw->drag_staus = ds;
+ example_cw->drag_status = ds;
}
diff --git a/frontends/amiga/corewindow.c b/frontends/amiga/corewindow.c
index 776becd..1a94dd3 100644
--- a/frontends/amiga/corewindow.c
+++ b/frontends/amiga/corewindow.c
@@ -920,6 +920,7 @@ nserror ami_corewindow_init(struct ami_corewindow *ami_cw)
{
/* setup the core window callback table */
ami_cw->cb_table = &ami_cw_cb_table;
+ ami_cw->drag_status = CORE_WINDOW_DRAG_NONE;
/* clear some vars */
ami_cw->mouse_state = BROWSER_MOUSE_HOVER;
diff --git a/frontends/framebuffer/corewindow.c b/frontends/framebuffer/corewindow.c
index bde488a..93f88ff 100644
--- a/frontends/framebuffer/corewindow.c
+++ b/frontends/framebuffer/corewindow.c
@@ -171,7 +171,7 @@ static void
fb_cw_drag_status(struct core_window *cw, core_window_drag_status ds)
{
struct fb_corewindow *fb_cw = (struct fb_corewindow *)cw;
- fb_cw->drag_staus = ds;
+ fb_cw->drag_status = ds;
}
@@ -192,6 +192,7 @@ nserror fb_corewindow_init(fbtk_widget_t *parent, struct fb_corewindow *fb_cw)
/* setup the core window callback table */
fb_cw->cb_table = &fb_cw_cb_table;
+ fb_cw->drag_status = CORE_WINDOW_DRAG_NONE;
/* container window */
fb_cw->wnd = fbtk_create_window(parent, 0, 0, 0, 0, 0);
diff --git a/frontends/framebuffer/corewindow.h b/frontends/framebuffer/corewindow.h
index ce15c74..5546c09 100644
--- a/frontends/framebuffer/corewindow.h
+++ b/frontends/framebuffer/corewindow.h
@@ -47,7 +47,7 @@ struct fb_corewindow {
/** drag status set by core */
- core_window_drag_status drag_staus;
+ core_window_drag_status drag_status;
/** table of callbacks for core window operations */
struct core_window_callback_table *cb_table;
diff --git a/frontends/gtk/corewindow.c b/frontends/gtk/corewindow.c
index 0049d15..ddc61c7 100644
--- a/frontends/gtk/corewindow.c
+++ b/frontends/gtk/corewindow.c
@@ -662,7 +662,7 @@ static void
nsgtk_cw_drag_status(struct core_window *cw, core_window_drag_status ds)
{
struct nsgtk_corewindow *nsgtk_cw = (struct nsgtk_corewindow *)cw;
- nsgtk_cw->drag_staus = ds;
+ nsgtk_cw->drag_status = ds;
}
@@ -682,7 +682,7 @@ static struct core_window_callback_table nsgtk_cw_cb_table = {
nserror nsgtk_corewindow_init(struct nsgtk_corewindow *nsgtk_cw)
{
nsgtk_cw->cb_table = &nsgtk_cw_cb_table;
- nsgtk_cw->drag_staus = CORE_WINDOW_DRAG_NONE;
+ nsgtk_cw->drag_status = CORE_WINDOW_DRAG_NONE;
/* input method setup */
nsgtk_cw->input_method = gtk_im_multicontext_new();
diff --git a/frontends/gtk/corewindow.h b/frontends/gtk/corewindow.h
index 90bfd61..6100e67 100644
--- a/frontends/gtk/corewindow.h
+++ b/frontends/gtk/corewindow.h
@@ -51,7 +51,7 @@ struct nsgtk_corewindow {
/** mouse state */
struct nsgtk_corewindow_mouse mouse_state;
/** drag status set by core */
- core_window_drag_status drag_staus;
+ core_window_drag_status drag_status;
/**
* callback to draw on drawable area of nsgtk core window
diff --git a/frontends/windows/corewindow.c b/frontends/windows/corewindow.c
index 9bed837..3c31c5e 100644
--- a/frontends/windows/corewindow.c
+++ b/frontends/windows/corewindow.c
@@ -486,7 +486,7 @@ static void
nsw32_cw_drag_status(struct core_window *cw, core_window_drag_status ds)
{
struct nsw32_corewindow *nsw32_cw = (struct nsw32_corewindow *)cw;
- nsw32_cw->drag_staus = ds;
+ nsw32_cw->drag_status = ds;
}
@@ -508,6 +508,7 @@ nsw32_corewindow_init(HINSTANCE hInstance,
/* setup the core window callback table */
nsw32_cw->cb_table = &nsw32_cw_cb_table;
+ nsw32_cw->drag_status = CORE_WINDOW_DRAG_NONE;
/* start with the content area being as small as possible */
nsw32_cw->content_width = -1;
diff --git a/frontends/windows/corewindow.h b/frontends/windows/corewindow.h
index b78c72e..cffae3c 100644
--- a/frontends/windows/corewindow.h
+++ b/frontends/windows/corewindow.h
@@ -38,7 +38,7 @@ struct nsw32_corewindow {
const char *title;
/** drag status set by core */
- core_window_drag_status drag_staus;
+ core_window_drag_status drag_status;
/** table of callbacks for core window operations */
struct core_window_callback_table *cb_table;