Author: matt
Date: 2011-07-13 07:17:40 -0700 (Wed, 13 Jul 2011)
New Revision: 8859
Log:
123 Alpha Feature: restored fltk1 .fl files. Fluid3 can not write Fluid1 files,
but does a rough conversion int Fluid3, which is not a healthy choice. Future
versions will not allow reading old files, or at least explicitly warn that the
generated file is Fluid3 (and likely won't complile without further work.
Modified:
branches/branch-3.0/test1/CubeViewUI.cxx
branches/branch-3.0/test1/CubeViewUI.h
Modified: branches/branch-3.0/test1/CubeViewUI.cxx
===================================================================
--- branches/branch-3.0/test1/CubeViewUI.cxx 2011-07-13 14:15:50 UTC (rev
8858)
+++ branches/branch-3.0/test1/CubeViewUI.cxx 2011-07-13 14:17:40 UTC (rev
8859)
@@ -1,124 +1,124 @@
-// generated by Fast Light User Interface Designer (fluid) version 3.0000
+// generated by Fast Light User Interface Designer (fluid) version 1.0300
#include "CubeViewUI.h"
-void CubeViewUI::cb_vrot_i(fltk3::Roller* o, void*) {
+void CubeViewUI::cb_vrot_i(Fl_Roller* o, void*) {
cube->v_angle(((Fl_Roller *)o)->value());
cube->redraw();
}
-void CubeViewUI::cb_vrot(fltk3::Roller* o, void* v) {
+void CubeViewUI::cb_vrot(Fl_Roller* o, void* v) {
((CubeViewUI*)(o->parent()->parent()->parent()->user_data()))->cb_vrot_i(o,v);
}
-void CubeViewUI::cb_ypan_i(fltk3::Slider* o, void*) {
+void CubeViewUI::cb_ypan_i(Fl_Slider* o, void*) {
cube->pany(((Fl_Slider *)o)->value());
cube->redraw();
}
-void CubeViewUI::cb_ypan(fltk3::Slider* o, void* v) {
+void CubeViewUI::cb_ypan(Fl_Slider* o, void* v) {
((CubeViewUI*)(o->parent()->parent()->parent()->user_data()))->cb_ypan_i(o,v);
}
-void CubeViewUI::cb_xpan_i(fltk3::Slider* o, void*) {
+void CubeViewUI::cb_xpan_i(Fl_Slider* o, void*) {
cube->panx(((Fl_Slider *)o)->value());
cube->redraw();
}
-void CubeViewUI::cb_xpan(fltk3::Slider* o, void* v) {
+void CubeViewUI::cb_xpan(Fl_Slider* o, void* v) {
((CubeViewUI*)(o->parent()->parent()->parent()->user_data()))->cb_xpan_i(o,v);
}
-void CubeViewUI::cb_hrot_i(fltk3::Roller* o, void*) {
+void CubeViewUI::cb_hrot_i(Fl_Roller* o, void*) {
cube->h_angle(((Fl_Roller *)o)->value());
cube->redraw();
}
-void CubeViewUI::cb_hrot(fltk3::Roller* o, void* v) {
+void CubeViewUI::cb_hrot(Fl_Roller* o, void* v) {
((CubeViewUI*)(o->parent()->parent()->parent()->user_data()))->cb_hrot_i(o,v);
}
-void CubeViewUI::cb_zoom_i(fltk3::ValueSlider* o, void*) {
+void CubeViewUI::cb_zoom_i(Fl_Value_Slider* o, void*) {
cube->size=((Fl_Value_Slider *)o)->value();
cube->redraw();
}
-void CubeViewUI::cb_zoom(fltk3::ValueSlider* o, void* v) {
+void CubeViewUI::cb_zoom(Fl_Value_Slider* o, void* v) {
((CubeViewUI*)(o->parent()->parent()->user_data()))->cb_zoom_i(o,v);
}
CubeViewUI::CubeViewUI() {
- { mainWindow = new fltk3::DoubleWindow(415, 405, "CubeView");
- mainWindow->box(fltk3::UP_BOX);
+ { mainWindow = new Fl_Double_Window(415, 405, "CubeView");
+ mainWindow->box(FL_UP_BOX);
mainWindow->labelsize(12);
mainWindow->user_data((void*)(this));
- { fltk3::Group* o = new fltk3::Group(5, 3, 374, 399);
- { VChange = new fltk3::Group(5, 100, 37, 192);
- { vrot = new fltk3::Roller(5, 100, 17, 186, "V Rot");
- vrot->labeltype(fltk3::NO_LABEL);
+ { Fl_Group* o = new Fl_Group(5, 3, 374, 399);
+ { VChange = new Fl_Group(5, 100, 37, 192);
+ { vrot = new Fl_Roller(5, 100, 17, 186, "V Rot");
+ vrot->labeltype(FL_NO_LABEL);
vrot->labelsize(12);
vrot->minimum(-180);
vrot->maximum(180);
vrot->step(1);
- vrot->callback((fltk3::Callback*)cb_vrot);
- vrot->align(fltk3::Align(fltk3::ALIGN_WRAP));
- } // fltk3::Roller* vrot
- { ypan = new fltk3::Slider(25, 100, 17, 186, "V Pan");
+ vrot->callback((Fl_Callback*)cb_vrot);
+ vrot->align(Fl_Align(FL_ALIGN_WRAP));
+ } // Fl_Roller* vrot
+ { ypan = new Fl_Slider(25, 100, 17, 186, "V Pan");
ypan->type(4);
- ypan->selection_color(fltk3::DARK_BLUE);
- ypan->labeltype(fltk3::NO_LABEL);
+ ypan->selection_color(FL_DARK_BLUE);
+ ypan->labeltype(FL_NO_LABEL);
ypan->labelsize(12);
ypan->minimum(-25);
ypan->maximum(25);
ypan->step(0.1);
- ypan->callback((fltk3::Callback*)cb_ypan);
- ypan->align(fltk3::Align(fltk3::ALIGN_CENTER));
- } // fltk3::Slider* ypan
+ ypan->callback((Fl_Callback*)cb_ypan);
+ ypan->align(Fl_Align(FL_ALIGN_CENTER));
+ } // Fl_Slider* ypan
VChange->end();
- } // fltk3::Group* VChange
- { HChange = new fltk3::Group(120, 362, 190, 40);
- { xpan = new fltk3::Slider(122, 364, 186, 17, "H Pan");
+ } // Fl_Group* VChange
+ { HChange = new Fl_Group(120, 362, 190, 40);
+ { xpan = new Fl_Slider(122, 364, 186, 17, "H Pan");
xpan->type(5);
- xpan->selection_color(fltk3::DARK_BLUE);
- xpan->labeltype(fltk3::NO_LABEL);
+ xpan->selection_color(FL_DARK_BLUE);
+ xpan->labeltype(FL_NO_LABEL);
xpan->labelsize(12);
xpan->minimum(25);
xpan->maximum(-25);
xpan->step(0.1);
- xpan->callback((fltk3::Callback*)cb_xpan);
- xpan->align(fltk3::Align(fltk3::ALIGN_CENTER|fltk3::ALIGN_INSIDE));
- } // fltk3::Slider* xpan
- { hrot = new fltk3::Roller(122, 383, 186, 17, "H Rotation");
+ xpan->callback((Fl_Callback*)cb_xpan);
+ xpan->align(Fl_Align(FL_ALIGN_CENTER|FL_ALIGN_INSIDE));
+ } // Fl_Slider* xpan
+ { hrot = new Fl_Roller(122, 383, 186, 17, "H Rotation");
hrot->type(1);
- hrot->labeltype(fltk3::NO_LABEL);
+ hrot->labeltype(FL_NO_LABEL);
hrot->labelsize(12);
hrot->minimum(-180);
hrot->maximum(180);
hrot->step(1);
- hrot->callback((fltk3::Callback*)cb_hrot);
- hrot->align(fltk3::Align(fltk3::ALIGN_RIGHT));
- } // fltk3::Roller* hrot
+ hrot->callback((Fl_Callback*)cb_hrot);
+ hrot->align(Fl_Align(FL_ALIGN_RIGHT));
+ } // Fl_Roller* hrot
HChange->end();
- } // fltk3::Group* HChange
- { MainView = new fltk3::Group(46, 27, 333, 333);
- { cframe = new fltk3::Box(46, 27, 333, 333);
- cframe->box(fltk3::DOWN_FRAME);
- cframe->color((fltk3::Color)4);
- cframe->selection_color((fltk3::Color)69);
- } // fltk3::Box* cframe
+ } // Fl_Group* HChange
+ { MainView = new Fl_Group(46, 27, 333, 333);
+ { cframe = new Fl_Box(46, 27, 333, 333);
+ cframe->box(FL_DOWN_FRAME);
+ cframe->color((Fl_Color)4);
+ cframe->selection_color((Fl_Color)69);
+ } // Fl_Box* cframe
{ cube = new CubeView(48, 29, 329, 329, "This is the cube_view");
- cube->box(fltk3::NO_BOX);
- cube->color(fltk3::BACKGROUND_COLOR);
- cube->selection_color(fltk3::BACKGROUND_COLOR);
- cube->labeltype(fltk3::NORMAL_LABEL);
+ cube->box(FL_NO_BOX);
+ cube->color(FL_BACKGROUND_COLOR);
+ cube->selection_color(FL_BACKGROUND_COLOR);
+ cube->labeltype(FL_NORMAL_LABEL);
cube->labelfont(0);
cube->labelsize(14);
- cube->labelcolor(fltk3::FOREGROUND_COLOR);
- cube->align(fltk3::Align(fltk3::ALIGN_CENTER|fltk3::ALIGN_INSIDE));
- cube->when(fltk3::WHEN_RELEASE);
- fltk3::Group::current()->resizable(cube);
+ cube->labelcolor(FL_FOREGROUND_COLOR);
+ cube->align(Fl_Align(FL_ALIGN_CENTER|FL_ALIGN_INSIDE));
+ cube->when(FL_WHEN_RELEASE);
+ Fl_Group::current()->resizable(cube);
} // CubeView* cube
MainView->end();
- fltk3::Group::current()->resizable(MainView);
- } // fltk3::Group* MainView
- { zoom = new fltk3::ValueSlider(106, 3, 227, 19, "Zoom");
+ Fl_Group::current()->resizable(MainView);
+ } // Fl_Group* MainView
+ { zoom = new Fl_Value_Slider(106, 3, 227, 19, "Zoom");
zoom->type(5);
- zoom->selection_color(fltk3::DARK_BLUE);
+ zoom->selection_color(FL_DARK_BLUE);
zoom->labelfont(1);
zoom->labelsize(12);
zoom->minimum(1);
@@ -126,14 +126,14 @@
zoom->step(0.1);
zoom->value(10);
zoom->textfont(1);
- zoom->callback((fltk3::Callback*)cb_zoom);
- zoom->align(fltk3::Align(fltk3::ALIGN_LEFT));
- } // fltk3::ValueSlider* zoom
+ zoom->callback((Fl_Callback*)cb_zoom);
+ zoom->align(Fl_Align(FL_ALIGN_LEFT));
+ } // Fl_Value_Slider* zoom
o->end();
- } // fltk3::Group* o
+ } // Fl_Group* o
mainWindow->end();
mainWindow->resizable(mainWindow);
- } // fltk3::DoubleWindow* mainWindow
+ } // Fl_Double_Window* mainWindow
}
void CubeViewUI::show(int argc, char **argv) {
Modified: branches/branch-3.0/test1/CubeViewUI.h
===================================================================
--- branches/branch-3.0/test1/CubeViewUI.h 2011-07-13 14:15:50 UTC (rev
8858)
+++ branches/branch-3.0/test1/CubeViewUI.h 2011-07-13 14:17:40 UTC (rev
8859)
@@ -1,52 +1,52 @@
-// generated by Fast Light User Interface Designer (fluid) version 3.0000
+// generated by Fast Light User Interface Designer (fluid) version 1.0300
#ifndef CubeViewUI_h
#define CubeViewUI_h
-#include <fltk3/run.h>
-#include <fltk3/DoubleWindow.h>
-#include <fltk3/Group.h>
-#include <fltk3/Roller.h>
+#include <FL/Fl.H>
+#include <FL/Fl_Double_Window.H>
+#include <FL/Fl_Group.H>
+#include <FL/Fl_Roller.H>
#include <stdio.h>
-#include <fltk3/Slider.h>
-#include <fltk3/Box.h>
+#include <FL/Fl_Slider.H>
+#include <FL/Fl_Box.H>
#include "CubeView.h"
-#include <fltk3/ValueSlider.h>
+#include <FL/Fl_Value_Slider.H>
class CubeViewUI {
public:
CubeViewUI();
private:
- fltk3::DoubleWindow *mainWindow;
+ Fl_Double_Window *mainWindow;
public:
- fltk3::Group *VChange;
- fltk3::Roller *vrot;
+ Fl_Group *VChange;
+ Fl_Roller *vrot;
private:
- void cb_vrot_i(fltk3::Roller*, void*);
- static void cb_vrot(fltk3::Roller*, void*);
+ void cb_vrot_i(Fl_Roller*, void*);
+ static void cb_vrot(Fl_Roller*, void*);
public:
- fltk3::Slider *ypan;
+ Fl_Slider *ypan;
private:
- void cb_ypan_i(fltk3::Slider*, void*);
- static void cb_ypan(fltk3::Slider*, void*);
+ void cb_ypan_i(Fl_Slider*, void*);
+ static void cb_ypan(Fl_Slider*, void*);
public:
- fltk3::Group *HChange;
- fltk3::Slider *xpan;
+ Fl_Group *HChange;
+ Fl_Slider *xpan;
private:
- void cb_xpan_i(fltk3::Slider*, void*);
- static void cb_xpan(fltk3::Slider*, void*);
+ void cb_xpan_i(Fl_Slider*, void*);
+ static void cb_xpan(Fl_Slider*, void*);
public:
- fltk3::Roller *hrot;
+ Fl_Roller *hrot;
private:
- void cb_hrot_i(fltk3::Roller*, void*);
- static void cb_hrot(fltk3::Roller*, void*);
+ void cb_hrot_i(Fl_Roller*, void*);
+ static void cb_hrot(Fl_Roller*, void*);
public:
- fltk3::Group *MainView;
- fltk3::Box *cframe;
+ Fl_Group *MainView;
+ Fl_Box *cframe;
CubeView *cube;
- fltk3::ValueSlider *zoom;
+ Fl_Value_Slider *zoom;
private:
- void cb_zoom_i(fltk3::ValueSlider*, void*);
- static void cb_zoom(fltk3::ValueSlider*, void*);
+ void cb_zoom_i(Fl_Value_Slider*, void*);
+ static void cb_zoom(Fl_Value_Slider*, void*);
public:
void show(int argc, char **argv);
};
_______________________________________________
fltk-commit mailing list
[email protected]
http://lists.easysw.com/mailman/listinfo/fltk-commit
