From e7d20cf352688bf717a01f4e6d9e6f497c2bea4c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sat, 20 Sep 2025 19:19:34 +0200 Subject: New upstream version 5.3.1Beta2 --- app/bin/ctext.c | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) (limited to 'app/bin/ctext.c') 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 ); -- cgit v1.2.3