Author: matt
Date: 2011-05-23 11:13:10 -0700 (Mon, 23 May 2011)
New Revision: 8725
Log:
123: CubeView and fast_slow work, keyboard_ui

Modified:
   branches/branch-3.0/fluid/Fl_Widget_Type.cxx
   branches/branch-3.0/test/CubeMain.cxx
   branches/branch-3.0/test/CubeView.h
   branches/branch-3.0/test/CubeViewUI.fl
   branches/branch-3.0/test/fast_slow.fl
   branches/branch-3.0/test/inactive.fl
   branches/branch-3.0/test/keyboard.cxx
   branches/branch-3.0/test/keyboard.h
   branches/branch-3.0/test/keyboard_ui.fl

Modified: branches/branch-3.0/fluid/Fl_Widget_Type.cxx
===================================================================
--- branches/branch-3.0/fluid/Fl_Widget_Type.cxx        2011-05-23 18:01:29 UTC 
(rev 8724)
+++ branches/branch-3.0/fluid/Fl_Widget_Type.cxx        2011-05-23 18:13:10 UTC 
(rev 8725)
@@ -2355,7 +2355,7 @@
   if (!o->active())
     write_c("%s%s->deactivate();\n", indent(), var);
   if (!is_group() && resizable())
-    write_c("%sFl_Group::current()->resizable(%s);\n", indent(), var);
+    write_c("%sfltk3::Group::current()->resizable(%s);\n", indent(), var);
   if (hotspot()) {
     if (is_class())
       write_c("%shotspot(%s);\n", indent(), var);

Modified: branches/branch-3.0/test/CubeMain.cxx
===================================================================
--- branches/branch-3.0/test/CubeMain.cxx       2011-05-23 18:01:29 UTC (rev 
8724)
+++ branches/branch-3.0/test/CubeMain.cxx       2011-05-23 18:13:10 UTC (rev 
8725)
@@ -36,7 +36,7 @@
     
 //Initial global objects.
     
-    Fl::visual(FL_DOUBLE|FL_INDEX);
+    fltk3::visual(fltk3::DOUBLE|fltk3::INDEX);
 
     cvui->show(argc, argv);
     

Modified: branches/branch-3.0/test/CubeView.h
===================================================================
--- branches/branch-3.0/test/CubeView.h 2011-05-23 18:01:29 UTC (rev 8724)
+++ branches/branch-3.0/test/CubeView.h 2011-05-23 18:13:10 UTC (rev 8725)
@@ -30,7 +30,7 @@
 #include <config.h>
 #include <fltk3/run.h>
 #if HAVE_GL
-#  include <fltk3/Gl_Window.h>
+#  include <fltk3/GlWindow.h>
 #  include <fltk3/gl.h>
 #else
 #  include <fltk3/Box.h>

Modified: branches/branch-3.0/test/CubeViewUI.fl
===================================================================
--- branches/branch-3.0/test/CubeViewUI.fl      2011-05-23 18:01:29 UTC (rev 
8724)
+++ branches/branch-3.0/test/CubeViewUI.fl      2011-05-23 18:13:10 UTC (rev 
8725)
@@ -1,67 +1,67 @@
 # data file for the Fltk User Interface Designer (fluid)
-version 1.0108 
+version 3.0000 
 header_name {.h} 
 code_name {.cxx}
 class CubeViewUI {open
 } {
   Function {CubeViewUI()} {open
   } {
-    Fl_Window mainWindow {
+    {fltk3::Window} mainWindow {
       label CubeView open
       private xywh {428 124 415 405} type Double box UP_BOX labelsize 12 
resizable visible
     } {
-      Fl_Group {} {open
+      {fltk3::Group} {} {open
         xywh {5 3 374 399}
       } {
-        Fl_Group VChange {open
+        {fltk3::Group} VChange {open
           xywh {5 100 37 192}
         } {
-          Fl_Roller vrot {
+          {fltk3::Roller} vrot {
             label {V Rot}
-            callback {cube->v_angle(((Fl_Roller *)o)->value());
+            callback {cube->v_angle(((fltk3::Roller *)o)->value());
 cube->redraw();}
             xywh {5 100 17 186} labeltype NO_LABEL labelsize 12 align 128 
minimum -180 maximum 180 step 1
             code0 {\#include <stdio.h>}
           }
-          Fl_Slider ypan {
+          {fltk3::Slider} ypan {
             label {V Pan}
-            callback {cube->pany(((Fl_Slider *)o)->value());
+            callback {cube->pany(((fltk3::Slider *)o)->value());
 cube->redraw();}
             xywh {25 100 17 186} type {Vert Knob} selection_color 136 
labeltype NO_LABEL labelsize 12 align 0 minimum -25 maximum 25 step 0.1
           }
         }
-        Fl_Group HChange {open
+        {fltk3::Group} HChange {open
           xywh {120 362 190 40}
         } {
-          Fl_Slider xpan {
+          {fltk3::Slider} xpan {
             label {H Pan}
-            callback {cube->panx(((Fl_Slider *)o)->value());
+            callback {cube->panx(((fltk3::Slider *)o)->value());
 cube->redraw();}
             xywh {122 364 186 17} type {Horz Knob} selection_color 136 
labeltype NO_LABEL labelsize 12 align 16 minimum 25 maximum -25 step 0.1
           }
-          Fl_Roller hrot {
+          {fltk3::Roller} hrot {
             label {H Rotation}
-            callback {cube->h_angle(((Fl_Roller *)o)->value());
+            callback {cube->h_angle(((fltk3::Roller *)o)->value());
 cube->redraw();}
             xywh {122 383 186 17} type Horizontal labeltype NO_LABEL labelsize 
12 align 8 minimum -180 maximum 180 step 1
           }
         }
-        Fl_Group MainView {open
+        {fltk3::Group} MainView {open
           xywh {46 27 333 333} resizable
         } {
-          Fl_Box cframe {
+          {fltk3::Box} cframe {
             xywh {46 27 333 333} box DOWN_FRAME color 4 selection_color 69
           }
-          Fl_Box cube {
-            label {This is the cube_view} selected
+          {fltk3::Box} cube {
+            label {This is the cube_view}
             xywh {48 29 329 329} align 16 resizable
             code0 {\#include "CubeView.h"}
             class CubeView
           }
         }
-        Fl_Value_Slider zoom {
+        {fltk3::ValueSlider} zoom {
           label Zoom
-          callback {cube->size=((Fl_Value_Slider *)o)->value();
+          callback {cube->size=((fltk3::ValueSlider *)o)->value();
 cube->redraw();}
           xywh {106 3 227 19} type {Horz Knob} selection_color 136 labelfont 1 
labelsize 12 align 4 minimum 1 maximum 50 step 0.1 value 10 textfont 1
         }
@@ -70,6 +70,7 @@
   }
   Function {show(int argc, char **argv)} {open
   } {
-    code {mainWindow->show(argc, argv);} {}
+    code {mainWindow->show(argc, argv);} {selected
+    }
   }
 } 

Modified: branches/branch-3.0/test/fast_slow.fl
===================================================================
--- branches/branch-3.0/test/fast_slow.fl       2011-05-23 18:01:29 UTC (rev 
8724)
+++ branches/branch-3.0/test/fast_slow.fl       2011-05-23 18:13:10 UTC (rev 
8725)
@@ -1,39 +1,36 @@
 # data file for the Fltk User Interface Designer (fluid)
-version 1.00 
+version 3.0000 
 header_name {.h} 
-code_name {.cxx} 
-gridx 10 
-gridy 10 
-snap 3
+code_name {.cxx}
 Function {} {open
 } {
-  Fl_Window {} {open
-    xywh {143 188 318 443} resizable visible
+  {fltk3::Window} {} {open
+    xywh {456 204 318 443} type Double resizable visible
   } {
-    Fl_Slider control {
+    {fltk3::Slider} control {
       label {move
 this}
       callback {fast->value(o->value());
-if (!Fl::pushed()) slow->value(o->value());}
+if (!fltk3::pushed()) slow->value(o->value());}
       xywh {90 200 30 200}
-      code0 {o->when(FL_WHEN_CHANGED|FL_WHEN_RELEASE|FL_WHEN_NOT_CHANGED);}
+      code0 
{o->when(fltk3::WHEN_CHANGED|fltk3::WHEN_RELEASE|fltk3::WHEN_NOT_CHANGED);}
     }
-    Fl_Slider fast {
+    {fltk3::Slider} fast {
       label {fast
-redraw} selected
+redraw}
       xywh {140 200 30 200}
       code0 {o->set_output();}
     }
-    Fl_Slider slow {
+    {fltk3::Slider} slow {
       label {slow
-redraw} selected
+redraw}
       xywh {190 200 30 200}
       code0 {o->set_output();}
     }
-    Fl_Box {} {
-      label {The left slider has changed( FL_WHEN_CHANGED | FL_WHEN_RELEASE | 
FL_WHEN_NOT_CHANGED) so it produces a callback on both drag and release mouse 
events.
+    {fltk3::Box} {} {
+      label {The left slider has changed( fltk3::WHEN_CHANGED | 
fltk3::WHEN_RELEASE | fltk3::WHEN_NOT_CHANGED) so it produces a callback on 
both drag and release mouse events.
 The middle slider (representing a widget with low overhead) is changed on 
every mouse movement.
-The right slider (representing a widget with high overhead) is only updated 
when the mouse is released, by checking if Fl::pushed() is zero.}
+The right slider (representing a widget with high overhead) is only updated 
when the mouse is released, by checking if fltk3::pushed() is zero.} selected
       xywh {10 10 300 180} box DOWN_BOX color 53 selection_color 47 labelfont 
4 labelsize 12 align 148
     }
   }

Modified: branches/branch-3.0/test/inactive.fl
===================================================================
--- branches/branch-3.0/test/inactive.fl        2011-05-23 18:01:29 UTC (rev 
8724)
+++ branches/branch-3.0/test/inactive.fl        2011-05-23 18:13:10 UTC (rev 
8725)
@@ -1,117 +1,117 @@
 # data file for the Fltk User Interface Designer (fluid)
-version 1.0107 
+version 3.0000 
 header_name {.h} 
 code_name {.cxx}
 Function {} {open
 } {
-  Fl_Window {} {open
-    xywh {379 190 420 369} type Double resizable visible
+  {fltk3::Window} {} {open
+    xywh {440 191 420 369} type Double resizable visible
   } {
-    Fl_Group the_group {
-      label {activate()/deactivate() called on this Fl_Group} open
+    {fltk3::Group} the_group {
+      label {activate()/deactivate() called on this fltk3::Group} open
       xywh {25 25 375 295} box ENGRAVED_FRAME align 17 resizable
     } {
-      Fl_Button {} {
+      {fltk3::Button} {} {
         label button
         xywh {50 50 105 25}
       }
-      Fl_Light_Button {} {
+      {fltk3::LightButton} {} {
         label {light button}
         xywh {50 80 105 25} value 1 align 16
       }
-      Fl_Group {} {
+      {fltk3::Group} {} {
         label {Child group} open
         xywh {50 130 105 125} box DOWN_FRAME
       } {
-        Fl_Check_Button {} {
+        {fltk3::CheckButton} {} {
           label red
           xywh {50 170 105 25} type Radio down_box DIAMOND_DOWN_BOX 
selection_color 1 labelcolor 1
         }
-        Fl_Check_Button {} {
+        {fltk3::CheckButton} {} {
           label green
           xywh {50 190 105 25} type Radio down_box DIAMOND_DOWN_BOX 
selection_color 2 labelcolor 2
         }
-        Fl_Check_Button {} {
+        {fltk3::CheckButton} {} {
           label blue
           xywh {50 210 105 25} type Radio down_box DIAMOND_DOWN_BOX 
selection_color 4 labelcolor 4
         }
-        Fl_Check_Button {} {
+        {fltk3::CheckButton} {} {
           label white
           xywh {50 230 105 25} type Radio down_box DIAMOND_DOWN_BOX 
selection_color 55 labelcolor 55
         }
-        Fl_Check_Button {} {
+        {fltk3::CheckButton} {} {
           label check
           xywh {50 130 105 25} down_box DOWN_BOX
         }
-        Fl_Round_Button {} {
+        {fltk3::RoundButton} {} {
           label round
           xywh {50 150 105 25} down_box ROUND_DOWN_BOX
         }
       }
-      Fl_Slider {} {
-        label Fl_Slider selected
+      {fltk3::Slider} {} {
+        label slider
         xywh {165 50 24 205} value 0.5
       }
-      Fl_Input {} {
+      {fltk3::Input} {} {
         xywh {195 50 195 30}
-        code0 {o->static_value("Fl_Input");}
+        code0 {o->static_value("Text Input");}
       }
-      Fl_Menu_Button {} {
+      {fltk3::MenuButton} {} {
         label menu open
         xywh {245 90 130 30}
       } {
         MenuItem {} {
           label item
-          xywh {0 0 100 20} labelsize 14
+          xywh {0 0 100 20}
         }
         MenuItem {} {
           label item
-          xywh {10 10 100 20} labelsize 14
+          xywh {10 10 100 20}
         }
         MenuItem {} {
           label item
-          xywh {20 20 100 20} labelsize 14
+          xywh {20 20 100 20}
         }
         MenuItem {} {
           label item
-          xywh {30 30 100 20} labelsize 14
+          xywh {30 30 100 20}
         }
         MenuItem {} {
           label item
-          xywh {40 40 100 20} labelsize 14
+          xywh {40 40 100 20}
         }
       }
-      Fl_Value_Output {} {
+      {fltk3::ValueOutput} {} {
         label {value:}
         xywh {245 130 130 30} maximum 10000 step 1 textfont 5 textsize 24 
textcolor 4
       }
-      Fl_Box {} {
+      {fltk3::Box} {} {
         label Fl_Box
         xywh {245 170 140 50} box EMBOSSED_FRAME labeltype SHADOW_LABEL 
labelfont 3 labelsize 38
       }
-      Fl_Scrollbar {} {
+      {fltk3::Scrollbar} {} {
         label scrollbar
         xywh {40 274 180 20} type Horizontal
       }
-      Fl_Roller {} {
+      {fltk3::Roller} {} {
         label roller
         xywh {235 230 25 65}
       }
-      Fl_Dial {} {
+      {fltk3::Dial} {} {
         label dial
         xywh {275 235 50 50}
       }
-      Fl_Clock {} {
+      {fltk3::Clock} {} {
         label clock
         xywh {335 235 50 50}
       }
     }
-    Fl_Button {} {
+    {fltk3::Button} {} {
       label active
-      callback {the_group->activate();}
+      callback {the_group->activate();} selected
       xywh {25 330 185 25} type Radio value 1
     }
-    Fl_Button {} {
+    {fltk3::Button} {} {
       label inactive
       callback {the_group->deactivate();}
       xywh {220 330 180 25} type Radio

Modified: branches/branch-3.0/test/keyboard.cxx
===================================================================
--- branches/branch-3.0/test/keyboard.cxx       2011-05-23 18:01:29 UTC (rev 
8724)
+++ branches/branch-3.0/test/keyboard.cxx       2011-05-23 18:13:10 UTC (rev 
8725)
@@ -46,79 +46,79 @@
 
 
 // these are used to identify which buttons are which:
-void key_cb(Fl_Button*, void*) {}
-void shift_cb(Fl_Button*, void*) {}
+void key_cb(fltk3::Button*, void*) {}
+void shift_cb(fltk3::Button*, void*) {}
 void wheel_cb(fltk3::Dial*, void*) {}
 
 // this is used to stop Esc from exiting the program:
 int handle(int e) {
-  return (e == FL_SHORTCUT); // eat all keystrokes
+  return (e == fltk3::SHORTCUT); // eat all keystrokes
 }
 
 int MyWindow::handle(int msg) {
-  if (msg==FL_MOUSEWHEEL)
+  if (msg==fltk3::MOUSEWHEEL)
   {
-    roller_x->value( roller_x->value() + Fl::e_dx * roller_x->step() );
-    roller_y->value( roller_y->value() + Fl::e_dy * roller_y->step() );
+    roller_x->value( roller_x->value() + fltk3::e_dx * roller_x->step() );
+    roller_y->value( roller_y->value() + fltk3::e_dy * roller_y->step() );
     return 1;
   }
   return 0;
 }
 
 struct keycode_table{int n; const char* text;} table[] = {
-  {FL_Escape, "FL_Escape"},
-  {FL_BackSpace, "FL_BackSpace"},
-  {FL_Tab, "FL_Tab"},
-  {FL_Enter, "FL_Enter"},
-  {FL_Print, "FL_Print"},
-  {FL_Scroll_Lock, "FL_Scroll_Lock"},
-  {FL_Pause, "FL_Pause"},
-  {FL_Insert, "FL_Insert"},
-  {FL_Home, "FL_Home"},
-  {FL_Page_Up, "FL_Page_Up"},
-  {FL_Delete, "FL_Delete"},
-  {FL_End, "FL_End"},
-  {FL_Page_Down, "FL_Page_Down"},
-  {FL_Left, "FL_Left"},
-  {FL_Up, "FL_Up"},
-  {FL_Right, "FL_Right"},
-  {FL_Down, "FL_Down"},
-  {FL_Shift_L, "FL_Shift_L"},
-  {FL_Shift_R, "FL_Shift_R"},
-  {FL_Control_L, "FL_Control_L"},
-  {FL_Control_R, "FL_Control_R"},
-  {FL_Caps_Lock, "FL_Caps_Lock"},
-  {FL_Alt_L, "FL_Alt_L"},
-  {FL_Alt_R, "FL_Alt_R"},
-  {FL_Meta_L, "FL_Meta_L"},
-  {FL_Meta_R, "FL_Meta_R"},
-  {FL_Menu, "FL_Menu"},
-  {FL_Help, "FL_Help"},
-  {FL_Num_Lock, "FL_Num_Lock"},
-  {FL_KP_Enter, "FL_KP_Enter"}
+  {fltk3::EscapeKey,      "fltk3::EscapeKey"},
+  {fltk3::BackSpaceKey,   "fltk3::BackSpaceKey"},
+  {fltk3::TabKey,         "fltk3::TabKey"},
+  {fltk3::EnterKey,       "fltk3::EnterKey"},
+  {fltk3::PrintKey,       "fltk3::PrintKey"},
+  {fltk3::ScrollLockKey,  "fltk3::ScrollLockKey"},
+  {fltk3::PauseKey,       "fltk3::PauseKey"},
+  {fltk3::InsertKey,      "fltk3::InsertKey"},
+  {fltk3::HomeKey,        "fltk3::HomeKey"},
+  {fltk3::PageUpKey,      "fltk3::PageUpKey"},
+  {fltk3::DeleteKey,      "fltk3::DeleteKey"},
+  {fltk3::EndKey,         "fltk3::EndKey"},
+  {fltk3::PageDownKey,    "fltk3::PageDownKey"},
+  {fltk3::LeftKey,        "fltk3::LeftKey"},
+  {fltk3::UpKey,          "fltk3::UpKey"},
+  {fltk3::RightKey,       "fltk3::RightKey"},
+  {fltk3::DownKey,        "fltk3::DownKey"},
+  {fltk3::ShiftLKey,      "fltk3::ShiftLKey"},
+  {fltk3::ShiftRKey,      "fltk3::ShiftRKey"},
+  {fltk3::ControlLKey,    "fltk3::ControlLKey"},
+  {fltk3::ControlRKey,    "fltk3::ControlRKey"},
+  {fltk3::CapsLockKey,    "fltk3::CapsLockKey"},
+  {fltk3::AltLKey,        "fltk3::AltLKey"},
+  {fltk3::AltRKey,        "fltk3::AltRKey"},
+  {fltk3::MetaLKey,       "fltk3::MetaLKey"},
+  {fltk3::MetaRKey,       "fltk3::MetaRKey"},
+  {fltk3::MenuKey,        "fltk3::MenuKey"},
+  {fltk3::HelpKey,        "fltk3::HelpKey"},
+  {fltk3::NumLockKey,     "fltk3::NumLockKey"},
+  {fltk3::KPEnterKey,     "fltk3::KPEnterKey"}
 };
 
 int main(int argc, char** argv) {
-  Fl::add_handler(handle);
+  fltk3::add_handler(handle);
   MyWindow *window = make_window();
   window->show(argc,argv);
-  while (Fl::wait()) {
+  while (fltk3::wait()) {
     const char *str;
     
     // update all the buttons with the current key and shift state:
     for (int i = 0; i < window->children(); i++) {
-      Fl_Widget* b = window->child(i);
-      if (b->callback() == (Fl_Callback*)key_cb) {
+      fltk3::Widget* b = window->child(i);
+      if (b->callback() == (fltk3::Callback*)key_cb) {
        int i = b->argument();
        if (!i) i = b->label()[0];
-        Fl_Button *btn = ((Fl_Button*)b);
-        int state = Fl::event_key(i);
+        fltk3::Button *btn = ((fltk3::Button*)b);
+        int state = fltk3::event_key(i);
         if (btn->value()!=state)
          btn->value(state);
-      } else if (b->callback() == (Fl_Callback*)shift_cb) {
+      } else if (b->callback() == (fltk3::Callback*)shift_cb) {
        int i = b->argument();
-        Fl_Button *btn = ((Fl_Button*)b);
-        int state = Fl::event_state(i);
+        fltk3::Button *btn = ((fltk3::Button*)b);
+        int state = fltk3::event_state(i);
         if (btn->value()!=state)
          btn->value(state);
       }
@@ -127,17 +127,17 @@
     // figure out the keyname:
     char buffer[100];
     const char *keyname = buffer;
-    int k = Fl::event_key();
+    int k = fltk3::event_key();
     if (!k)
       keyname = "0";
     else if (k < 256) {
       sprintf(buffer, "'%c'", k);
-    } else if (k > FL_F && k <= FL_F_Last) {
-      sprintf(buffer, "FL_F+%d", k - FL_F);
-    } else if (k >= FL_KP && k <= FL_KP_Last) {
-      sprintf(buffer, "FL_KP+'%c'", k-FL_KP);
-    } else if (k >= FL_Button && k <= FL_Button+7) {
-      sprintf(buffer, "FL_Button+%d", k-FL_Button);
+    } else if (k > fltk3::FKey && k <= fltk3::FLastKey) {
+      sprintf(buffer, "fltk3::FKey+%d", k - fltk3::FKey);
+    } else if (k >= fltk3::KPKey && k <= fltk3::KPLastKey) {
+      sprintf(buffer, "fltk3::KPKey+'%c'", k-fltk3::KPKey);
+    } else if (k >= fltk3::MouseButton && k <= fltk3::MouseButton+7) {
+      sprintf(buffer, "fltk3::MouseButton+%d", k-fltk3::MouseButton);
     } else {
       sprintf(buffer, "0x%04x", k);
       for (int i = 0; i < int(sizeof(table)/sizeof(*table)); i++)
@@ -146,7 +146,7 @@
     if (strcmp(key_output->value(), keyname))
       key_output->value(keyname);
 
-    str = Fl::event_text();
+    str = fltk3::event_text();
     if (strcmp(text_output->value(), str))
       text_output->value(str);
   }

Modified: branches/branch-3.0/test/keyboard.h
===================================================================
--- branches/branch-3.0/test/keyboard.h 2011-05-23 18:01:29 UTC (rev 8724)
+++ branches/branch-3.0/test/keyboard.h 2011-05-23 18:13:10 UTC (rev 8725)
@@ -31,11 +31,11 @@
 #  include <fltk3/run.h>
 #  include <fltk3/Window.h>
 
-class MyWindow : public Fl_Window {
+class MyWindow : public fltk3::Window {
   int handle(int);
 public:
   MyWindow(int w, int h, const char *t=0L) 
-    : Fl_Window( w, h, t ) { }
+  : fltk3::Window( w, h, t ) { }
 };
 
 #endif // !keyboard_h

Modified: branches/branch-3.0/test/keyboard_ui.fl
===================================================================
--- branches/branch-3.0/test/keyboard_ui.fl     2011-05-23 18:01:29 UTC (rev 
8724)
+++ branches/branch-3.0/test/keyboard_ui.fl     2011-05-23 18:13:10 UTC (rev 
8725)
@@ -1,716 +1,716 @@
 # data file for the Fltk User Interface Designer (fluid)
-version 1.0300 
+version 3.0000 
 header_name {.h} 
 code_name {.cxx}
 Function {make_window()} {open
 } {
-  Fl_Window my_window {open selected
+  {fltk3::Window} my_window {open
     xywh {461 296 495 215} type Double
     code0 {\#include "keyboard.h"}
     class MyWindow visible
   } {
-    Fl_Button {} {
+    {fltk3::Button} {} {
       label {Esc }
-      user_data FL_Escape user_data_type {void*}
+      user_data {fltk3::EscapeKey} user_data_type {void*}
       callback key_cb
       xywh {15 70 20 20} labelsize 8
     }
-    Fl_Button {} {
+    {fltk3::Button} {} {
       label F1
-      user_data {FL_F+1} user_data_type {void*}
+      user_data {fltk3::FKey+1} user_data_type {void*}
       callback key_cb
       xywh {50 70 20 20} labelsize 10
     }
-    Fl_Button {} {
+    {fltk3::Button} {} {
       label F2
-      user_data {FL_F+2} user_data_type {void*}
+      user_data {fltk3::FKey+2} user_data_type {void*}
       callback key_cb
       xywh {70 70 20 20} labelsize 10
     }
-    Fl_Button {} {
+    {fltk3::Button} {} {
       label F3
-      user_data {FL_F+3} user_data_type {void*}
+      user_data {fltk3::FKey+3} user_data_type {void*}
       callback key_cb
       xywh {90 70 20 20} labelsize 10
     }
-    Fl_Button {} {
+    {fltk3::Button} {} {
       label F4
-      user_data {FL_F+4} user_data_type {void*}
+      user_data {fltk3::FKey+4} user_data_type {void*}
       callback key_cb
       xywh {110 70 20 20} labelsize 10
     }
-    Fl_Button {} {
+    {fltk3::Button} {} {
       label F5
-      user_data {FL_F+5} user_data_type {void*}
+      user_data {fltk3::FKey+5} user_data_type {void*}
       callback key_cb
       xywh {140 70 20 20} labelsize 10
     }
-    Fl_Button {} {
+    {fltk3::Button} {} {
       label F6
-      user_data {FL_F+6} user_data_type {void*}
+      user_data {fltk3::FKey+6} user_data_type {void*}
       callback key_cb
       xywh {160 70 20 20} labelsize 10
     }
-    Fl_Button {} {
+    {fltk3::Button} {} {
       label F7
-      user_data {FL_F+7} user_data_type {void*}
+      user_data {fltk3::FKey+7} user_data_type {void*}
       callback key_cb
       xywh {180 70 20 20} labelsize 10
     }
-    Fl_Button {} {
+    {fltk3::Button} {} {
       label F8
-      user_data {FL_F+8} user_data_type {void*}
+      user_data {fltk3::FKey+8} user_data_type {void*}
       callback key_cb
       xywh {200 70 20 20} labelsize 10
     }
-    Fl_Button {} {
+    {fltk3::Button} {} {
       label F9
-      user_data {FL_F+9} user_data_type {void*}
+      user_data {fltk3::FKey+9} user_data_type {void*}
       callback key_cb
       xywh {230 70 20 20} labelsize 10
     }
-    Fl_Button {} {
+    {fltk3::Button} {} {
       label F10
-      user_data {FL_F+10} user_data_type {void*}
+      user_data {fltk3::FKey+10} user_data_type {void*}
       callback key_cb
       xywh {250 70 20 20} labelsize 10
     }
-    Fl_Button {} {
+    {fltk3::Button} {} {
       label F11
-      user_data {FL_F+11} user_data_type {void*}
+      user_data {fltk3::FKey+11} user_data_type {void*}
       callback key_cb
       xywh {270 70 20 20} labelsize 10
     }
-    Fl_Button {} {
+    {fltk3::Button} {} {
       label F12
-      user_data {FL_F+12} user_data_type {void*}
+      user_data {fltk3::FKey+12} user_data_type {void*}
       callback key_cb
       xywh {290 70 20 20} labelsize 10
     }
-    Fl_Button {} {
+    {fltk3::Button} {} {
       label {Print }
-      user_data FL_Print user_data_type {void*}
+      user_data {fltk3::PrintKey} user_data_type {void*}
       callback key_cb
       xywh {325 70 20 20} labelsize 8
     }
-    Fl_Button {} {
+    {fltk3::Button} {} {
       label {Sclk }
-      user_data FL_Scroll_Lock user_data_type {void*}
+      user_data {fltk3::ScrollLockKey} user_data_type {void*}
       callback key_cb
       xywh {345 70 20 20} labelsize 8
     }
-    Fl_Button {} {
+    {fltk3::Button} {} {
       label {Paus }
-      user_data FL_Pause user_data_type {void*}
+      user_data {fltk3::PauseKey} user_data_type {void*}
       callback key_cb
       xywh {365 70 20 20} labelsize 8
     }
-    Fl_Button {} {
+    {fltk3::Button} {} {
       label {`}
       callback key_cb
       xywh {15 100 20 20} labelsize 10
     }
-    Fl_Button {} {
+    {fltk3::Button} {} {
       label 1
       callback key_cb
       xywh {35 100 20 20} labelsize 10
     }
-    Fl_Button {} {
+    {fltk3::Button} {} {
       label 2
       callback key_cb
       xywh {55 100 20 20} labelsize 10
     }
-    Fl_Button {} {
+    {fltk3::Button} {} {
       label 3
       callback key_cb
       xywh {75 100 20 20} labelsize 10
     }
-    Fl_Button {} {
+    {fltk3::Button} {} {
       label 4
       callback key_cb
       xywh {95 100 20 20} labelsize 10
     }
-    Fl_Button {} {
+    {fltk3::Button} {} {
       label 5
       callback key_cb
       xywh {115 100 20 20} labelsize 10
     }
-    Fl_Button {} {
+    {fltk3::Button} {} {
       label 6
       callback key_cb
       xywh {135 100 20 20} labelsize 10
     }
-    Fl_Button {} {
+    {fltk3::Button} {} {
       label 7
       callback key_cb
       xywh {155 100 20 20} labelsize 10
     }
-    Fl_Button {} {
+    {fltk3::Button} {} {
       label 8
       callback key_cb
       xywh {175 100 20 20} labelsize 10
     }
-    Fl_Button {} {
+    {fltk3::Button} {} {
       label 9
       callback key_cb
       xywh {195 100 20 20} labelsize 10
     }
-    Fl_Button {} {
+    {fltk3::Button} {} {
       label 0
       callback key_cb
       xywh {215 100 20 20} labelsize 10
     }
-    Fl_Button {} {
+    {fltk3::Button} {} {
       label {-}
       callback key_cb
       xywh {235 100 20 20} labelsize 10
     }
-    Fl_Button {} {
+    {fltk3::Button} {} {
       label {=}
       callback key_cb
       xywh {255 100 20 20} labelsize 10
     }
-    Fl_Button {} {
+    {fltk3::Button} {} {
       label Bksp
-      user_data FL_BackSpace user_data_type {void*}
+      user_data {fltk3::BackSpaceKey} user_data_type {void*}
       callback key_cb
       xywh {275 100 35 20} labeltype SHADOW_LABEL labelsize 8 align 20
     }
-    Fl_Button {} {
+    {fltk3::Button} {} {
       label {Ins }
-      user_data FL_Insert user_data_type {void*}
+      user_data {fltk3::InsertKey} user_data_type {void*}
       callback key_cb
       xywh {325 100 20 20} labelsize 8
     }
-    Fl_Button {} {
+    {fltk3::Button} {} {
       label Home
-      user_data FL_Home user_data_type {void*}
+      user_data {fltk3::HomeKey} user_data_type {void*}
       callback key_cb
       xywh {345 100 20 20} labelsize 8
     }
-    Fl_Button {} {
+    {fltk3::Button} {} {
       label {pgup }
-      user_data FL_Page_Up user_data_type {void*}
+      user_data {fltk3::PageUpKey} user_data_type {void*}
       callback key_cb
       xywh {365 100 20 20} labelsize 8
     }
-    Fl_Button {} {
+    {fltk3::Button} {} {
       label Num
-      user_data FL_Num_Lock user_data_type {void*}
+      user_data {fltk3::NumLockKey} user_data_type {void*}
       callback key_cb
       xywh {400 100 20 20} labelsize 8
     }
-    Fl_Button {} {
+    {fltk3::Button} {} {
       label {/}
-      user_data {FL_KP+'/'} user_data_type {void*}
+      user_data {fltk3::KPKey+'/'} user_data_type {void*}
       callback key_cb
       xywh {420 100 20 20} labelsize 10
     }
-    Fl_Button {} {
+    {fltk3::Button} {} {
       label {*}
-      user_data {FL_KP+'*'} user_data_type {void*}
+      user_data {fltk3::KPKey+'*'} user_data_type {void*}
       callback key_cb
       xywh {440 100 20 20} labelsize 10
     }
-    Fl_Button {} {
+    {fltk3::Button} {} {
       label {-}
-      user_data {FL_KP+'-'} user_data_type {void*}
+      user_data {fltk3::KPKey+'-'} user_data_type {void*}
       callback key_cb
       xywh {460 100 20 20} labelsize 10
     }
-    Fl_Button {} {
+    {fltk3::Button} {} {
       label Tab
-      user_data FL_Tab user_data_type {void*}
+      user_data {fltk3::TabKey} user_data_type {void*}
       callback key_cb
       xywh {15 120 27 20} labelsize 8 align 20
     }
-    Fl_Button {} {
+    {fltk3::Button} {} {
       label Q
       callback key_cb
       xywh {42 120 20 20} labelsize 10
     }
-    Fl_Button {} {
+    {fltk3::Button} {} {
       label W
       callback key_cb
       xywh {62 120 20 20} labelsize 10
     }
-    Fl_Button {} {
+    {fltk3::Button} {} {
       label E
       callback key_cb
       xywh {82 120 20 20} labelsize 10
     }
-    Fl_Button {} {
+    {fltk3::Button} {} {
       label R
       callback key_cb
       xywh {102 120 20 20} labelsize 10
     }
-    Fl_Button {} {
+    {fltk3::Button} {} {
       label T
       callback key_cb
       xywh {122 120 20 20} labelsize 10
     }
-    Fl_Button {} {
+    {fltk3::Button} {} {
       label Y
       callback key_cb
       xywh {142 120 20 20} labelsize 10
     }
-    Fl_Button {} {
+    {fltk3::Button} {} {
       label U
       callback key_cb
       xywh {162 120 20 20} labelsize 10
     }
-    Fl_Button {} {
+    {fltk3::Button} {} {
       label I
       callback key_cb
       xywh {182 120 20 20} labelsize 10
     }
-    Fl_Button {} {
+    {fltk3::Button} {} {
       label O
       callback key_cb
       xywh {202 120 20 20} labelsize 10
     }
-    Fl_Button {} {
+    {fltk3::Button} {} {
       label P
       callback key_cb
       xywh {222 120 20 20} labelsize 10
     }
-    Fl_Button {} {
+    {fltk3::Button} {} {
       label {[}
       callback key_cb
       xywh {242 120 20 20} labelsize 10
     }
-    Fl_Button {} {
+    {fltk3::Button} {} {
       label {]}
       callback key_cb
       xywh {262 120 20 20} labelsize 10
     }
-    Fl_Button {} {
+    {fltk3::Button} {} {
       label {\\}
       user_data {'|'}
       callback key_cb
       xywh {282 120 28 20} labelsize 10 align 20
     }
-    Fl_Button {} {
+    {fltk3::Button} {} {
       label {Del }
-      user_data FL_Delete user_data_type {void*}
+      user_data {fltk3::DeleteKey} user_data_type {void*}
       callback key_cb
       xywh {325 120 20 20} labelsize 8
     }
-    Fl_Button {} {
+    {fltk3::Button} {} {
       label {End }
-      user_data FL_End user_data_type {void*}
+      user_data {fltk3::EndKey} user_data_type {void*}
       callback key_cb
       xywh {345 120 20 20} labelsize 8
     }
-    Fl_Button {} {
+    {fltk3::Button} {} {
       label {pgdn }
-      user_data FL_Page_Down user_data_type {void*}
+      user_data {fltk3::PageDownKey} user_data_type {void*}
       callback key_cb
       xywh {365 120 20 20} labelsize 8
     }
-    Fl_Button {} {
+    {fltk3::Button} {} {
       label 7
-      user_data {FL_KP+'7'} user_data_type {void*}
+      user_data {fltk3::KPKey+'7'} user_data_type {void*}
       callback key_cb
       xywh {400 120 20 20} labelsize 10
     }
-    Fl_Button {} {
+    {fltk3::Button} {} {
       label 8
-      user_data {FL_KP+'8'} user_data_type {void*}
+      user_data {fltk3::KPKey+'8'} user_data_type {void*}
       callback key_cb
       xywh {420 120 20 20} labelsize 10
     }
-    Fl_Button {} {
+    {fltk3::Button} {} {
       label 9
-      user_data {FL_KP+'9'} user_data_type {void*}
+      user_data {fltk3::KPKey+'9'} user_data_type {void*}
       callback key_cb
       xywh {440 120 20 20} labelsize 10
     }
-    Fl_Button {} {
+    {fltk3::Button} {} {
       label {+}
-      user_data {FL_KP+'+'} user_data_type {void*}
+      user_data {fltk3::KPKey+'+'} user_data_type {void*}
       callback key_cb
       xywh {460 120 20 40} labelsize 10 align 17
     }
-    Fl_Button {} {
+    {fltk3::Button} {} {
       label Lock
-      user_data FL_Caps_Lock user_data_type {void*}
+      user_data {fltk3::CapsLockKey} user_data_type {void*}
       callback key_cb
       xywh {15 140 36 20} labelsize 8 align 20
     }
-    Fl_Button {} {
+    {fltk3::Button} {} {
       label A
       callback key_cb
       xywh {51 140 20 20} labelsize 10
     }
-    Fl_Button {} {
+    {fltk3::Button} {} {
       label S
       callback key_cb
       xywh {71 140 20 20} labelsize 10
     }
-    Fl_Button {} {
+    {fltk3::Button} {} {
       label D
       callback key_cb
       xywh {91 140 20 20} labelsize 10
     }
-    Fl_Button {} {
+    {fltk3::Button} {} {
       label F
       callback key_cb
       xywh {111 140 20 20} labelsize 10
     }
-    Fl_Button {} {
+    {fltk3::Button} {} {
       label G
       callback key_cb
       xywh {131 140 20 20} labelsize 10
     }
-    Fl_Button {} {
+    {fltk3::Button} {} {
       label H
       callback key_cb
       xywh {151 140 20 20} labelsize 10
     }
-    Fl_Button {} {
+    {fltk3::Button} {} {
       label J
       callback key_cb
       xywh {171 140 20 20} labelsize 10
     }
-    Fl_Button {} {
+    {fltk3::Button} {} {
       label K
       callback key_cb
       xywh {191 140 20 20} labelsize 10
     }
-    Fl_Button {} {
+    {fltk3::Button} {} {
       label L
       callback key_cb
       xywh {211 140 20 20} labelsize 10
     }
-    Fl_Button {} {
+    {fltk3::Button} {} {
       label {;}
       callback key_cb
       xywh {231 140 20 20} labelsize 10
     }
-    Fl_Button {} {
+    {fltk3::Button} {} {
       label {'}
       callback key_cb
       xywh {251 140 20 20} labelsize 10
     }
-    Fl_Button {} {
+    {fltk3::Button} {} {
       label Enter
-      user_data FL_Enter user_data_type {void*}
+      user_data {fltk3::EnterKey} user_data_type {void*}
       callback key_cb
       xywh {271 140 39 20} labelsize 8 align 20
     }
-    Fl_Button {} {
+    {fltk3::Button} {} {
       label 4
-      user_data {FL_KP+'4'} user_data_type {void*}
+      user_data {fltk3::KPKey+'4'} user_data_type {void*}
       callback key_cb
       xywh {400 140 20 20} labelsize 10
     }
-    Fl_Button {} {
+    {fltk3::Button} {} {
       label 5
-      user_data {FL_KP+'5'} user_data_type {void*}
+      user_data {fltk3::KPKey+'5'} user_data_type {void*}
       callback key_cb
       xywh {420 140 20 20} labelsize 10
     }
-    Fl_Button {} {
+    {fltk3::Button} {} {
       label 6
-      user_data {FL_KP+'6'} user_data_type {void*}
+      user_data {fltk3::KPKey+'6'} user_data_type {void*}
       callback key_cb
       xywh {440 140 20 20} labelsize 10
     }
-    Fl_Button {} {
+    {fltk3::Button} {} {
       label Shift
-      user_data FL_Shift_L user_data_type {void*}
+      user_data {fltk3::ShiftLKey} user_data_type {void*}
       callback key_cb
       xywh {15 160 45 20} labelsize 8 align 20
     }
-    Fl_Button {} {
+    {fltk3::Button} {} {
       label Z
       callback key_cb
       xywh {60 160 20 20} labelsize 10
     }
-    Fl_Button {} {
+    {fltk3::Button} {} {
       label X
       callback key_cb
       xywh {80 160 20 20} labelsize 10
     }
-    Fl_Button {} {
+    {fltk3::Button} {} {
       label C
       callback key_cb
       xywh {100 160 20 20} labelsize 10
     }
-    Fl_Button {} {
+    {fltk3::Button} {} {
       label V
       callback key_cb
       xywh {120 160 20 20} labelsize 10
     }
-    Fl_Button {} {
+    {fltk3::Button} {} {
       label B
       callback key_cb
       xywh {140 160 20 20} labelsize 10
     }
-    Fl_Button {} {
+    {fltk3::Button} {} {
       label N
       callback key_cb
       xywh {160 160 20 20} labelsize 10
     }
-    Fl_Button {} {
+    {fltk3::Button} {} {
       label M
       callback key_cb
       xywh {180 160 20 20} labelsize 10
     }
-    Fl_Button {} {
+    {fltk3::Button} {} {
       label {,}
       callback key_cb
       xywh {200 160 20 20} labelsize 10
     }
-    Fl_Button {} {
+    {fltk3::Button} {} {
       label {.}
       callback key_cb
       xywh {220 160 20 20} labelsize 10
     }
-    Fl_Button {} {
+    {fltk3::Button} {} {
       label {/}
       callback key_cb
       xywh {240 160 20 20} labelsize 10
     }
-    Fl_Button {} {
+    {fltk3::Button} {} {
       label Shift
-      user_data FL_Shift_R user_data_type {void*}
+      user_data {fltk3::ShiftRKey} user_data_type {void*}
       callback key_cb
       xywh {260 160 50 20} labelsize 8 align 20
     }
-    Fl_Button {} {
+    {fltk3::Button} {} {
       label {@8->}
-      user_data FL_Up user_data_type {void*}
+      user_data {fltk3::UpKey} user_data_type {void*}
       callback key_cb
       xywh {345 160 20 20} labeltype SHADOW_LABEL labelsize 10 labelcolor 47
     }
-    Fl_Button {} {
+    {fltk3::Button} {} {
       label 1
-      user_data {FL_KP+'1'} user_data_type {void*}
+      user_data {fltk3::KPKey+'1'} user_data_type {void*}
       callback key_cb
       xywh {400 160 20 20} labelsize 10
     }
-    Fl_Button {} {
+    {fltk3::Button} {} {
       label 2
-      user_data {FL_KP+'2'} user_data_type {void*}
+      user_data {fltk3::KPKey+'2'} user_data_type {void*}
       callback key_cb
       xywh {420 160 20 20} labelsize 10
     }
-    Fl_Button {} {
+    {fltk3::Button} {} {
       label 3
-      user_data {FL_KP+'3'} user_data_type {void*}
+      user_data {fltk3::KPKey+'3'} user_data_type {void*}
       callback key_cb
       xywh {440 160 20 20} labelsize 10
     }
-    Fl_Button {} {
-      user_data FL_KP_Enter user_data_type {void*}
+    {fltk3::Button} {} {
+      user_data {fltk3::KPEnterKey} user_data_type {void*}
       callback key_cb
       xywh {460 160 20 40}
     }
-    Fl_Button {} {
+    {fltk3::Button} {} {
       label Ctrl
-      user_data FL_Control_L user_data_type {void*}
+      user_data {fltk3::ControlLKey} user_data_type {void*}
       callback key_cb
       xywh {15 180 30 20} labelsize 8 align 20
     }
-    Fl_Button {} {
+    {fltk3::Button} {} {
       label {Meta }
-      user_data FL_Meta_L user_data_type {void*}
+      user_data {fltk3::MetaLKey} user_data_type {void*}
       callback key_cb
       xywh {45 180 30 20} labelsize 8
     }
-    Fl_Button {} {
+    {fltk3::Button} {} {
       label {Alt }
-      user_data FL_Alt_L user_data_type {void*}
+      user_data {fltk3::AltLKey} user_data_type {void*}
       callback key_cb
       xywh {75 180 30 20} labelsize 8
     }
-    Fl_Button {} {
+    {fltk3::Button} {} {
       user_data {' '} user_data_type {void*}
       callback key_cb
       xywh {105 180 85 20} labelsize 10
     }
-    Fl_Button {} {
+    {fltk3::Button} {} {
       label {Alt }
-      user_data FL_Alt_R user_data_type {void*}
+      user_data {fltk3::AltRKey} user_data_type {void*}
       callback key_cb
       xywh {190 180 30 20} labelsize 8
     }
-    Fl_Button {} {
+    {fltk3::Button} {} {
       label {Meta }
-      user_data FL_Meta_R user_data_type {void*}
+      user_data {fltk3::MetaRKey} user_data_type {void*}
       callback key_cb
       xywh {220 180 30 20} labelsize 8
     }
-    Fl_Button {} {
+    {fltk3::Button} {} {
       label {Menu }
-      user_data FL_Menu user_data_type {void*}
+      user_data {fltk3::MenuKey} user_data_type {void*}
       callback key_cb
       xywh {250 180 30 20} labelsize 8
     }
-    Fl_Button {} {
+    {fltk3::Button} {} {
       label Ctrl
-      user_data FL_Control_R user_data_type {void*}
+      user_data {fltk3::ControlRKey} user_data_type {void*}
       callback key_cb
       xywh {280 180 30 20} labelsize 8 align 20
     }
-    Fl_Button {} {
+    {fltk3::Button} {} {
       label {@4->}
-      user_data FL_Left user_data_type {void*}
+      user_data {fltk3::LeftKey} user_data_type {void*}
       callback key_cb
       xywh {325 180 20 20} labeltype SHADOW_LABEL labelsize 10 labelcolor 47
     }
-    Fl_Button {} {
+    {fltk3::Button} {} {
       label {@2->}
-      user_data FL_Down user_data_type {void*}
+      user_data {fltk3::DownKey} user_data_type {void*}
       callback key_cb
       xywh {345 180 20 20} labeltype SHADOW_LABEL labelsize 10 labelcolor 47
     }
-    Fl_Button {} {
+    {fltk3::Button} {} {
       label {@6->}
-      user_data FL_Right user_data_type {void*}
+      user_data {fltk3::RightKey} user_data_type {void*}
       callback key_cb
       xywh {365 180 20 20} labeltype SHADOW_LABEL labelsize 10 labelcolor 47
     }
-    Fl_Button {} {
+    {fltk3::Button} {} {
       label 0
-      user_data {FL_KP+'0'} user_data_type {void*}
+      user_data {fltk3::KPKey+'0'} user_data_type {void*}
       callback key_cb
       xywh {400 180 40 20} labelsize 10 align 20
     }
-    Fl_Button {} {
+    {fltk3::Button} {} {
       label {.}
-      user_data {FL_KP+'.'} user_data_type {void*}
+      user_data {fltk3::KPKey+'.'} user_data_type {void*}
       callback key_cb
       xywh {440 180 20 20} labelsize 10
     }
-    Fl_Button {} {
+    {fltk3::Button} {} {
       label {shift }
-      user_data FL_SHIFT user_data_type {void*}
+      user_data {fltk3::SHIFT} user_data_type {void*}
       callback shift_cb
       xywh {400 15 20 10} box THIN_UP_BOX selection_color 3 labelsize 8
     }
-    Fl_Button {} {
+    {fltk3::Button} {} {
       label {lock }
-      user_data FL_CAPS_LOCK user_data_type {void*}
+      user_data {fltk3::CAPS_LOCK} user_data_type {void*}
       callback shift_cb
       xywh {420 15 20 10} box THIN_UP_BOX selection_color 3 labelsize 8
     }
-    Fl_Button {} {
+    {fltk3::Button} {} {
       label ctrl
-      user_data FL_CTRL user_data_type {void*}
+      user_data {fltk3::CTRL} user_data_type {void*}
       callback shift_cb
       xywh {440 15 20 10} box THIN_UP_BOX selection_color 3 labelsize 8
     }
-    Fl_Button {} {
+    {fltk3::Button} {} {
       label alt
-      user_data FL_ALT user_data_type {void*}
+      user_data {fltk3::ALT} user_data_type {void*}
       callback shift_cb
       xywh {460 15 20 10} box THIN_UP_BOX selection_color 3 labelsize 8
     }
-    Fl_Button {} {
+    {fltk3::Button} {} {
       label num
-      user_data FL_NUM_LOCK user_data_type {void*}
+      user_data {fltk3::NUM_LOCK} user_data_type {void*}
       callback shift_cb
       xywh {400 25 20 10} box THIN_UP_BOX selection_color 3 labelsize 8
     }
-    Fl_Button {} {
+    {fltk3::Button} {} {
       label {?}
       user_data 0x20 user_data_type {void*}
       callback shift_cb
       xywh {420 25 20 10} box THIN_UP_BOX selection_color 3 labelsize 8
     }
-    Fl_Button {} {
+    {fltk3::Button} {} {
       label {meta }
-      user_data FL_META user_data_type {void*}
+      user_data {fltk3::META} user_data_type {void*}
       callback shift_cb
       xywh {440 25 20 10} box THIN_UP_BOX selection_color 3 labelsize 8
     }
-    Fl_Button {} {
+    {fltk3::Button} {} {
       label sclk
-      user_data FL_SCROLL_LOCK user_data_type {void*}
+      user_data {fltk3::SCROLL_LOCK} user_data_type {void*}
       callback shift_cb
       xywh {460 25 20 10} box THIN_UP_BOX selection_color 3 labelsize 8
     }
-    Fl_Button {} {
+    {fltk3::Button} {} {
       label b1
-      user_data FL_BUTTON1 user_data_type {void*}
+      user_data {fltk3::BUTTON1} user_data_type {void*}
       callback shift_cb
       xywh {400 35 20 10} box THIN_UP_BOX selection_color 3 labelsize 8
     }
-    Fl_Button {} {
+    {fltk3::Button} {} {
       label b2
-      user_data FL_BUTTON2 user_data_type {void*}
+      user_data {fltk3::BUTTON2} user_data_type {void*}
       callback shift_cb
       xywh {420 35 20 10} box THIN_UP_BOX selection_color 3 labelsize 8
     }
-    Fl_Button {} {
+    {fltk3::Button} {} {
       label b3
-      user_data FL_BUTTON3 user_data_type {void*}
+      user_data {fltk3::BUTTON3} user_data_type {void*}
       callback shift_cb
       xywh {440 35 20 10} box THIN_UP_BOX selection_color 3 labelsize 8
     }
-    Fl_Button {} {
+    {fltk3::Button} {} {
       label whl
       user_data 0x800 user_data_type {void*}
       callback shift_cb
       xywh {460 35 20 10} box THIN_UP_BOX selection_color 3 labelsize 8
     }
-    Fl_Button {} {
+    {fltk3::Button} {} {
       label {?}
       user_data 0x1000 user_data_type {void*}
       callback shift_cb
       xywh {400 45 20 10} box THIN_UP_BOX selection_color 3 labelsize 8
     }
-    Fl_Button {} {
+    {fltk3::Button} {} {
       label {?}
       user_data 0x2000 user_data_type {void*}
       callback shift_cb
       xywh {420 45 20 10} box THIN_UP_BOX selection_color 3 labelsize 8
     }
-    Fl_Button {} {
+    {fltk3::Button} {} {
       label {?}
       user_data 0x4000 user_data_type {void*}
       callback shift_cb
       xywh {440 45 20 10} box THIN_UP_BOX selection_color 3 labelsize 8
     }
-    Fl_Button {} {
+    {fltk3::Button} {} {
       label {?}
       user_data 0x8000 user_data_type {void*}
       callback shift_cb
       xywh {460 45 20 10} box THIN_UP_BOX selection_color 3 labelsize 8
     }
-    Fl_Output key_output {
-      label {Fl::event_key():}
+    {fltk3::Output} key_output {
+      label {event_key():} selected
       xywh {15 20 170 30} labelsize 9 align 5
     }
-    Fl_Box {} {
-      label {Fl::event_state():}
+    {fltk3::Box} {} {
+      label {event_state():}
       xywh {400 15 80 40} labelsize 9 align 5
     }
-    Fl_Output text_output {
-      label {Fl::event_text():}
+    {fltk3::Output} text_output {
+      label {event_text():}
       xywh {195 20 190 30} labelsize 9 align 5
     }
-    Fl_Button {} {
+    {fltk3::Button} {} {
       label Help
-      user_data FL_Help user_data_type {void*}
+      user_data {fltk3::HelpKey} user_data_type {void*}
       callback key_cb
       xywh {400 70 20 20} labelsize 8
     }
-    Fl_Button {} {
+    {fltk3::Button} {} {
       label {=}
-      user_data {FL_KP+'='} user_data_type {void*}
+      user_data {fltk3::KPKey+'='} user_data_type {void*}
       callback key_cb
       xywh {420 70 20 20} labelsize 10
     }
-    Fl_Dial roller_x {
+    {fltk3::Dial} roller_x {
       label {x:}
       callback wheel_cb
       xywh {440 70 20 20} box ROUND_UP_BOX selection_color 49 labelsize 9 
align 5 step 0.1
     }
-    Fl_Dial roller_y {
+    {fltk3::Dial} roller_y {
       label {y:}
       callback wheel_cb
       xywh {460 70 20 20} box ROUND_UP_BOX selection_color 49 labelsize 9 
align 5 step 0.1

_______________________________________________
fltk-commit mailing list
[email protected]
http://lists.easysw.com/mailman/listinfo/fltk-commit

Reply via email to