Author: matt
Date: 2011-05-20 15:47:11 -0700 (Fri, 20 May 2011)
New Revision: 8705
Log:
123: allright, all that's left is Fluid and its dependents (oh, and then the
FLTK1 and FLTK2 emulations, but who's counting?).
Modified:
branches/branch-3.0/test/fullscreen.cxx
branches/branch-3.0/test/gl_overlay.cxx
branches/branch-3.0/test/glpuzzle.cxx
Modified: branches/branch-3.0/test/fullscreen.cxx
===================================================================
--- branches/branch-3.0/test/fullscreen.cxx 2011-05-20 22:42:31 UTC (rev
8704)
+++ branches/branch-3.0/test/fullscreen.cxx 2011-05-20 22:47:11 UTC (rev
8705)
@@ -61,7 +61,7 @@
#include <fltk3/SingleWindow.h>
#include <fltk3/HorSlider.h>
#include <fltk3/LightButton.h>
-#include <FL/math.h>
+#include <fltk3/math.h>
#include <stdio.h>
#if HAVE_GL
Modified: branches/branch-3.0/test/gl_overlay.cxx
===================================================================
--- branches/branch-3.0/test/gl_overlay.cxx 2011-05-20 22:42:31 UTC (rev
8704)
+++ branches/branch-3.0/test/gl_overlay.cxx 2011-05-20 22:47:11 UTC (rev
8705)
@@ -28,23 +28,23 @@
#include <config.h>
#include <fltk3/run.h>
#include <fltk3/Window.h>
-#include <fltk3/Hor_Slider.h>
+#include <fltk3/HorSlider.h>
#include <fltk3/ToggleButton.h>
-#include <FL/math.h>
+#include <fltk3/math.h>
#if !HAVE_GL
#include <fltk3/Box.h>
-class shape_window : public Fl_Box {
+class shape_window : public fltk3::Box {
public:
int sides;
shape_window(int x,int y,int w,int h,const char *l=0)
- :Fl_Box(FL_DOWN_BOX,x,y,w,h,l){
+ :fltk3::Box(fltk3::DOWN_BOX,x,y,w,h,l){
label("This demo does\nnot work without GL");
}
};
#else
-#include <FL/gl.h>
-#include <fltk3/Gl_Window.h>
+#include <fltk3/gl.h>
+#include <fltk3/GlWindow.h>
class shape_window : public fltk3::GlWindow {
void draw();
@@ -90,7 +90,7 @@
glViewport(0,0,w(),h());
}
// draw an amazing graphic:
- gl_color(FL_RED);
+ gl_color(fltk3::RED);
glBegin(GL_LINE_LOOP);
for (int j=0; j<overlay_sides; j++) {
double ang = j*2*M_PI/overlay_sides;
@@ -101,14 +101,14 @@
#endif
// when you change the data, as in this callback, you must call redraw():
-void sides_cb(Fl_Widget *o, void *p) {
+void sides_cb(fltk3::Widget *o, void *p) {
shape_window *sw = (shape_window *)p;
sw->sides = int(((fltk3::Slider *)o)->value());
sw->redraw();
}
#if HAVE_GL
-void overlay_sides_cb(Fl_Widget *o, void *p) {
+void overlay_sides_cb(fltk3::Widget *o, void *p) {
shape_window *sw = (shape_window *)p;
sw->overlay_sides = int(((fltk3::Slider *)o)->value());
sw->redraw_overlay();
@@ -117,21 +117,21 @@
#include <stdio.h>
int main(int argc, char **argv) {
- Fl_Window window(300, 370);
+ fltk3::Window window(300, 370);
shape_window sw(10, 75, window.w()-20, window.h()-90);
-//sw.mode(FL_RGB);
+//sw.mode(fltk3::RGB);
window.resizable(&sw);
fltk3::HorSlider slider(60, 5, window.w()-70, 30, "Sides:");
- slider.align(FL_ALIGN_LEFT);
+ slider.align(fltk3::ALIGN_LEFT);
slider.callback(sides_cb,&sw);
slider.value(sw.sides);
slider.step(1);
slider.bounds(3,40);
fltk3::HorSlider oslider(60, 40, window.w()-70, 30, "Overlay:");
- oslider.align(FL_ALIGN_LEFT);
+ oslider.align(fltk3::ALIGN_LEFT);
#if HAVE_GL
oslider.callback(overlay_sides_cb,&sw);
oslider.value(sw.overlay_sides);
Modified: branches/branch-3.0/test/glpuzzle.cxx
===================================================================
--- branches/branch-3.0/test/glpuzzle.cxx 2011-05-20 22:42:31 UTC (rev
8704)
+++ branches/branch-3.0/test/glpuzzle.cxx 2011-05-20 22:47:11 UTC (rev
8705)
@@ -34,7 +34,7 @@
#include <fltk3/run.h>
#include <fltk3/message.h>
int main(int, char**) {
- fl_alert("This demo does not work without GL and GLU");
+ fltk3::alert("This demo does not work without GL and GLU");
return 1;
}
#else
@@ -46,8 +46,8 @@
#include <sys/types.h>
#include <time.h>
#include <math.h>
-#include <FL/glut.h> // changed for fltk
-#include <FL/glu.h> // added for fltk
+#include <fltk3/glut.h> // changed for fltk
+#include <fltk3/glu.h> // added for fltk
#include "trackball.c" // changed from trackball.h for fltk
#define WIDTH 4
_______________________________________________
fltk-commit mailing list
[email protected]
http://lists.easysw.com/mailman/listinfo/fltk-commit
