diff options
Diffstat (limited to 'app/bin/cpull.c')
| -rw-r--r-- | app/bin/cpull.c | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/app/bin/cpull.c b/app/bin/cpull.c index 7f27864..afdf834 100644 --- a/app/bin/cpull.c +++ b/app/bin/cpull.c @@ -20,16 +20,13 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include <math.h> - #include "cselect.h" #include "compound.h" #include "cundo.h" #include "fileio.h" -#include "i18n.h" -#include "messages.h" #include "track.h" -#include "utility.h" +#include "draw.h" +#include "common-ui.h" int debugPull = 0; @@ -816,6 +813,8 @@ static STATUS_T CmdPull( return C_CONTINUE; case C_REDRAW: + DrawHighlightBoxes(FALSE,FALSE,NULL); + HighlightSelectedTracks(NULL, TRUE, TRUE); if (anchors_da.cnt) DrawSegs( &tempD, zero, 0.0, &anchors(0), anchors_da.cnt, trackGauge, wDrawColorBlack ); if (t1 && t_turn1) @@ -856,11 +855,13 @@ static STATUS_T CmdPull( -#include "bitmaps/pull.xpm" +#include "bitmaps/connect.xpm" wMenuPush_p pullConnectMultiple; -void pullMenuEnter(int key) { +void pullMenuEnter( void * keyVP ) +{ + int key = (int)VP2L(keyVP); int action; action = C_TEXT; action |= key<<8; @@ -869,7 +870,7 @@ void pullMenuEnter(int key) { void InitCmdPull( wMenu_p menu ) { - AddMenuButton( menu, CmdPull, "cmdConnect", _("Connect Two Tracks"), wIconCreatePixMap(pull_xpm), LEVEL0_50, IC_STICKY|IC_INITNOTSTICKY|IC_LCLICK|IC_POPUP3|IC_CMDMENU|IC_WANT_MOVE, ACCL_CONNECT, NULL ); + AddMenuButton( menu, CmdPull, "cmdConnect", _("Connect Two Tracks"), wIconCreatePixMap(connect_xpm[iconSize]), LEVEL0_50, IC_STICKY|IC_INITNOTSTICKY|IC_LCLICK|IC_POPUP3|IC_CMDMENU|IC_WANT_MOVE, ACCL_CONNECT, NULL ); pullPopupM = MenuRegister( "Connect Options" ); - pullConnectMultiple = wMenuPushCreate( pullPopupM, "", _("Connect All Selected - 'S'"), 0, (wMenuCallBack_p)pullMenuEnter, (void*) 'S'); + pullConnectMultiple = wMenuPushCreate( pullPopupM, "", _("Connect All Selected - 'S'"), 0, pullMenuEnter, I2VP('S') ); } |