# HG changeset patch # User Mychaela Falconia # Date 1603249093 0 # Node ID 7bd3e62a0c68b74a98b68a8e3f986c1501aa53cc # Parent c93e02568273318bfd8c8a526e5049fd6f930a2f mmiResources.h: bogotab cleanup diff -r c93e02568273 -r 7bd3e62a0c68 src/ui/bmi/mmiResources.h --- a/src/ui/bmi/mmiResources.h Wed Oct 21 02:54:44 2020 +0000 +++ b/src/ui/bmi/mmiResources.h Wed Oct 21 02:58:13 2020 +0000 @@ -42,7 +42,7 @@ Menuitem provided to set the validity period to maximum. 25/10/00 Original Condat(UK) BMI version. - 03/10/02 Replaced most of the file with version on branch for issue 1150 (MC, SPR 1242) + 03/10/02 Replaced most of the file with version on branch for issue 1150 (MC, SPR 1242) $End @@ -70,33 +70,33 @@ #ifndef LSCREEN -#define SCREEN_SIZE_X 84 -#define SCREEN_SIZE_Y 48 -#define LINE_HEIGHT 8 -#define CHAR_WIDTH 6 -#define LINE_HEIGHT_LATIN (LINE_HEIGHT) -#define LINE_HEIGHT_CHINESE 12 +#define SCREEN_SIZE_X 84 +#define SCREEN_SIZE_Y 48 +#define LINE_HEIGHT 8 +#define CHAR_WIDTH 6 +#define LINE_HEIGHT_LATIN (LINE_HEIGHT) +#define LINE_HEIGHT_CHINESE 12 -#define ALLOFFSET (0) -#define MNUOFFSET (0) +#define ALLOFFSET (0) +#define MNUOFFSET (0) #else // by nitin for QVGA LCD #if (BOARD==61) -#define SCREEN_SIZE_X 240 -#define SCREEN_SIZE_Y 320 +#define SCREEN_SIZE_X 240 +#define SCREEN_SIZE_Y 320 #else -#define SCREEN_SIZE_X 176 -#define SCREEN_SIZE_Y 220 +#define SCREEN_SIZE_X 176 +#define SCREEN_SIZE_Y 220 #endif //(BOARD==61) -#define LINE_HEIGHT 16 -#define CHAR_WIDTH 6 -#define LINE_HEIGHT_CHINESE (LINE_HEIGHT) -#define LINE_HEIGHT_LATIN (LINE_HEIGHT) +#define LINE_HEIGHT 16 +#define CHAR_WIDTH 6 +#define LINE_HEIGHT_CHINESE (LINE_HEIGHT) +#define LINE_HEIGHT_LATIN (LINE_HEIGHT) -#define ALLOFFSET (LINE_HEIGHT*2) -#define MNUOFFSET (LINE_HEIGHT) +#define ALLOFFSET (LINE_HEIGHT*2) +#define MNUOFFSET (LINE_HEIGHT) #endif #define ALLBUT1LINE (SCREEN_SIZE_Y-1*LINE_HEIGHT+ALLOFFSET) @@ -108,146 +108,146 @@ extern int Easy_Text_Available; ////////////////////////// -// Common window sizes // +// Common window sizes // ////////////////////////// -#define BOOKSEARCH_EDITOR (ZONE_BOTTOM_LINE) +#define BOOKSEARCH_EDITOR (ZONE_BOTTOM_LINE) /* SPR#1428 - SH - New Editor changes */ #ifdef NEW_EDITOR /* SH - moved here from MmiEditor.h */ //Zone data for drawing windows -#define ZONE_FULL_HEIGHT 0x000F -#define ZONE_TOPHALF_HEIGHT 0x000C -#define ZONE_MIDDLE_HEIGHT 0x0006 -#define ZONE_BOTTOMHALF_HEIGHT 0x0003 +#define ZONE_FULL_HEIGHT 0x000F +#define ZONE_TOPHALF_HEIGHT 0x000C +#define ZONE_MIDDLE_HEIGHT 0x0006 +#define ZONE_BOTTOMHALF_HEIGHT 0x0003 /* xreddymn OMAPS00075852 May-15-2006 * This display zone is located one line above the softkeys. */ -#define ZONE_MIDDLETWOLINES_HEIGHT 0x0002 -#define ZONE_BOTTOMTWOLINES_HEIGHT 0x0001 -#define ZONE_FULL_WIDTH 0x00F0 -#define ZONE_LEFTHALF_WIDTH 0x00C0 -#define ZONE_MIDDLE_WIDTH 0x0060 -#define ZONE_RIGHTHALF_WIDTH 0x0030 +#define ZONE_MIDDLETWOLINES_HEIGHT 0x0002 +#define ZONE_BOTTOMTWOLINES_HEIGHT 0x0001 +#define ZONE_FULL_WIDTH 0x00F0 +#define ZONE_LEFTHALF_WIDTH 0x00C0 +#define ZONE_MIDDLE_WIDTH 0x0060 +#define ZONE_RIGHTHALF_WIDTH 0x0030 -#define ZONE_ICONS 0x0100 -#define ZONE_TITLE 0x0200 -#define ZONE_CASE_ABC 0x0400 -#define ZONE_SOFTKEYS 0x1000 -#define ZONE_SCROLLBAR 0x2000 +#define ZONE_ICONS 0x0100 +#define ZONE_TITLE 0x0200 +#define ZONE_CASE_ABC 0x0400 +#define ZONE_SOFTKEYS 0x1000 +#define ZONE_SCROLLBAR 0x2000 -#define ZONE_FULLSCREEN (ZONE_FULL_HEIGHT | ZONE_FULL_WIDTH) -#define ZONE_FULLICONS (ZONE_ICONS|ZONE_FULL_HEIGHT | ZONE_FULL_WIDTH) -#define ZONE_FULLTITLE (ZONE_TITLE|ZONE_FULL_HEIGHT | ZONE_FULL_WIDTH) -#define ZONE_FULLSOFTKEYS (ZONE_SOFTKEYS|ZONE_FULL_HEIGHT | ZONE_FULL_WIDTH) -#define ZONE_FULL_SK_SCROLL (ZONE_SOFTKEYS|ZONE_FULL_HEIGHT | ZONE_FULL_WIDTH | ZONE_SCROLLBAR) +#define ZONE_FULLSCREEN (ZONE_FULL_HEIGHT | ZONE_FULL_WIDTH) +#define ZONE_FULLICONS (ZONE_ICONS|ZONE_FULL_HEIGHT | ZONE_FULL_WIDTH) +#define ZONE_FULLTITLE (ZONE_TITLE|ZONE_FULL_HEIGHT | ZONE_FULL_WIDTH) +#define ZONE_FULLSOFTKEYS (ZONE_SOFTKEYS|ZONE_FULL_HEIGHT | ZONE_FULL_WIDTH) +#define ZONE_FULL_SK_SCROLL (ZONE_SOFTKEYS|ZONE_FULL_HEIGHT | ZONE_FULL_WIDTH | ZONE_SCROLLBAR) -#define ZONE_FULL_SK_TITLE (ZONE_TITLE|ZONE_SOFTKEYS|ZONE_FULL_HEIGHT | ZONE_FULL_WIDTH) -#define ZONE_FULL_SK_TITLE_ALPHA (ZONE_TITLE|ZONE_SOFTKEYS|ZONE_FULL_HEIGHT | ZONE_FULL_WIDTH | ZONE_CASE_ABC) -#define ZONE_FULL_SK_TITLE_SCROLL (ZONE_TITLE|ZONE_SOFTKEYS|ZONE_FULL_HEIGHT | ZONE_FULL_WIDTH | ZONE_SCROLLBAR) -#define ZONE_WAP_EDITOR (ZONE_TITLE|ZONE_SOFTKEYS|ZONE_FULL_HEIGHT | ZONE_FULL_WIDTH) -#define ZONE_MIDDLE_EDITOR (ZONE_TITLE|ZONE_SOFTKEYS|ZONE_MIDDLE_WIDTH|ZONE_MIDDLE_HEIGHT) +#define ZONE_FULL_SK_TITLE (ZONE_TITLE|ZONE_SOFTKEYS|ZONE_FULL_HEIGHT | ZONE_FULL_WIDTH) +#define ZONE_FULL_SK_TITLE_ALPHA (ZONE_TITLE|ZONE_SOFTKEYS|ZONE_FULL_HEIGHT | ZONE_FULL_WIDTH | ZONE_CASE_ABC) +#define ZONE_FULL_SK_TITLE_SCROLL (ZONE_TITLE|ZONE_SOFTKEYS|ZONE_FULL_HEIGHT | ZONE_FULL_WIDTH | ZONE_SCROLLBAR) +#define ZONE_WAP_EDITOR (ZONE_TITLE|ZONE_SOFTKEYS|ZONE_FULL_HEIGHT | ZONE_FULL_WIDTH) +#define ZONE_MIDDLE_EDITOR (ZONE_TITLE|ZONE_SOFTKEYS|ZONE_MIDDLE_WIDTH|ZONE_MIDDLE_HEIGHT) //Specific editor sizes -#define ZONE_SMALL_EDITOR (0xFF00) /* editor for small (one line) editors */ -#define ZONE_BORDER_EDITOR (0xFE00) /* editors with a border to the left/right - sim toolkit */ -#define ZONE_BOTTOM_LINE (0xFD00) /* editors for the bottom line */ -#define ZONE_BOTTOM_LINE_FIND (0xFC00) /* editors on the bottom line after "Find:" */ +#define ZONE_SMALL_EDITOR (0xFF00) /* editor for small (one line) editors */ +#define ZONE_BORDER_EDITOR (0xFE00) /* editors with a border to the left/right - sim toolkit */ +#define ZONE_BOTTOM_LINE (0xFD00) /* editors for the bottom line */ +#define ZONE_BOTTOM_LINE_FIND (0xFC00) /* editors on the bottom line after "Find:" */ #endif /* NEW_EDITOR */ #ifndef LSCREEN -#define BOOKDETAILS_EDITOR 0xFF01 -#define NUMBER_EDITOR 0xFF02 -#define PHONEBOOK_DLG_EDITOR 0xFF03 -#define BOOKSDN_EDITOR 0xFF04 +#define BOOKDETAILS_EDITOR 0xFF01 +#define NUMBER_EDITOR 0xFF02 +#define PHONEBOOK_DLG_EDITOR 0xFF03 +#define BOOKSDN_EDITOR 0xFF04 //MMIbooksearchwindow -//#define BOOKSEARCH_EDITOR 0xFF05 -#define CALL_EDITOR 0xFF06 -#define CALLSCRATCHPAD_EDITOR 0xFF07 -#define SERVICE_CREATE_EDITOR 0xFF08 -#define PASSWORD_EDITOR 0xFF09 -#define EM_CREATE_EDITOR 0xFF0A -#define WIN_DIALLING 0xFF30 -#define WIN_DIALLING_CB 0xFF31 -#define WIN_DIALLING_SMS 0xFF32 -#define WIN_DIALLING_SAT 0xFF33 +//#define BOOKSEARCH_EDITOR 0xFF05 +#define CALL_EDITOR 0xFF06 +#define CALLSCRATCHPAD_EDITOR 0xFF07 +#define SERVICE_CREATE_EDITOR 0xFF08 +#define PASSWORD_EDITOR 0xFF09 +#define EM_CREATE_EDITOR 0xFF0A +#define WIN_DIALLING 0xFF30 +#define WIN_DIALLING_CB 0xFF31 +#define WIN_DIALLING_SMS 0xFF32 +#define WIN_DIALLING_SAT 0xFF33 -#define PHNO_EDITOR 0xFF0C +#define PHNO_EDITOR 0xFF0C -#define CENTRE_EDITOR 0xFF0D +#define CENTRE_EDITOR 0xFF0D //And for MMIServices - moved here from mmiservices.c -#define SAT_EDITOR 0xFF0E +#define SAT_EDITOR 0xFF0E -#define RPWD_EDITOR 0xFF0F +#define RPWD_EDITOR 0xFF0F //MMIBookCallDetails -#define PHB_EDITOR 0xFF10 +#define PHB_EDITOR 0xFF10 //MMIPins -#define PIN_EDIT_RESET 0xFF13 +#define PIN_EDIT_RESET 0xFF13 //MMITimeDate -#define TIMEDATE_EDITOR_AREA 0xFF15 +#define TIMEDATE_EDITOR_AREA 0xFF15 //#define TIMEDATE_EDITOR_AREA 0,20,70,20 #else -#define BOOKDETAILS_EDITOR ZONE_FULL_SK_TITLE -#define NUMBER_EDITOR ZONE_FULL_SK_TITLE -#define PHONEBOOK_DLG_EDITOR ZONE_FULL_SK_TITLE -#define BOOKSDN_EDITOR ZONE_FULL_SK_TITLE +#define BOOKDETAILS_EDITOR ZONE_FULL_SK_TITLE +#define NUMBER_EDITOR ZONE_FULL_SK_TITLE +#define PHONEBOOK_DLG_EDITOR ZONE_FULL_SK_TITLE +#define BOOKSDN_EDITOR ZONE_FULL_SK_TITLE //MMIbooksearchwindow -#define CALL_EDITOR ZONE_FULL_SK_TITLE -#define CALLSCRATCHPAD_EDITOR ZONE_FULL_SK_TITLE -#define SERVICE_CREATE_EDITOR ZONE_FULL_SK_TITLE -#define EM_CREATE_EDITOR ZONE_FULL_SK_TITLE -#define PASSWORD_EDITOR ZONE_FULL_SK_TITLE +#define CALL_EDITOR ZONE_FULL_SK_TITLE +#define CALLSCRATCHPAD_EDITOR ZONE_FULL_SK_TITLE +#define SERVICE_CREATE_EDITOR ZONE_FULL_SK_TITLE +#define EM_CREATE_EDITOR ZONE_FULL_SK_TITLE +#define PASSWORD_EDITOR ZONE_FULL_SK_TITLE /* SPR#1428 - SH - New Editor changes - change these so they look better */ #ifdef NEW_EDITOR -#define WIN_DIALLING (ZONE_ICONS|ZONE_SOFTKEYS|ZONE_FULL_WIDTH|ZONE_BOTTOMTWOLINES_HEIGHT) +#define WIN_DIALLING (ZONE_ICONS|ZONE_SOFTKEYS|ZONE_FULL_WIDTH|ZONE_BOTTOMTWOLINES_HEIGHT) /* xreddymn OMAPS00075852 May-15-2006: Changed display zone */ -#define WIN_DIALLING_CB (ZONE_ICONS|ZONE_SOFTKEYS|ZONE_FULL_WIDTH|ZONE_MIDDLETWOLINES_HEIGHT) -#define WIN_DIALLING_SMS (ZONE_ICONS|ZONE_SOFTKEYS|ZONE_FULL_WIDTH|ZONE_BOTTOMHALF_HEIGHT) +#define WIN_DIALLING_CB (ZONE_ICONS|ZONE_SOFTKEYS|ZONE_FULL_WIDTH|ZONE_MIDDLETWOLINES_HEIGHT) +#define WIN_DIALLING_SMS (ZONE_ICONS|ZONE_SOFTKEYS|ZONE_FULL_WIDTH|ZONE_BOTTOMHALF_HEIGHT) /* xreddymn OMAPS00075852 May-15-2006: Changed display zone */ -#define WIN_DIALLING_SAT (ZONE_ICONS|ZONE_SOFTKEYS|ZONE_FULL_WIDTH|ZONE_MIDDLETWOLINES_HEIGHT) +#define WIN_DIALLING_SAT (ZONE_ICONS|ZONE_SOFTKEYS|ZONE_FULL_WIDTH|ZONE_MIDDLETWOLINES_HEIGHT) #else /* NEW_EDITOR */ -#define WIN_DIALLING (ZONE_ICONS|ZONE_SOFTKEYS|ZONE_MIDDLE_WIDTH|ZONE_MIDDLE_HEIGHT) -#define WIN_DIALLING_CB (ZONE_ICONS|ZONE_SOFTKEYS|ZONE_MIDDLE_WIDTH|ZONE_MIDDLE_HEIGHT) -#define WIN_DIALLING_SMS (ZONE_ICONS|ZONE_SOFTKEYS|ZONE_FULL_WIDTH|ZONE_BOTTOMHALF_HEIGHT) -#define WIN_DIALLING_SAT (ZONE_ICONS|ZONE_SOFTKEYS|ZONE_FULL_WIDTH|ZONE_BOTTOMTWOLINES_HEIGHT) +#define WIN_DIALLING (ZONE_ICONS|ZONE_SOFTKEYS|ZONE_MIDDLE_WIDTH|ZONE_MIDDLE_HEIGHT) +#define WIN_DIALLING_CB (ZONE_ICONS|ZONE_SOFTKEYS|ZONE_MIDDLE_WIDTH|ZONE_MIDDLE_HEIGHT) +#define WIN_DIALLING_SMS (ZONE_ICONS|ZONE_SOFTKEYS|ZONE_FULL_WIDTH|ZONE_BOTTOMHALF_HEIGHT) +#define WIN_DIALLING_SAT (ZONE_ICONS|ZONE_SOFTKEYS|ZONE_FULL_WIDTH|ZONE_BOTTOMTWOLINES_HEIGHT) #endif /* NEW_EDITOR */ -#define PHNO_EDITOR ZONE_FULL_SK_TITLE +#define PHNO_EDITOR ZONE_FULL_SK_TITLE -#define CENTRE_EDITOR ZONE_FULL_SK_TITLE +#define CENTRE_EDITOR ZONE_FULL_SK_TITLE //And for MMIServices - moved here from mmiservices.c -#define SAT_EDITOR ZONE_FULL_SK_TITLE +#define SAT_EDITOR ZONE_FULL_SK_TITLE -#define RPWD_EDITOR ZONE_FULL_SK_TITLE +#define RPWD_EDITOR ZONE_FULL_SK_TITLE //MMIBookCallDetails -#define PHB_EDITOR ZONE_FULL_SK_TITLE +#define PHB_EDITOR ZONE_FULL_SK_TITLE //MMIPins -#define PIN_EDIT_RESET ZONE_FULL_SK_TITLE +#define PIN_EDIT_RESET ZONE_FULL_SK_TITLE //MMITimeDate -#define TIMEDATE_EDITOR_AREA ZONE_FULL_SK_TITLE +#define TIMEDATE_EDITOR_AREA ZONE_FULL_SK_TITLE //#define TIMEDATE_EDITOR_AREA 0,20,70,20 #endif //For displaying call information -#define CALLINFO_X_AH 8 -#define CALLINFO_X_TAGPOS 35 +#define CALLINFO_X_AH 8 +#define CALLINFO_X_TAGPOS 35 #define INCALLTIMER_X 24 //For autoredial (no chinese) -#define CALL_AUTOREDIAL_X 20 +#define CALL_AUTOREDIAL_X 20 #define CALL_AUTOREDIAL_Y1 16 #define CALL_AUTOREDIAL_Y2 26 #define CALL_AUTOREDIAL_Y3 36 @@ -256,14 +256,14 @@ #define CALL_INFORMATION_Y 16 //txt Please Wait #define TXTMESSAGE_X 20 -#define TXTMUTED_X 8 +#define TXTMUTED_X 8 //From mmidynamenu // default menu dimensions -#define MENU_LEFT 0 +#define MENU_LEFT 0 #define MENU_INDENT 10 -#define MENU_TOP 0 +#define MENU_TOP 0 #define MENU_RIGHT 96 #define MENU_BOTTOM 50 @@ -277,15 +277,15 @@ //MMIIdle //indent for text on idle screen - #define IDLEMENUTXT1_X 16 - #define IDLEMENUTXT2_X TXTCHARGE_X - + #define IDLEMENUTXT1_X 16 + #define IDLEMENUTXT2_X TXTCHARGE_X + //MMIPins #define INFO_TEXT_X 0 #define INFO_TEXT_Y 6 - + extern MfwRect selected_area; @@ -300,10 +300,10 @@ //MMIGame - connect 4 #ifndef LSCREEN -#define GAME_POS_X 0 -#define GAME_POS_Y 8 -#define GAME_SCALE_X 5 -#define GAME_SCALE_Y 5 +#define GAME_POS_X 0 +#define GAME_POS_Y 8 +#define GAME_SCALE_X 5 +#define GAME_SCALE_Y 5 #define GAME_NAMEPOSX1 56 #define GAME_NAMEPOSY1 6 #define GAME_NAMEPOSX2 56 @@ -316,10 +316,10 @@ #define GAME_WINPOSY2 (6+21) #else -#define GAME_POS_X ((SCREEN_SIZE_X / 2) - (MAX_X_BOARD*GAME_SCALE_X/2)) -#define GAME_POS_Y (27+15) -#define GAME_SCALE_X 13 -#define GAME_SCALE_Y 15 +#define GAME_POS_X ((SCREEN_SIZE_X / 2) - (MAX_X_BOARD*GAME_SCALE_X/2)) +#define GAME_POS_Y (27+15) +#define GAME_SCALE_X 13 +#define GAME_SCALE_Y 15 #define GAME_NAMEPOSX1 (SCREEN_SIZE_X/2-36) #define GAME_NAMEPOSX2 (SCREEN_SIZE_X/2-12) @@ -329,8 +329,8 @@ #define GAME_NAMEPOSY3 (0) #define GAME_WINPOSX1 (SCREEN_SIZE_X/2-12) #define GAME_WINPOSX2 (SCREEN_SIZE_X/2+12) -#define GAME_WINPOSY1 (0) -#define GAME_WINPOSY2 (0) +#define GAME_WINPOSY1 (0) +#define GAME_WINPOSY2 (0) #endif @@ -349,11 +349,11 @@ /*NDH - 13/01/04 - CQ 16753 - Redefine these values in accordance with GSM 03.40, para 9.2.3.12.1 */ /*API - 28/07/03 - CQ10203 - Add these defines for the Validity Period of an SMS*/ -#define VP_REL_1_HOUR 11 -#define VP_REL_12_HOURS 143 -#define VP_REL_24_HOURS 167 +#define VP_REL_1_HOUR 11 +#define VP_REL_12_HOURS 143 +#define VP_REL_24_HOURS 167 #define VP_REL_1_WEEK 173 -#define VP_REL_MAXIMUM 255 // May 10, 2004 REF: CRR 15753 Deepa M.D +#define VP_REL_MAXIMUM 255 // May 10, 2004 REF: CRR 15753 Deepa M.D /*API - CQ10203 END*/ /* NDH - CQ16753 - END */ @@ -381,7 +381,7 @@ extern MfwRect SmsSend_R_OPTArea; extern MfwRect melody_menuArea; extern MfwRect MAINICONarea; -extern MfwRect MAINICONareaColour; //For the larger colour main icons +extern MfwRect MAINICONareaColour; //For the larger colour main icons @@ -409,14 +409,14 @@ void Mmi_Set2Language(int lang); UBYTE Mmi_getCurrentLanguage(void); -UBYTE Mmi_layout_line(int lineNo); //GW +UBYTE Mmi_layout_line(int lineNo); //GW UBYTE Mmi_getCurrentLanguage(void); //GW //The following are redundant - maintain for compatibility only -#define Mmi_layout_first_line( ) Mmi_layout_line(1) -#define Mmi_layout_second_line( ) Mmi_layout_line(2) -#define Mmi_layout_third_line( ) Mmi_layout_line(3) -#define Mmi_layout_fourth_line( ) Mmi_layout_line(4) -#define Mmi_layout_fifth_line( ) Mmi_layout_line(5) +#define Mmi_layout_first_line( ) Mmi_layout_line(1) +#define Mmi_layout_second_line( ) Mmi_layout_line(2) +#define Mmi_layout_third_line( ) Mmi_layout_line(3) +#define Mmi_layout_fourth_line( ) Mmi_layout_line(4) +#define Mmi_layout_fifth_line( ) Mmi_layout_line(5) UBYTE Mmi_number_of_lines_without_icons_on_top(void); UBYTE Mmi_number_of_lines_with_icons_on_top(void); @@ -435,21 +435,21 @@ void resources_destroy (T_MFW_HND own_window); BOOL resources_reset_language(char* string); typedef struct { - U16 id; - U16 count; - U32 attributes; + U16 id; + U16 count; + U32 attributes; } T_RESOURCE_DIRECTORY_HEADER; // This type identifies the various resources that are listable in the file. typedef enum { - RES_FIRST_RESOURCE_TYPE=0, - RES_LANGUAGE_TABLE, - RES_LANGUAGE, - RES_STRING, - RES_MELODY_TABLE, - RES_MELODY, - RES_LAST_RESOURCE_TYPE + RES_FIRST_RESOURCE_TYPE=0, + RES_LANGUAGE_TABLE, + RES_LANGUAGE, + RES_STRING, + RES_MELODY_TABLE, + RES_MELODY, + RES_LAST_RESOURCE_TYPE } res_ResourceID_type; typedef const T_RESOURCE_DIRECTORY_HEADER * RESOURCE_DIRECTORY_HEADER; @@ -459,14 +459,14 @@ /*MC SPR 1111*/ typedef struct /*Entry in table of country codes*/ { - char* country_dialling_code; /*Dialling code(4 digits)*/ - UBYTE language; /*language (e.g. ENGLISH_LANGUAGE defined above)*/ + char* country_dialling_code; /*Dialling code(4 digits)*/ + UBYTE language; /*language (e.g. ENGLISH_LANGUAGE defined above)*/ }CountryLangEntry; typedef struct /*Table of country codes and associated languages*/ { - UBYTE no_of_entries; - CountryLangEntry* entries; + UBYTE no_of_entries; + CountryLangEntry* entries; } CountryLanguageTable; /*MC end*/ @@ -485,7 +485,7 @@ void res_set_SIMToolkit_title_string(char* SAT_string); int resources_truncate_to_screen_width(char* IpStr, int IpLen, char* OpStr, int OutLen, - int ScreenWidth, BOOL unicode); + int ScreenWidth, BOOL unicode); void resetFactoryColour ( void ); // API - 13-01-03 - 1550