New upstream version 5.3.1Beta2upstream/5.3.1Beta2

1 files changed, 4 insertions, 12 deletions

diff --git a/app/bin/ctext.c b/app/bin/ctext.c
index 673e4f7..2a506dd 100644
--- a/app/bin/ctext.c
+++ b/app/bin/ctext.c
@@ -28,14 +28,6 @@
 #include "misc.h"
 #include "common-ui.h"
 
-track_p NewText( wIndex_t index, coOrd p, ANGLE_T angle, char * text,
-                 CSIZE_T textSize, wDrawColor color, BOOL_T boxed );
-
-void LoadFontSizeList( wList_p, long );
-void UpdateFontSizeList( long *, wList_p, wIndex_t );
-long GetFontSize(long);
-long GetFontSizeIndex(long size);
-
 static wMenu_p textPopupM;
 
 /*****************************************************************************
@@ -53,7 +45,7 @@ static struct {
 	coOrd pos;
 	ANGLE_T angle;
 	long size;
-	wIndex_t fontSizeInx;
+	long fontSizeInx;
 	char text[STR_HUGE_SIZE];
 	wDrawColor color;
 	BOOL_T boxed;
@@ -127,7 +119,7 @@ static STATUS_T CmdText( wAction_t action, coOrd pos )
 			ParamCreateControls(&textPG, TextDlgUpdate);
 			LoadFontSizeList((wList_p)textPD.control, Dt.size);
 			ParamRegister(&textPG);
-			Dt.size = GetFontSize(Dt.fontSizeInx);
+			Dt.size = GetFontSize((long int)Dt.fontSizeInx);
 		}
 		Dt.size = (long)wSelectedFontSize();
 		Dt.fontSizeInx = GetFontSizeIndex(Dt.size);
@@ -266,12 +258,12 @@ static STATUS_T CmdText( wAction_t action, coOrd pos )
 }
 
 
-#include "bitmaps/text.xpm3"
+#include "bitmaps/text.image3"
 
 void InitCmdText( wMenu_p menu )
 {
 	AddMenuButton( menu, CmdText, "cmdText", _("Text"),
-	               wIconCreatePixMap(text_xpm3[iconSize]), LEVEL0_50,
+	               wIconCreatePixMap(text_image3[iconSize]), LEVEL0_50,
 	               IC_STICKY|IC_CMDMENU|IC_POPUP2, ACCL_TEXT, NULL );
 	textPopupM = MenuRegister( "Text Font" );
 	wMenuPushCreate( textPopupM, "", _("Fonts..."), 0, SelectFont, NULL );