From 8490662b09696c1c502f0178148e10e1e0fc6da1 Mon Sep 17 00:00:00 2001 From: Ole Loots Date: Wed, 23 Nov 2011 22:38:38 +0000 Subject: Moved static declarations. svn path=/trunk/netsurf/; revision=13175 --- atari/global_evnt.c | 20 +++++++++++++++----- atari/global_evnt.h | 11 ----------- 2 files changed, 15 insertions(+), 16 deletions(-) diff --git a/atari/global_evnt.c b/atari/global_evnt.c index e466c2fb4..72529da83 100755 --- a/atari/global_evnt.c +++ b/atari/global_evnt.c @@ -66,7 +66,18 @@ extern short last_drag_y; #define T_HELP MAINMENU_T_NAVIGATE - MAINMENU_T_FILE + 1 /* Count of the above defines: */ #define NUM_MENU_TITLES 7 -static char * menu_titles[NUM_MENU_TITLES] = {NULL}; +static char * menu_titles[NUM_MENU_TITLES] = {NULL}; + +/* Global event handlers: */ +static void __CDECL global_evnt_apterm( WINDOW * win, short buff[8] ); +static void __CDECL global_evnt_menu( WINDOW * win, short buff[8] ); +static void __CDECL global_evnt_keybd( WINDOW * win, short buff[8], void * data); + +/* Menu event handlers: */ +static void __CDECL menu_about(WINDOW *win, int item, int title, void *data); + +static char * get_accel(int mode, char * message, struct s_accelerator * accel); +static int parse_accel( char * message, struct s_accelerator * accel); /* Menu event handlers: */ @@ -327,10 +338,9 @@ void __CDECL global_evnt_keybd( WINDOW * win, short buff[8], void * data) if( kstate & (K_LSHIFT|K_RSHIFT)) kstate |= K_LSHIFT|K_RSHIFT; if( window_url_widget_has_focus( gw ) ) { - /* make sure we report for the root window and report...: */ - done = tb_url_input( gw, nkc ); - if( done ) return; - } else { + /* make sure we report for the root window and report...: */ + done = tb_url_input( gw, nkc ); + } else { gw_tmp = window_list; /* search for active browser component: */ while( gw_tmp != NULL && done == false ) { diff --git a/atari/global_evnt.h b/atari/global_evnt.h index 33ff69dc1..6325271e3 100755 --- a/atari/global_evnt.h +++ b/atari/global_evnt.h @@ -63,16 +63,5 @@ void global_track_mouse_state( LGRECT * bwrect, bool within, short, short, short void bind_global_events( void ); void unbind_global_events( void ); -/* Global event handlers: */ -static void __CDECL global_evnt_apterm( WINDOW * win, short buff[8] ); -static void __CDECL global_evnt_menu( WINDOW * win, short buff[8] ); -static void __CDECL global_evnt_keybd( WINDOW * win, short buff[8], void * data); - -/* Menu event handlers: */ -static void __CDECL menu_about(WINDOW *win, int item, int title, void *data); - - -static char * get_accel(int mode, char * message, struct s_accelerator * accel); -static int parse_accel( char * message, struct s_accelerator * accel); #endif -- cgit v1.2.3