Merge branch 'master' of https://bitbucket.org/kryton9/jadegrfx

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();

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
+    
+    

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);

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 {