Merge branch 'master' into autotools-conversion

This commit is contained in:
Jon Trulson
2020-11-24 16:53:24 -07:00
56 changed files with 307 additions and 186 deletions

View File

@@ -60,11 +60,11 @@
extern GC scratch_gc;
Widget editMenu_cut_pb;
Widget editMenu_copy_pb;
Widget editMenu_rotate_pb;
Widget editMenu_flip_pb;
Widget editMenu_scale_pb;
extern Widget editMenu_cut_pb;
extern Widget editMenu_copy_pb;
extern Widget editMenu_rotate_pb;
extern Widget editMenu_flip_pb;
extern Widget editMenu_scale_pb;
extern void Stop_HotBox(void);

View File

@@ -101,13 +101,13 @@ static void Do_DropCheckOp(DtDndTransferCallback);
static void Do_DropOp(void);
extern Widget optionsMenu_grid;
Widget editMenu_paste_pb;
Widget editMenu_cut_pb;
Widget editMenu_copy_pb;
Widget editMenu_rotate_pb;
Widget editMenu_flip_pb;
Widget editMenu_scale_pb;
Widget editMenu_undo_pb;
extern Widget editMenu_paste_pb;
extern Widget editMenu_cut_pb;
extern Widget editMenu_copy_pb;
extern Widget editMenu_rotate_pb;
extern Widget editMenu_flip_pb;
extern Widget editMenu_scale_pb;
extern Widget editMenu_undo_pb;
extern Widget newWidthText, newHeightText;
extern GC scratch_gc;

View File

@@ -138,7 +138,7 @@ extern Window tablet_win;
static int jskXerrorDebug();
static int jskXerrorIODebug();
Widget editMenu_undo_pb;
extern Widget editMenu_undo_pb;
void GetSessionInfo( void );
void Set_Gfx_Labels( Boolean );