diff options
Diffstat (limited to 'app/bin/dease.c')
| -rw-r--r-- | app/bin/dease.c | 49 |
1 files changed, 19 insertions, 30 deletions
diff --git a/app/bin/dease.c b/app/bin/dease.c index 4112c61..58ae6dc 100644 --- a/app/bin/dease.c +++ b/app/bin/dease.c @@ -40,7 +40,6 @@ static DIST_T easeX = 0.0; static DIST_T Rvalues[3]; static DIST_T Lvalues[3]; -static DIST_T oldEasementVal; static wIcon_p enone_bm; static wIcon_p esharp_bm; @@ -63,7 +62,6 @@ static wWin_p easementW; static void EasementSel( long ); static void SetEasement( DIST_T, void * ); static void EasementOk( void ); -static void EasementCancel( void ); static char *easementChoiceLabels[] = { N_("None"), N_("Sharp"), N_("Normal"), N_("Broad"), N_("Cornu"), NULL }; static paramFloatRange_t r0n1_100 = { -1.0, 100.0, 60 }; @@ -175,13 +173,6 @@ static void EasementOk( void ) } -static void EasementCancel( void ) -{ - SetEasement( easementVal = oldEasementVal, I2VP(FALSE) ); - wHide( easementW ); -} - - static void EasementSel( long arg ) /* @@ -248,11 +239,10 @@ static void DoEasement( void * unused ) { if (easementW == NULL) { easementW = ParamCreateDialog( &easementPG, MakeWindowTitle(_("Easement")), - _("Ok"), (paramActionOkProc)EasementOk, (paramActionCancelProc)EasementCancel, + _("Ok"), (paramActionOkProc)EasementOk, ParamCancel_Null, TRUE, LayoutEasementW, 0, EasementDlgUpdate ); SetEasement( easementVal, I2VP(TRUE) ); } - oldEasementVal = easementVal; wShow( easementW ); SetEasement( easementVal, I2VP(TRUE) ); } @@ -270,30 +260,29 @@ static void EasementChange( long changes ) } -#include "bitmaps/ease-none.xpm3" -#include "bitmaps/ease-sharp.xpm3" -#include "bitmaps/ease-gt-sharp.xpm3" -#include "bitmaps/ease-lt-sharp.xpm3" -#include "bitmaps/ease-normal.xpm3" -#include "bitmaps/ease-broad.xpm3" -#include "bitmaps/ease-gt-broad.xpm3" -#include "bitmaps/ease-lt-broad.xpm3" -#include "bitmaps/ease-cornu.xpm3" - +#include "bitmaps/ease-none.image3" +#include "bitmaps/ease-sharp.image3" +#include "bitmaps/ease-gt-sharp.image3" +#include "bitmaps/ease-lt-sharp.image3" +#include "bitmaps/ease-normal.image3" +#include "bitmaps/ease-broad.image3" +#include "bitmaps/ease-gt-broad.image3" +#include "bitmaps/ease-lt-broad.image3" +#include "bitmaps/ease-cornu.image3" EXPORT addButtonCallBack_t EasementInit( void ) { ParamRegister( &easementPG ); - enone_bm = wIconCreatePixMap( ease_none_xpm3[iconSize] ); - eltsharp_bm = wIconCreatePixMap( ease_lt_sharp_xpm3[iconSize] ); - esharp_bm = wIconCreatePixMap( ease_sharp_xpm3[iconSize] ); - egtsharp_bm = wIconCreatePixMap( ease_gt_sharp_xpm3[iconSize] ); - enormal_bm = wIconCreatePixMap( ease_normal_xpm3[iconSize] ); - eltbroad_bm = wIconCreatePixMap( ease_lt_broad_xpm3[iconSize] ); - ebroad_bm = wIconCreatePixMap( ease_broad_xpm3[iconSize] ); - egtbroad_bm = wIconCreatePixMap( ease_gt_broad_xpm3[iconSize] ); - ecornu_bm = wIconCreatePixMap( ease_cornu_xpm3[iconSize] ); + enone_bm = wIconCreatePixMap( ease_none_image3[iconSize] ); + eltsharp_bm = wIconCreatePixMap( ease_lt_sharp_image3[iconSize] ); + esharp_bm = wIconCreatePixMap( ease_sharp_image3[iconSize] ); + egtsharp_bm = wIconCreatePixMap( ease_gt_sharp_image3[iconSize] ); + enormal_bm = wIconCreatePixMap( ease_normal_image3[iconSize] ); + eltbroad_bm = wIconCreatePixMap( ease_lt_broad_image3[iconSize] ); + ebroad_bm = wIconCreatePixMap( ease_broad_image3[iconSize] ); + egtbroad_bm = wIconCreatePixMap( ease_gt_broad_image3[iconSize] ); + ecornu_bm = wIconCreatePixMap( ease_cornu_image3[iconSize] ); easementB = AddToolbarButton( "cmdEasement", enone_bm, 0, DoEasementRedir, NULL ); |