From d5ce198aeab8aff48aa6795344b52791fc37761e Mon Sep 17 00:00:00 2001 From: Armando Rivera Date: Sat, 9 Nov 2013 23:24:39 -0500 Subject: [PATCH 1/3] Added PTR alias --- header.inc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/header.inc b/header.inc index f8a7f92..82a6d27 100644 --- a/header.inc +++ b/header.inc @@ -36,16 +36,16 @@ #define SUB void #define ENDSUB } #define BEGIN { -#define END } -#define AND && -#define OR || +#define END } +#define AND && +#define OR || #define CLASS class #define TYPE typedef struct #define ADDR & #define INCR ++ #define DECR -- -#define PRIOR -- #define BYREF * +#define PTR * #define NOT not #define IF if #define THEN { From f784e0fff26601be1944be2256714c582f2fc748 Mon Sep 17 00:00:00 2001 From: Armando Rivera Date: Sat, 9 Nov 2013 23:39:58 -0500 Subject: [PATCH 2/3] Added Makefile to fltkdemo --- QT4/TinyTimes/tinytimes.cpp | 3 +-- fltk/Makefile | 13 +++++++++++++ 2 files changed, 14 insertions(+), 2 deletions(-) create mode 100644 fltk/Makefile diff --git a/QT4/TinyTimes/tinytimes.cpp b/QT4/TinyTimes/tinytimes.cpp index ab013cc..d7103ec 100644 --- a/QT4/TinyTimes/tinytimes.cpp +++ b/QT4/TinyTimes/tinytimes.cpp @@ -34,7 +34,6 @@ SUB TT::BuildTable(QAbstractButton *button) DO DIM AS INT I; DIM AS QString buf; - ui.listWidget->clear(); FOR (I = 1 TO I<11 STEP I++) DO buf = QString("%1 %2 %3 %4 %5").arg(button->text()).arg(" X ").arg(QString::number(I)).arg(" = ").arg(QString::number(I*button->text().toInt())); @@ -46,7 +45,7 @@ ENDSUB MAIN DIM AS QApplication app(argc, argv); - DIM AS TT *TinyTimes = new TT; + DIM AS TT PTR TinyTimes = new TT; TinyTimes->Center(); TinyTimes->show(); RETURN app.exec(); diff --git a/fltk/Makefile b/fltk/Makefile new file mode 100644 index 0000000..4f73a8c --- /dev/null +++ b/fltk/Makefile @@ -0,0 +1,13 @@ +all: clean fltkdemo + +CMD = fltk-config +FLAGS = --libs --cxxflags --use-images --use-gl --ldstaticflags --compile + +fltkdemo: + $(CMD) $(FLAGS) $@.cpp + +clean: + @rm fltkdemo + @rm -rf fltkdemo.app + + From be8c1005d72bf4c4bcd7c54609d0b50a2061a17c Mon Sep 17 00:00:00 2001 From: Armando Rivera Date: Sat, 9 Nov 2013 23:41:02 -0500 Subject: [PATCH 3/3] Changed '*' to PTR for FLTK Objects --- fltk/fltkdemo.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/fltk/fltkdemo.cpp b/fltk/fltkdemo.cpp index dac8e94..a2276be 100644 --- a/fltk/fltkdemo.cpp +++ b/fltk/fltkdemo.cpp @@ -5,9 +5,9 @@ MAIN DIM AS INT top = 40; - DIM AS WINDOW *win; - DIM AS INPUT *txtSource, *txtDest; - DIM AS BUTTON *btnSource, *btnDest; + DIM AS WINDOW PTR win; + DIM AS INPUT PTR txtSource, PTR txtDest; + DIM AS BUTTON PTR btnSource, PTR btnDest; win = new WINDOW(690,486,"FLTK Demo"); win->position((Fl::w() - win->w())/2, (Fl::h() - win->h())/2);