From 92ecc77768dc86ed6a8d2d9aa1b0f49567878b2c Mon Sep 17 00:00:00 2001 From: Michael Drake Date: Sat, 10 Jun 2017 18:10:07 +0100 Subject: Core window: Ensure all front ends initialise drag_status. --- docs/core-window-interface.md | 4 ++-- frontends/amiga/corewindow.c | 1 + frontends/framebuffer/corewindow.c | 3 ++- frontends/framebuffer/corewindow.h | 2 +- frontends/gtk/corewindow.c | 4 ++-- frontends/gtk/corewindow.h | 2 +- frontends/windows/corewindow.c | 3 ++- frontends/windows/corewindow.h | 2 +- 8 files changed, 12 insertions(+), 9 deletions(-) diff --git a/docs/core-window-interface.md b/docs/core-window-interface.md index 09c29990d..8f6951f9f 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 776becdc5..1a94dd3b2 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 bde488a25..93f88ff61 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 ce15c7473..5546c09b6 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 0049d1587..ddc61c717 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 90bfd6193..6100e67ae 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 9bed837b6..3c31c5e46 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 b78c72e8c..cffae3cbd 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; -- cgit v1.2.3