diff options
author | Vincent Sanders <vince@kyllikki.org> | 2014-07-06 11:01:39 +0100 |
---|---|---|
committer | Vincent Sanders <vince@kyllikki.org> | 2014-07-06 11:01:39 +0100 |
commit | caf918d2f28f600184036aef3f096024d3af62a7 (patch) | |
tree | 9f5d9d541bb3885e4841c45374664872706e69c9 | |
parent | 0f151e37cba454fcb863b6b38e1780f2b04be903 (diff) | |
download | netsurf-caf918d2f28f600184036aef3f096024d3af62a7.tar.gz netsurf-caf918d2f28f600184036aef3f096024d3af62a7.tar.bz2 |
fixup merge of scheduled reformat
-rw-r--r-- | atari/deskmenu.c | 8 | ||||
-rwxr-xr-x | atari/rootwin.c | 2 | ||||
-rw-r--r-- | cocoa/gui.m | 2 | ||||
-rw-r--r-- | framebuffer/gui.c | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/atari/deskmenu.c b/atari/deskmenu.c index 53e24a4d4..96b2d02ce 100644 --- a/atari/deskmenu.c +++ b/atari/deskmenu.c @@ -394,8 +394,8 @@ static void __CDECL menu_inc_scale(short item, short title, void *data) if(input_window == NULL) return; - browser_window_set_scale(input_window->bw, - browser_window_get_scale(input_window->bw) + 0.25, + browser_window_set_scale(input_window->browser->bw, + browser_window_get_scale(input_window->browser->bw) + 0.25, true); } @@ -405,8 +405,8 @@ static void __CDECL menu_dec_scale(short item, short title, void *data) if(input_window == NULL) return; - browser_window_set_scale(input_window->bw, - browser_window_get_scale(input_window->bw) - 0.25, + browser_window_set_scale(input_window->browser->bw, + browser_window_get_scale(input_window->browser->bw) - 0.25, true); } diff --git a/atari/rootwin.c b/atari/rootwin.c index 7c2cdbcf1..a9c958e04 100755 --- a/atari/rootwin.c +++ b/atari/rootwin.c @@ -834,7 +834,7 @@ static void window_redraw_content(ROOTWIN *rootwin, GRECT *content_area, plot_set_dimensions(content_area->g_x, content_area->g_y, content_area->g_w, content_area->g_h); - oldscale = plot_set_scale(browser_window_get_scale(rootwin->active_gui_window->bw)); + oldscale = plot_set_scale(browser_window_get_scale(rootwin->active_gui_window->browser->bw)); /* first, we make the coords relative to the content area: */ content_area_rel.g_x = clip->g_x - content_area->g_x; diff --git a/cocoa/gui.m b/cocoa/gui.m index 405dab9c2..8f08fc7fa 100644 --- a/cocoa/gui.m +++ b/cocoa/gui.m @@ -135,7 +135,7 @@ static void gui_window_set_scroll(struct gui_window *g, int sx, int sy) static void cocoa_window_reformat(struct gui_window *gw) { if (gw != NULL) { - [[(BrowserViewController *)g browserView] reformat ]; + [[(BrowserViewController *)gw browserView] reformat ]; } } diff --git a/framebuffer/gui.c b/framebuffer/gui.c index 727319f0f..2a691f7f6 100644 --- a/framebuffer/gui.c +++ b/framebuffer/gui.c @@ -1758,7 +1758,7 @@ gui_window_remove_caret(struct gui_window *g) } } -static void nsgtk_window_reformat(struct gui_window *gw) +static void framebuffer_window_reformat(struct gui_window *gw) { /** @todo if we ever do zooming reformat should be implemented */ LOG(("window:%p", gw)); |