From aa4f56049cb08592df7b23ef565b28c88a29786c Mon Sep 17 00:00:00 2001 From: Ole Loots Date: Sun, 30 Jan 2011 22:03:19 +0000 Subject: Implemented gui_scroll_visible. svn path=/trunk/netsurf/; revision=11540 --- atari/gui.c | 6 ++++-- atari/gui.h | 4 +++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/atari/gui.c b/atari/gui.c index c7147bb39..1c242d83c 100755 --- a/atari/gui.c +++ b/atari/gui.c @@ -71,6 +71,7 @@ #include "atari/res/netsurf.rsh" #include "atari/plot.h" #include "atari/clipboard.h" +#include "atari/osspec.h" #define TODO() (0)/*printf("%s Unimplemented!\n", __FUNCTION__)*/ @@ -356,7 +357,7 @@ void gui_window_set_status(struct gui_window *w, const char *text) { if (w == NULL || text == NULL ) return; - sb_set_text( w , (char*)text ); + window_set_stauts( w , (char*)text ); } void gui_window_redraw(struct gui_window *gw, int x0, int y0, int x1, int y1) @@ -436,6 +437,7 @@ void gui_window_set_scroll(struct gui_window *w, int sx, int sy) void gui_window_scroll_visible(struct gui_window *w, int x0, int y0, int x1, int y1) { LOG(("%s:(%p, %d, %d, %d, %d)", __func__, w, x0, y0, x1, y1)); + gui_window_set_scroll(w,x0,y0); } void gui_window_position_frame(struct gui_window *gw, int x0, int y0, int x1, int y1) @@ -1100,7 +1102,7 @@ static void gui_init2(int argc, char** argv) const char *addr = NETSURF_HOMEPAGE; MenuBar( h_gem_menu , 1 ); bind_global_events(); - if( gdosversion > TOS4VER ) { + if( atari_sysinfo.gdosversion > TOS4VER ) { menu_register( _AESapid, (char*)" NetSurf "); } } diff --git a/atari/gui.h b/atari/gui.h index dad25fa80..f19636ee9 100755 --- a/atari/gui.h +++ b/atari/gui.h @@ -178,7 +178,9 @@ struct s_toolbar struct s_statusbar { COMPONENT * comp; - char text[255]; + char text[STATUSBAR_MAX_SLEN+1]; + size_t textlen; + bool attached; }; struct s_caret -- cgit v1.2.3