diff options
Diffstat (limited to 'app/bin/trknote.c')
| -rw-r--r-- | app/bin/trknote.c | 25 |
1 files changed, 10 insertions, 15 deletions
diff --git a/app/bin/trknote.c b/app/bin/trknote.c index a62c22d..43bda68 100644 --- a/app/bin/trknote.c +++ b/app/bin/trknote.c @@ -36,7 +36,7 @@ EXPORT TRKTYP_T T_NOTE = -1; static wDrawBitMap_p note_bm, link_bm, document_bm; typedef struct { - char ***xpm; + wIconBitMap_t * image3; int OP; char * shortName; char * cmdName; @@ -44,21 +44,18 @@ typedef struct { long acclKey; } trknoteData_t; -#include "bitmaps/sticky-note.xpm3" -#include "bitmaps/sticky-link.xpm3" -#include "bitmaps/sticky-doc.xpm3" +#include "bitmaps/sticky-note.image3" +#include "bitmaps/sticky-link.image3" +#include "bitmaps/sticky-doc.image3" static trknoteData_t noteTypes[] = { - { sticky_note_xpm3, OP_NOTETEXT, N_("Note"), N_("Text Note"), "cmdTextNote", ACCL_NOTE }, - { sticky_link_xpm3, OP_NOTELINK, N_("Link"), N_("Weblink"), "cmdLinkNote", 0L }, - { sticky_doc_xpm3, OP_NOTEFILE, N_("Document"), N_("Document"), "cmdFileNote", 0L }, + { sticky_note_image3, OP_NOTETEXT, N_("Note"), N_("Text Note"), "cmdTextNote", ACCL_NOTE }, + { sticky_link_image3, OP_NOTELINK, N_("Link"), N_("Weblink"), "cmdLinkNote", 0L }, + { sticky_doc_image3, OP_NOTEFILE, N_("Document"), N_("Document"), "cmdFileNote", 0L }, }; static long curNoteType; -static unsigned layerSave; -static coOrd posSave; - #define NOTETYPESCOUNT COUNT(noteTypes) @@ -519,7 +516,6 @@ static STATUS_T CmdNote(wAction_t action, coOrd pos) { static coOrd oldPos; static int state_on = FALSE; - track_p trk; switch (action) { case C_START: @@ -571,18 +567,17 @@ static STATUS_T CmdNote(wAction_t action, coOrd pos) return C_CONTINUE; case C_CANCEL: - DescribeCancel(); + DescribeDone( NULL ); state_on = FALSE; return C_CONTINUE; } - return C_INFO; + return C_CONTINUE; } #include "bitmaps/note.xbm" #include "bitmaps/link.xbm" #include "bitmaps/clip.xbm" -// RWS not used #include "bitmaps/note.xpm" void InitTrkNote(wMenu_p menu) { @@ -597,7 +592,7 @@ void InitTrkNote(wMenu_p menu) wIcon_p icon; nt = noteTypes + i; - icon = wIconCreatePixMap(nt->xpm[iconSize]); + icon = wIconCreatePixMap(nt->image3[iconSize]); AddMenuButton(menu, CmdNote, nt->helpKey, _(nt->cmdName), icon, LEVEL0_50, IC_STICKY | IC_POPUP2, nt->acclKey, I2VP(nt->OP)); } |