Author: dejan
Date: 2007-11-13 17:49:47 -0800 (Tue, 13 Nov 2007)
New Revision: 5971
Log:
These changes fulfill the request in STR#1783 to discard use of the old
FLTK 1.x API in the "mandelbrot" demo application. It amazes me how bad
these examples are... It is obvious that they have been written long ago
and were patched many times according to changes in FLTK API... This demo
could be written in much more clear and effective way, IMHO.


Modified:
   trunk/test/mandelbrot.cxx
   trunk/test/mandelbrot.h
   trunk/test/mandelbrot_ui.cxx
   trunk/test/mandelbrot_ui.h

Modified: trunk/test/mandelbrot.cxx
===================================================================
--- trunk/test/mandelbrot.cxx   2007-11-13 23:05:48 UTC (rev 5970)
+++ trunk/test/mandelbrot.cxx   2007-11-14 01:49:47 UTC (rev 5971)
@@ -23,23 +23,31 @@
 // Please report all bugs and problems to "[EMAIL PROTECTED]".
 //
 
-#include "mandelbrot_ui.h"
-#include <fltk/draw.h>
 #include <stdio.h>
 #include <stdlib.h>
 
-Drawing_Window mbrot;
-Drawing_Window jbrot;
+#include <fltk/run.h>
+#include <fltk/error.h>
+#include <fltk/draw.h>
+#include <fltk/visual.h>
+#include <fltk/events.h>
+#include <fltk/Widget.h>
+#include "mandelbrot_ui.h"
 
+DrawingWindow mbrot;
+DrawingWindow jbrot;
+
 void idle() {
-  if (!mbrot.d->idle() && !(jbrot.d && jbrot.d->idle())) Fl::set_idle(0);
+  if (!mbrot.d->idle() && !(jbrot.d && jbrot.d->idle())) fltk::set_idle(0);
 }
 
 void set_idle() {
-  Fl::set_idle(idle);
+  fltk::set_idle(idle);
 }
 
-static void window_callback(Fl_Widget*, void*) {exit(0);}
+static void window_callback(fltk::Widget*, void*) {
+  exit(0);
+}
 
 int main(int argc, char **argv) {
   mbrot.make_window();
@@ -48,58 +56,60 @@
   mbrot.d->scale = 2.5;
   mbrot.update_label();
   int i = 0;
-  if (Fl::args(argc,argv,i) < argc) Fl::fatal(Fl::help);
-  Fl::visual(FL_RGB);
+  if (fltk::args(argc, argv, i) < argc)
+    fltk::fatal(fltk::help);
+  fltk::visual(fltk::RGB);
   mbrot.window->callback(window_callback);
-  mbrot.window->show(argc,argv);
-  Fl::run();
-  return 0;
+  mbrot.window->show(argc, argv);
+  return fltk::run();
 }
 
-void Drawing_Window::update_label() {
+void DrawingWindow::update_label() {
   char buffer[128];
   sprintf(buffer, "%+.10f", d->X); x_input->text(buffer);
   sprintf(buffer, "%+.10f", d->Y); y_input->text(buffer);
   sprintf(buffer, "%.2g", d->scale); w_input->text(buffer);
 }
 
-void Drawing_Area::draw() {
+void DrawingArea::draw() {
   draw_box();
   drawn = 0;
   set_idle();
 }
 
-int Drawing_Area::idle() {
+int DrawingArea::idle() {
   if (!window()->visible()) return 0;
   if (drawn < nextline) {
     make_current(); // deleted window-> from this for fltk2.0
-    int yy = drawn+4;
-    if (yy >= sy && yy <= sy+sh) erase_box();
-    fltk::drawimage(buffer+drawn*W,fltk::MONO,fltk::Rectangle(3,yy,W,1),W);
+    int yy = drawn + 4;
+    if (yy >= sy && yy <= sy + sh) erase_box();
+    fltk::drawimage(buffer + drawn*W, fltk::MONO, fltk::Rectangle(3, yy, W, 
1), W);
     //fltk::draw_image_mono(buffer+drawn*W, 3,yy,W,1,1,W);
     drawn++;
     return 1;
   }
   if (nextline < H) {
     if (!buffer) buffer = new uchar[W*H];
-    double yy = Y+(H/2-nextline)*scale/W;
+    double yy = Y + (H / 2 - nextline) * scale / W;
     double yi = yy; if (julia) yy = jY;
-    uchar *p = buffer+nextline*W;
+    uchar *p = buffer + nextline * W;
     for (int xi = 0; xi < W; xi++) {
-      double xx = X+(xi-W/2)*scale/W;
+      double xx = X + (xi - W / 2) * scale / W;
       double wx = xx; double wy = yi;
       if (julia) xx = jX;
-      for (int i=0; ; i++) {
-       if (i >= iterations) {*p = 0; break;}
-       double t = wx*wx - wy*wy + xx;
-       wy = 2*wx*wy + yy;
-       wx = t;
-       if (wx*wx + wy*wy > 4) {
-         wx = t = 1-double(i)/(1<<10);
-         if (t <= 0) t = 0; else for (i=brightness; i--;) t*=wx;
-         *p = 255-int(254*t);
-         break;
-       }
+      for (int i = 0; ; i++) {
+        if (i >= iterations) {
+          *p = 0; break;
+        }
+        double t = wx * wx - wy * wy + xx;
+        wy = 2 * wx * wy + yy;
+        wx = t;
+        if (wx*wx + wy*wy > 4) {
+          wx = t = 1 - double(i) / (1 << 10);
+          if (t <= 0) t = 0; else for (i = brightness; i--;) t *= wx;
+          *p = 255 - int(254 * t);
+          break;
+        }
       }
       p++;
     }
@@ -109,99 +119,111 @@
   return 0;
 }
 
-void Drawing_Area::erase_box() {
+void DrawingArea::erase_box() {
   make_current();
   fltk::overlay_clear();
 }
 
 // For fltk2.0, all the occurances of x() and y() were replaced by 0:
 
-int Drawing_Area::handle(int event) {
+int DrawingArea::handle(int event) {
   static int ix, iy;
   static int dragged;
   static int button;
-  int x2,y2;
+  int x2, y2;
   switch (event) {
-  case FL_PUSH:
-    erase_box();
-    ix = Fl::event_x(); if (ix<0) ix=0; if (ix>=w()) ix=w()-1;
-    iy = Fl::event_y(); if (iy<0) iy=0; if (iy>=h()) iy=h()-1;
-    dragged = 0;
-    button = Fl::event_button();
-    return 1;
-  case FL_DRAG:
-    dragged = 1;
-    erase_box();
-    x2 = Fl::event_x(); if (x2<0) x2=0; if (x2>=w()) x2=w()-1;
-    y2 = Fl::event_y(); if (y2<0) y2=0; if (y2>=h()) y2=h()-1;
-    if (button != 1) {ix = x2; iy = y2; return 1;}
-    if (ix < x2) {sx = ix; sw = x2-ix;} else {sx = x2; sw = ix-x2;}
-    if (iy < y2) {sy = iy; sh = y2-iy;} else {sy = y2; sh = iy-y2;}
-    make_current();
-    fltk::overlay_rect(sx,sy,sw,sh);
-    return 1;
-  case FL_RELEASE:
-    if (button == 1) {
+    case fltk::PUSH:
       erase_box();
-      if (dragged && sw > 3 && sh > 3) {
-       X = X + (sx+sw/2-W/2)*scale/W;
-       Y = Y + (-sy-sh/2+H/2)*scale/W;
-       scale = sw*scale/W;
-      } else if (!dragged) {
-       scale = 2*scale;
-       if (julia) {
-         if (scale >= 4) {
-           scale = 4;
-           X = Y = 0;
-         }
-       } else {
-         if (scale >= 2.5) {
-           scale = 2.5;
-           X = -.75;
-           Y = 0;
-         }
-       }
-      } else return 1;
-      ((Drawing_Window*)(user_data()))->update_label();
-      new_display();
-    } else if (!julia) {
-      if (!jbrot.d) {
-       jbrot.make_window();
-       jbrot.window->clear_double_buffer(); // otherwise make_current does not 
work
-       jbrot.d->julia = 1;
-       jbrot.d->X = 0;
-       jbrot.d->Y = 0;
-       jbrot.d->scale = 4;
-       jbrot.update_label();
+      ix = fltk::event_x(); if (ix < 0) ix = 0; if (ix >= w()) ix = w() - 1;
+      iy = fltk::event_y(); if (iy < 0) iy = 0; if (iy >= h()) iy = h() - 1;
+      dragged = 0;
+      button = fltk::event_button();
+      return 1;
+    case fltk::DRAG:
+      dragged = 1;
+      erase_box();
+      x2 = fltk::event_x(); if (x2 < 0) x2 = 0; if (x2 >= w()) x2 = w() - 1;
+      y2 = fltk::event_y(); if (y2 < 0) y2 = 0; if (y2 >= h()) y2 = h() - 1;
+      if (button != 1) {
+        ix = x2; iy = y2; return 1;
       }
-      jbrot.d->jX = X + (ix-W/2)*scale/W;
-      jbrot.d->jY = Y + (H/2-iy)*scale/W;
-      static char s[128];
-      sprintf(s, "Julia %.7f %.7f",jbrot.d->jX,jbrot.d->jY);
-      jbrot.window->label(s);
-      jbrot.window->show();
-      jbrot.d->new_display();
-    }
-    return 1;
-  default:
-    return Widget::handle(event);
+      if (ix < x2) {
+        sx = ix; sw = x2 - ix;
+      } else {
+        sx = x2; sw = ix - x2;
+      }
+      if (iy < y2) {
+        sy = iy; sh = y2 - iy;
+      } else {
+        sy = y2; sh = iy - y2;
+      }
+      make_current();
+      fltk::overlay_rect(sx, sy, sw, sh);
+      return 1;
+    case fltk::RELEASE:
+      if (button == 1) {
+        erase_box();
+        if (dragged && sw > 3 && sh > 3) {
+          X = X + (sx + sw / 2 - W / 2) * scale / W;
+          Y = Y + (-sy - sh / 2 + H / 2) * scale / W;
+          scale = sw * scale / W;
+        } else if (!dragged) {
+          scale = 2 * scale;
+          if (julia) {
+            if (scale >= 4) {
+              scale = 4;
+              X = Y = 0;
+            }
+          } else {
+            if (scale >= 2.5) {
+              scale = 2.5;
+              X = -.75;
+              Y = 0;
+            }
+          }
+        } else return 1;
+        ((DrawingWindow*)(user_data()))->update_label();
+        new_display();
+      } else if (!julia) {
+        if (!jbrot.d) {
+          jbrot.make_window();
+          jbrot.window->clear_double_buffer(); // otherwise make_current does 
not work
+          jbrot.d->julia = 1;
+          jbrot.d->X = 0;
+          jbrot.d->Y = 0;
+          jbrot.d->scale = 4;
+          jbrot.update_label();
+        }
+        jbrot.d->jX = X + (ix - W / 2) * scale / W;
+        jbrot.d->jY = Y + (H / 2 - iy) * scale / W;
+        static char s[128];
+        sprintf(s, "Julia %.7f %.7f", jbrot.d->jX, jbrot.d->jY);
+        jbrot.window->label(s);
+        jbrot.window->show();
+        jbrot.d->new_display();
+      }
+      return 1;
+    default:
+      return Widget::handle(event);
   }
 }
 
-void Drawing_Area::new_display() {
+void DrawingArea::new_display() {
   drawn = nextline = 0;
   set_idle();
 }
 
 #include <fltk/layout.h> // added for fltk2.0
 
-void Drawing_Area::layout() {
-  if (layout_damage()&fltk::LAYOUT_WH) {
-    W = w()-6;
-    H = h()-8;
-    if (buffer) {delete[] buffer; buffer = 0; new_display();}
+void DrawingArea::layout() {
+  if (layout_damage() & fltk::LAYOUT_WH) {
+    W = w() - 6;
+    H = h() - 8;
+    if (buffer) {
+      delete[] buffer; buffer = 0; new_display();
+    }
   }
-  Fl_Box::layout();
+  fltk::Widget::layout();
 }
 
 //

Modified: trunk/test/mandelbrot.h
===================================================================
--- trunk/test/mandelbrot.h     2007-11-13 23:05:48 UTC (rev 5970)
+++ trunk/test/mandelbrot.h     2007-11-14 01:49:47 UTC (rev 5971)
@@ -23,24 +23,20 @@
 // Please report all bugs and problems to "[EMAIL PROTECTED]".
 //
 
-#include <FL/Fl.H>
-#include <FL/Fl_Box.H>
-#include <FL/Fl_Slider.H>
-#include <FL/Fl_Window.H>
-#include <FL/Fl_Input.H>
+#include <fltk/Widget.h>
 
-class Drawing_Area : public Fl_Box {
+class DrawingArea : public fltk::Widget {
   void draw();
 public:
   uchar *buffer;
-  int W,H;
+  int W, H;
   int nextline;
   int drawn;
   int julia;
   int iterations;
   int brightness;
   double jX, jY;
-  double X,Y,scale;
+  double X, Y, scale;
   int sx, sy, sw, sh; // selection box
   void erase_box();
   int handle(int);
@@ -52,16 +48,16 @@
     MAX_ITERATIONS = 14,
     DEFAULT_ITERATIONS = 7
   };
-  Drawing_Area(int x,int y,int w,int h) : Fl_Box(x,y,w,h) {
+  DrawingArea(int x, int y, int w, int h) : fltk::Widget(x, y, w, h) {
     buffer = 0;
-    W = w-6;
-    H = h-8;
+    W = w - 6;
+    H = h - 8;
     nextline = 0;
     drawn = 0;
     julia = 0;
     X = Y = 0;
     scale = 4.0;
-    iterations = 1<<DEFAULT_ITERATIONS;
+    iterations = 1 << DEFAULT_ITERATIONS;
     brightness = DEFAULT_BRIGHTNESS;
   }
   int idle();

Modified: trunk/test/mandelbrot_ui.cxx
===================================================================
--- trunk/test/mandelbrot_ui.cxx        2007-11-13 23:05:48 UTC (rev 5970)
+++ trunk/test/mandelbrot_ui.cxx        2007-11-14 01:49:47 UTC (rev 5971)
@@ -2,54 +2,56 @@
 
 #include "mandelbrot_ui.h"
 
-inline void Drawing_Window::cb_x_input_i(fltk::FloatInput* o, void*) {
+inline void DrawingWindow::cb_x_input_i(fltk::FloatInput* o, void*) {
   d->X = o->fvalue();
   d->new_display();
 }
-void Drawing_Window::cb_x_input(fltk::FloatInput* o, void* v) {
-  ((Drawing_Window*)(o->parent()->user_data()))->cb_x_input_i(o,v);
+void DrawingWindow::cb_x_input(fltk::FloatInput* o, void* v) {
+  ((DrawingWindow*)(o->parent()->user_data()))->cb_x_input_i(o, v);
 }
 
-inline void Drawing_Window::cb_y_input_i(fltk::FloatInput* o, void*) {
+inline void DrawingWindow::cb_y_input_i(fltk::FloatInput* o, void*) {
   d->Y = o->fvalue();
   d->new_display();
 }
-void Drawing_Window::cb_y_input(fltk::FloatInput* o, void* v) {
-  ((Drawing_Window*)(o->parent()->user_data()))->cb_y_input_i(o,v);
+void DrawingWindow::cb_y_input(fltk::FloatInput* o, void* v) {
+  ((DrawingWindow*)(o->parent()->user_data()))->cb_y_input_i(o, v);
 }
 
-inline void Drawing_Window::cb_w_input_i(fltk::FloatInput* o, void*) {
+inline void DrawingWindow::cb_w_input_i(fltk::FloatInput* o, void*) {
   d->scale = o->fvalue();
   d->new_display();
 }
-void Drawing_Window::cb_w_input(fltk::FloatInput* o, void* v) {
-  ((Drawing_Window*)(o->parent()->user_data()))->cb_w_input_i(o,v);
+void DrawingWindow::cb_w_input(fltk::FloatInput* o, void* v) {
+  ((DrawingWindow*)(o->parent()->user_data()))->cb_w_input_i(o, v);
 }
 
-inline void Drawing_Window::cb_brightness_i(fltk::Slider* o, void*) {
+inline void DrawingWindow::cb_brightness_i(fltk::Slider* o, void*) {
   d->brightness = int(o->value());
   d->new_display();
 }
-void Drawing_Window::cb_brightness(fltk::Slider* o, void* v) {
-  ((Drawing_Window*)(o->parent()->user_data()))->cb_brightness_i(o,v);
+void DrawingWindow::cb_brightness(fltk::Slider* o, void* v) {
+  ((DrawingWindow*)(o->parent()->user_data()))->cb_brightness_i(o, v);
 }
 
-inline void Drawing_Window::cb_iterations_i(fltk::Slider* o, void*) {
-  d->iterations = 1<<int(o->value());
+inline void DrawingWindow::cb_iterations_i(fltk::Slider* o, void*) {
+  d->iterations = 1 << int(o->value());
   d->new_display();
 }
-void Drawing_Window::cb_iterations(fltk::Slider* o, void* v) {
-  ((Drawing_Window*)(o->parent()->user_data()))->cb_iterations_i(o,v);
+void DrawingWindow::cb_iterations(fltk::Slider* o, void* v) {
+  ((DrawingWindow*)(o->parent()->user_data()))->cb_iterations_i(o, v);
 }
 
-void Drawing_Window::make_window() {
+void DrawingWindow::make_window() {
   fltk::Window* w;
-   {fltk::Window* o = window = new fltk::Window(430, 510);
+  {
+    fltk::Window* o = window = new fltk::Window(430, 510);
     w = o;
     o->set_vertical();
     o->user_data((void*)(this));
     o->begin();
-     {Drawing_Area* o = d = new Drawing_Area(10, 70, 410, 430);
+    {
+      DrawingArea* o = d = new DrawingArea(10, 70, 410, 430);
       o->set_vertical();
       o->box(fltk::DOWN_BOX);
       o->color((fltk::Color)56);
@@ -57,39 +59,43 @@
       o->user_data((void*)(this));
       fltk::Group::current()->resizable(o);
       o->tooltip("Left-click will zoom out by 2.\nLeft-drag will select a 
region to zoom in to.\
-\nRight-click will create the Julia set viewer and set it to that point.");
+                 \nRight-click will create the Julia set viewer and set it to 
that point.");
     }
-     {fltk::FloatInput* o = x_input = new fltk::FloatInput(10, 10, 130, 25, 
"x");
+    {
+      fltk::FloatInput* o = x_input = new fltk::FloatInput(10, 10, 130, 25, 
"x");
       o->type(1);
       o->labelfont(fltk::HELVETICA_ITALIC);
       o->textfont(fltk::HELVETICA_BOLD);
       o->labelsize(10);
       o->callback((fltk::Callback*)cb_x_input);
-      o->align(fltk::ALIGN_LEFT|fltk::ALIGN_INSIDE);
+      o->align(fltk::ALIGN_LEFT | fltk::ALIGN_INSIDE);
       o->tooltip("x coordinate of window center");
-      o->when(FL_WHEN_ENTER_KEY|FL_WHEN_RELEASE);
+      o->when(fltk::WHEN_ENTER_KEY | fltk::WHEN_RELEASE);
     }
-     {fltk::FloatInput* o = y_input = new fltk::FloatInput(150, 10, 130, 25, 
"y");
+    {
+      fltk::FloatInput* o = y_input = new fltk::FloatInput(150, 10, 130, 25, 
"y");
       o->type(1);
       o->labelfont(fltk::HELVETICA_ITALIC);
       o->textfont(fltk::HELVETICA_BOLD);
       o->labelsize(10);
       o->callback((fltk::Callback*)cb_y_input);
-      o->align(fltk::ALIGN_LEFT|fltk::ALIGN_INSIDE);
+      o->align(fltk::ALIGN_LEFT | fltk::ALIGN_INSIDE);
       o->tooltip("y coordinate of window center");
-      o->when(FL_WHEN_ENTER_KEY|FL_WHEN_RELEASE);
+      o->when(fltk::WHEN_ENTER_KEY | fltk::WHEN_RELEASE);
     }
-     {fltk::FloatInput* o = w_input = new fltk::FloatInput(290, 10, 130, 25, 
"w");
+    {
+      fltk::FloatInput* o = w_input = new fltk::FloatInput(290, 10, 130, 25, 
"w");
       o->type(1);
       o->labelfont(fltk::HELVETICA_ITALIC);
       o->textfont(fltk::HELVETICA_BOLD);
       o->labelsize(10);
       o->callback((fltk::Callback*)cb_w_input);
-      o->align(fltk::ALIGN_LEFT|fltk::ALIGN_INSIDE);
+      o->align(fltk::ALIGN_LEFT | fltk::ALIGN_INSIDE);
       o->tooltip("width of the window");
-      o->when(FL_WHEN_ENTER_KEY|FL_WHEN_RELEASE);
+      o->when(fltk::WHEN_ENTER_KEY | fltk::WHEN_RELEASE);
     }
-     {fltk::Slider* o = new fltk::Slider(70, 40, 160, 15, "brightness:");
+    {
+      fltk::Slider* o = new fltk::Slider(70, 40, 160, 15, "brightness:");
       o->box(fltk::THIN_DOWN_BOX);
       o->labelsize(10);
       o->step(1);
@@ -97,19 +103,22 @@
       o->callback((fltk::Callback*)cb_brightness);
       o->align(fltk::ALIGN_LEFT);
       o->tooltip("Change mapping from iteration count to gray level so that 
details are visible\
-.");
-      o->bounds(0,d->MAX_BRIGHTNESS);
+                 .");
+      o->range(0, d->MAX_BRIGHTNESS);
       o->value(d->DEFAULT_BRIGHTNESS);
-      o->slider(FL_UP_BOX);
+      o->box(fltk::DOWN_BOX);
+      o->step(1 / d->MAX_BRIGHTNESS);
     }
-     {fltk::InvisibleBox* o = new fltk::InvisibleBox(240, 40, 180, 26, "FLTK 
Mandelbrot Viewer");
+    {
+      fltk::InvisibleBox* o = new fltk::InvisibleBox(240, 40, 180, 26, "FLTK 
Mandelbrot Viewer");
       o->box(fltk::EMBOSSED_BOX);
       o->labelfont(fltk::HELVETICA_BOLD);
       o->labelsize(10);
-      o->align(fltk::ALIGN_RIGHT|fltk::ALIGN_INSIDE);
+      o->align(fltk::ALIGN_RIGHT | fltk::ALIGN_INSIDE);
       o->deactivate();
     }
-     {fltk::Slider* o = new fltk::Slider(70, 55, 160, 15, "iterations:");
+    {
+      fltk::Slider* o = new fltk::Slider(70, 55, 160, 15, "iterations:");
       o->box(fltk::THIN_DOWN_BOX);
       o->labelsize(10);
       o->step(1);
@@ -117,12 +126,13 @@
       o->callback((fltk::Callback*)cb_iterations);
       o->align(fltk::ALIGN_LEFT);
       o->tooltip("Set number of iterations before it colors the pixel black. 
Higher values make\
- it more accurate.");
-      o->bounds(1,d->MAX_ITERATIONS);
+                 it more accurate.");
+      o->range(1, d->MAX_ITERATIONS);
       o->value(d->DEFAULT_ITERATIONS);
-      o->slider(FL_UP_BOX);
+      o->box(fltk::DOWN_BOX);
+      o->step(1 / d->MAX_ITERATIONS);
     }
     o->end();
-    o->size_range(220,220);
+    o->size_range(220, 220);
   }
 }

Modified: trunk/test/mandelbrot_ui.h
===================================================================
--- trunk/test/mandelbrot_ui.h  2007-11-13 23:05:48 UTC (rev 5970)
+++ trunk/test/mandelbrot_ui.h  2007-11-14 01:49:47 UTC (rev 5971)
@@ -8,29 +8,29 @@
 #include <fltk/Slider.h>
 #include <fltk/InvisibleBox.h>
 
-class Drawing_Window  {
+class DrawingWindow  {
 public:
+  fltk::Window *window;
   void make_window();
-  fltk::Window *window;
-    Drawing_Area *d;
-    fltk::FloatInput *x_input;
+  DrawingArea *d;
+  fltk::FloatInput *x_input;
 private:
-    inline void cb_x_input_i(fltk::FloatInput*, void*);
-    static void cb_x_input(fltk::FloatInput*, void*);
+  inline void cb_x_input_i(fltk::FloatInput*, void*);
+  static void cb_x_input(fltk::FloatInput*, void*);
 public:
-    fltk::FloatInput *y_input;
+  fltk::FloatInput *y_input;
 private:
-    inline void cb_y_input_i(fltk::FloatInput*, void*);
-    static void cb_y_input(fltk::FloatInput*, void*);
+  inline void cb_y_input_i(fltk::FloatInput*, void*);
+  static void cb_y_input(fltk::FloatInput*, void*);
 public:
-    fltk::FloatInput *w_input;
+  fltk::FloatInput *w_input;
 private:
-    inline void cb_w_input_i(fltk::FloatInput*, void*);
-    static void cb_w_input(fltk::FloatInput*, void*);
-    inline void cb_brightness_i(fltk::Slider*, void*);
-    static void cb_brightness(fltk::Slider*, void*);
-    inline void cb_iterations_i(fltk::Slider*, void*);
-    static void cb_iterations(fltk::Slider*, void*);
+  inline void cb_w_input_i(fltk::FloatInput*, void*);
+  static void cb_w_input(fltk::FloatInput*, void*);
+  inline void cb_brightness_i(fltk::Slider*, void*);
+  static void cb_brightness(fltk::Slider*, void*);
+  inline void cb_iterations_i(fltk::Slider*, void*);
+  static void cb_iterations(fltk::Slider*, void*);
 public:
   void update_label();
 };

_______________________________________________
fltk-commit mailing list
fltk-commit@easysw.com
http://lists.easysw.com/mailman/listinfo/fltk-commit

Reply via email to