Author: matt
Date: 2011-06-21 04:31:40 -0700 (Tue, 21 Jun 2011)
New Revision: 8837
Log:
123: some additions to slowly teach Fluid to deal with the various .fl formats
for F1, 2, and 3. Also starting to add a conversion from any other format to
FLTK 3.
Modified:
branches/branch-3.0/fluid/Fl_Window_Type.cxx
branches/branch-3.0/fluid/alignment_panel.cxx
branches/branch-3.0/fluid/alignment_panel.fl
branches/branch-3.0/fluid/alignment_panel.h
branches/branch-3.0/fluid/file.cxx
branches/branch-3.0/test1/CubeViewUI.cxx
branches/branch-3.0/test1/CubeViewUI.h
Modified: branches/branch-3.0/fluid/Fl_Window_Type.cxx
===================================================================
--- branches/branch-3.0/fluid/Fl_Window_Type.cxx 2011-06-20 17:32:26 UTC
(rev 8836)
+++ branches/branch-3.0/fluid/Fl_Window_Type.cxx 2011-06-21 11:31:40 UTC
(rev 8837)
@@ -127,6 +127,12 @@
}
+void proj_version_cb(fltk3::Choice*, void*) {
+ // TODO: change version number of .fl file and fix database
+ set_modflag(1);
+}
+
+
void i18n_type_cb(fltk3::Choice *c, void *) {
undo_checkpoint();
Modified: branches/branch-3.0/fluid/alignment_panel.cxx
===================================================================
--- branches/branch-3.0/fluid/alignment_panel.cxx 2011-06-20 17:32:26 UTC
(rev 8836)
+++ branches/branch-3.0/fluid/alignment_panel.cxx 2011-06-21 11:31:40 UTC
(rev 8837)
@@ -25,7 +25,7 @@
// http://www.fltk.org/str.php
//
-// generated by Fast Light User Interface Designer (fluid) version 1.0300
+// generated by Fast Light User Interface Designer (fluid) version 3.0000
#include "alignment_panel.h"
#include <fltk3/Preferences.h>
@@ -46,6 +46,15 @@
fltk3::CheckButton *use_FL_COMMAND_button=(fltk3::CheckButton *)0;
+fltk3::Choice *proj_version_choice=(fltk3::Choice *)0;
+
+fltk3::MenuItem menu_proj_version_choice[] = {
+ {"FLTK 1.3.0", 0, 0, (void*)(10300), 0, fltk3::NORMAL_LABEL, 0, 14, 0},
+ {"FLTK 2.1.0", 0, 0, (void*)(20100), 1, fltk3::NORMAL_LABEL, 0, 14, 0},
+ {"FLTK 3.0.0", 0, 0, (void*)(30000), 0, fltk3::NORMAL_LABEL, 0, 14, 0},
+ {0,0,0,0,0,0,0,0,0}
+};
+
fltk3::Choice *i18n_type_chooser=(fltk3::Choice *)0;
fltk3::MenuItem menu_i18n_type_chooser[] = {
@@ -64,15 +73,14 @@
fltk3::Input *i18n_function_input=(fltk3::Input *)0;
fltk3::DoubleWindow* make_project_window() {
- { project_window = new fltk3::DoubleWindow(399, 252, "Project Settings");
- { fltk3::Button* o = new fltk3::Button(328, 216, 60, 25, "Close");
+ { project_window = new fltk3::DoubleWindow(400, 282, "Project Settings");
+ { fltk3::Button* o = new fltk3::Button(328, 240, 60, 25, "Close");
o->tooltip("Close this dialog.");
o->callback((fltk3::Callback*)cb_Close);
} // fltk3::Button* o
- { fltk3::TabGroup* o = new fltk3::TabGroup(10, 10, 378, 195);
+ { fltk3::TabGroup* o = new fltk3::TabGroup(10, 10, 378, 220);
o->selection_color((fltk3::Color)12);
- { fltk3::Group* o = new fltk3::Group(10, 36, 378, 169, "Output");
- o->hide();
+ { fltk3::Group* o = new fltk3::Group(10, 36, 378, 194, "Output");
{ fltk3::Box* o = new fltk3::Box(100, 49, 236, 49, "Use \"name.ext\"
to set a file name or just \".ext\" to set extension.");
o->align(fltk3::Align(fltk3::ALIGN_WRAP|fltk3::ALIGN_INSIDE));
} // fltk3::Box* o
@@ -92,19 +100,26 @@
code_file_input->callback((fltk3::Callback*)code_input_cb,
(void*)(1));
code_file_input->when(fltk3::WHEN_CHANGED);
} // fltk3::Input* code_file_input
- { include_H_from_C_button = new fltk3::CheckButton(100, 153, 272, 20,
"Include Header from Code");
+ { include_H_from_C_button = new fltk3::CheckButton(100, 177, 272, 20,
"Include Header from Code");
include_H_from_C_button->tooltip("Include the header file from the
code file.");
include_H_from_C_button->down_box(fltk3::DOWN_BOX);
include_H_from_C_button->callback((fltk3::Callback*)include_H_from_C_button_cb);
} // fltk3::CheckButton* include_H_from_C_button
- { use_FL_COMMAND_button = new fltk3::CheckButton(100, 176, 272, 20,
"Menu shortcuts use fltk3::COMMAND");
- use_FL_COMMAND_button->tooltip("Replace fltk3::CTRL with
fltk3::COMMAND when generating menu shortcut code.");
+ { use_FL_COMMAND_button = new fltk3::CheckButton(100, 200, 272, 20,
"Menu shortcuts use FL_COMMAND");
+ use_FL_COMMAND_button->tooltip("Replace FL_CTRL with FL_COMMAND when
generating menu shortcut code.");
use_FL_COMMAND_button->down_box(fltk3::DOWN_BOX);
use_FL_COMMAND_button->callback((fltk3::Callback*)use_FL_COMMAND_button_cb);
} // fltk3::CheckButton* use_FL_COMMAND_button
+ { proj_version_choice = new fltk3::Choice(100, 152, 145, 20,
"Version:");
+ proj_version_choice->down_box(fltk3::BORDER_BOX);
+ proj_version_choice->labelfont(1);
+ proj_version_choice->callback((fltk3::Callback*)proj_version_cb);
+ proj_version_choice->menu(menu_proj_version_choice);
+ } // fltk3::Choice* proj_version_choice
o->end();
} // fltk3::Group* o
- { fltk3::Group* o = new fltk3::Group(10, 36, 378, 169,
"Internationalization");
+ { fltk3::Group* o = new fltk3::Group(10, 36, 378, 194,
"Internationalization");
+ o->hide();
{ i18n_type_chooser = new fltk3::Choice(100, 48, 136, 25, "Use:");
i18n_type_chooser->tooltip("Type of internationalization to use.");
i18n_type_chooser->box(fltk3::THIN_UP_BOX);
Modified: branches/branch-3.0/fluid/alignment_panel.fl
===================================================================
--- branches/branch-3.0/fluid/alignment_panel.fl 2011-06-20 17:32:26 UTC
(rev 8836)
+++ branches/branch-3.0/fluid/alignment_panel.fl 2011-06-21 11:31:40 UTC
(rev 8837)
@@ -1,5 +1,5 @@
# data file for the Fltk User Interface Designer (fluid)
-version 1.0300
+version 3.0000
header_name {.h}
code_name {.cxx}
comment {//
@@ -31,19 +31,19 @@
} {in_source in_header
}
-decl {\#include <FL/Fl_Text_Buffer.H>} {public local
+decl {\#include <fltk3/TextBuffer.h>} {public local
}
-decl {\#include <FL/Fl_Text_Display.H>} {public local
+decl {\#include <fltk3/TextDisplay.h>} {public local
}
-decl {\#include <FL/filename.H>} {public local
+decl {\#include <fltk3/filename.h>} {public local
}
-decl {\#include <FL/Fl_Preferences.H>} {private global
+decl {\#include <fltk3/Preferences.h>} {private global
}
-decl {\#include <FL/fl_ask.H>} {private global
+decl {\#include <fltk3/ask.h>} {private global
}
decl {extern void load_history();} {public local
@@ -58,66 +58,88 @@
decl {extern int show_coredevmenus;} {public local
}
-decl {extern struct Fl_Menu_Item *dbmanager_item;} {public local
+decl {extern struct fltk3::MenuItem *dbmanager_item;} {public local
}
-decl {extern Fl_Preferences fluid_prefs;} {public local
+decl {extern fltk3::Preferences fluid_prefs;} {public local
}
-decl {Fl_Text_Buffer *shell_run_buffer;} {public local
+decl {fltk3::TextBuffer *shell_run_buffer;} {public local
}
-Function {make_project_window()} {} {
- Fl_Window project_window {
+Function {make_project_window()} {open
+} {
+ {fltk3::Window} project_window {
label {Project Settings} open
- xywh {393 460 399 252} type Double
- code0 {\#include <FL/Fl_Preferences.H>}
- code1 {\#include <FL/Fl_Tooltip.H>} modal visible
+ xywh {393 460 400 282} type Double
+ code0 {\#include <fltk3/Preferences.h>}
+ code1 {\#include <fltk3/Tooltip.h>} modal visible
} {
- Fl_Button {} {
+ {fltk3::Button} {} {
label Close
callback {project_window->hide();}
- tooltip {Close this dialog.} xywh {328 216 60 25}
+ tooltip {Close this dialog.} xywh {328 240 60 25}
}
- Fl_Tabs {} {open
- xywh {10 10 378 195} selection_color 12
+ {fltk3::TabGroup} {} {open
+ xywh {10 10 378 220} selection_color 12
} {
- Fl_Group {} {
+ {fltk3::Group} {} {
label Output open
- xywh {10 36 378 169} hide
+ xywh {10 36 378 194}
} {
- Fl_Box {} {
+ {fltk3::Box} {} {
label {Use "name.ext" to set a file name or just ".ext" to set
extension.}
xywh {100 49 236 49} align 144
}
- Fl_Input header_file_input {
+ {fltk3::Input} header_file_input {
label {Header File:}
user_data 1 user_data_type {void*}
callback header_input_cb
tooltip {The name of the generated header file.} xywh {99 103 272
20} box THIN_DOWN_BOX labelfont 1 when 1 textfont 4
}
- Fl_Input code_file_input {
+ {fltk3::Input} code_file_input {
label {Code File:}
user_data 1 user_data_type {void*}
callback code_input_cb
tooltip {The name of the generated code file.} xywh {100 128 272 20}
box THIN_DOWN_BOX labelfont 1 when 1 textfont 4
}
- Fl_Check_Button include_H_from_C_button {
+ {fltk3::CheckButton} include_H_from_C_button {
label {Include Header from Code}
callback include_H_from_C_button_cb
- tooltip {Include the header file from the code file.} xywh {100 153
272 20} down_box DOWN_BOX
+ tooltip {Include the header file from the code file.} xywh {100 177
272 20} down_box DOWN_BOX
}
- Fl_Check_Button use_FL_COMMAND_button {
+ {fltk3::CheckButton} use_FL_COMMAND_button {
label {Menu shortcuts use FL_COMMAND}
callback use_FL_COMMAND_button_cb
- tooltip {Replace FL_CTRL with FL_COMMAND when generating menu
shortcut code.} xywh {100 176 272 20} down_box DOWN_BOX
+ tooltip {Replace FL_CTRL with FL_COMMAND when generating menu
shortcut code.} xywh {100 200 272 20} down_box DOWN_BOX
}
+ {fltk3::Choice} proj_version_choice {
+ label {Version:}
+ callback proj_version_cb open selected
+ xywh {100 152 145 20} down_box BORDER_BOX labelfont 1
+ } {
+ MenuItem {} {
+ label {FLTK 1.3.0}
+ user_data 10300 user_data_type long
+ xywh {0 0 100 20}
+ }
+ MenuItem {} {
+ label {FLTK 2.1.0}
+ user_data 20100 user_data_type long
+ xywh {0 0 100 20} deactivate
+ }
+ MenuItem {} {
+ label {FLTK 3.0.0}
+ user_data 30000 user_data_type long
+ xywh {0 0 100 20}
+ }
+ }
}
- Fl_Group {} {
+ {fltk3::Group} {} {
label Internationalization open
- xywh {10 36 378 169}
+ xywh {10 36 378 194} hide
} {
- Fl_Choice i18n_type_chooser {
+ {fltk3::Choice} i18n_type_chooser {
label {Use:}
callback i18n_type_cb open
tooltip {Type of internationalization to use.} xywh {100 48 136 25}
box THIN_UP_BOX down_box BORDER_BOX labelfont 1
@@ -135,22 +157,22 @@
xywh {0 0 100 20}
}
}
- Fl_Input i18n_include_input {
+ {fltk3::Input} i18n_include_input {
label {\#include:}
callback i18n_text_cb
tooltip {The include file for internationalization.} xywh {100 78
272 20} box THIN_DOWN_BOX labelfont 1 textfont 4
}
- Fl_Input i18n_file_input {
+ {fltk3::Input} i18n_file_input {
label {File:}
callback i18n_text_cb
tooltip {The name of the message catalog.} xywh {100 104 272 20} box
THIN_DOWN_BOX labelfont 1 textfont 4
}
- Fl_Input i18n_set_input {
+ {fltk3::Input} i18n_set_input {
label {Set:}
callback i18n_int_cb
tooltip {The message set number.} xywh {100 128 272 20} type Int box
THIN_DOWN_BOX labelfont 1 textfont 4
}
- Fl_Input i18n_function_input {
+ {fltk3::Input} i18n_function_input {
label {Function:}
callback i18n_text_cb
tooltip {The function to call to internationalize the labels and
tooltips.} xywh {100 103 272 20} box THIN_DOWN_BOX labelfont 1 textfont 4
@@ -160,18 +182,18 @@
}
}
-decl {extern void i18n_cb(Fl_Choice *,void *);} {public local
+decl {extern void i18n_cb(fltk3::Choice *,void *);} {public local
}
-decl {void scheme_cb(Fl_Choice *, void *);} {public local
+decl {void scheme_cb(fltk3::Choice *, void *);} {public local
}
Function {make_settings_window()} {} {
- Fl_Window settings_window {
+ {fltk3::Window} settings_window {
label {GUI Settings} open
xywh {393 191 339 241} type Double non_modal visible
} {
- Fl_Choice scheme_choice {
+ {fltk3::Choice} scheme_choice {
label {Scheme: }
callback scheme_cb open
xywh {116 10 115 25} down_box BORDER_BOX labelfont 1
@@ -197,24 +219,24 @@
xywh {10 10 35 25}
}
}
- Fl_Group {} {open
+ {fltk3::Group} {} {open
xywh {116 43 220 126} labelfont 1 align 0
} {
- Fl_Box {} {
+ {fltk3::Box} {} {
label {Options: }
xywh {116 43 1 25} labelfont 1 align 4
}
- Fl_Check_Button tooltips_button {
+ {fltk3::CheckButton} tooltips_button {
label {Show Tooltips}
- callback {Fl_Tooltip::enable(tooltips_button->value());
+ callback {fltk3::Tooltip::enable(tooltips_button->value());
fluid_prefs.set("show_tooltips", tooltips_button->value());}
xywh {116 43 113 25} down_box DOWN_BOX
code0 {int b;}
code1 {fluid_prefs.get("show_tooltips", b, 1);}
code2 {tooltips_button->value(b);}
- code3 {Fl_Tooltip::enable(b);}
+ code3 {fltk3::Tooltip::enable(b);}
}
- Fl_Check_Button completion_button {
+ {fltk3::CheckButton} completion_button {
label {Show Completion Dialogs}
callback {fluid_prefs.set("show_completion_dialogs",
completion_button->value());}
xywh {116 68 186 25} down_box DOWN_BOX
@@ -222,7 +244,7 @@
code1 {fluid_prefs.get("show_completion_dialogs", b, 1);}
code2 {completion_button->value(b);}
}
- Fl_Check_Button openlast_button {
+ {fltk3::CheckButton} openlast_button {
label {Open Previous File on Startup}
callback {fluid_prefs.set("open_previous_file",
openlast_button->value());}
xywh {116 93 214 25} down_box DOWN_BOX
@@ -230,7 +252,7 @@
code1 {fluid_prefs.get("open_previous_file", b, 0);}
code2 {openlast_button->value(b);}
}
- Fl_Check_Button prevpos_button {
+ {fltk3::CheckButton} prevpos_button {
label {Remember Window Positions}
callback {fluid_prefs.set("prev_window_pos", prevpos_button->value());}
xywh {116 118 209 25} down_box DOWN_BOX
@@ -238,7 +260,7 @@
code1 {fluid_prefs.get("prev_window_pos", b, 1);}
code2 {prevpos_button->value(b);}
}
- Fl_Check_Button show_comments_button {
+ {fltk3::CheckButton} show_comments_button {
label {Show Comments in Browser}
callback {show_comments = show_comments_button->value();
fluid_prefs.set("show_comments", show_comments);
@@ -248,7 +270,7 @@
code2 {show_comments_button->value(show_comments);}
}
}
- Fl_Spinner recent_spinner {
+ {fltk3::Spinner} recent_spinner {
label {\# Recent Files: }
callback {fluid_prefs.set("recent_files", recent_spinner->value());
load_history();}
@@ -258,7 +280,7 @@
code2 {recent_spinner->maximum(10);}
code3 {recent_spinner->value(c);}
}
- Fl_Button {} {
+ {fltk3::Button} {} {
label Close
callback {settings_window->hide();}
tooltip {Close this dialog.} xywh {266 205 64 25}
@@ -267,11 +289,11 @@
}
Function {make_shell_window()} {} {
- Fl_Window shell_window {
+ {fltk3::Window} shell_window {
label {Shell Command} open
xywh {741 195 365 125} type Double visible
} {
- Fl_Input shell_command_input {
+ {fltk3::Input} shell_command_input {
label {Command:}
callback {fluid_prefs.set("shell_command",
shell_command_input->value());}
xywh {10 27 347 25} labelfont 1 align 5
@@ -279,7 +301,7 @@
code1 {fluid_prefs.get("shell_command", buf, "", sizeof(buf));}
code2 {shell_command_input->value(buf);}
}
- Fl_Check_Button shell_writecode_button {
+ {fltk3::CheckButton} shell_writecode_button {
label {Write Code}
callback {fluid_prefs.set("shell_writecode",
shell_writecode_button->value());}
xywh {128 61 93 19} down_box DOWN_BOX
@@ -287,7 +309,7 @@
code1 {fluid_prefs.get("shell_writecode", b, 1);}
code2 {shell_writecode_button->value(b);}
}
- Fl_Check_Button shell_writemsgs_button {
+ {fltk3::CheckButton} shell_writemsgs_button {
label {Write Messages}
callback {fluid_prefs.set("shell_writemsgs",
shell_writemsgs_button->value());}
xywh {231 61 126 19} down_box DOWN_BOX
@@ -295,7 +317,7 @@
code1 {fluid_prefs.get("shell_writemsgs", b, 0);}
code2 {shell_writemsgs_button->value(b);}
}
- Fl_Check_Button shell_savefl_button {
+ {fltk3::CheckButton} shell_savefl_button {
label {Save .FL File}
callback {fluid_prefs.set("shell_savefl", shell_savefl_button->value());}
xywh {10 62 108 19} down_box DOWN_BOX
@@ -303,27 +325,27 @@
code1 {fluid_prefs.get("shell_savefl", b, 1);}
code2 {shell_savefl_button->value(b);}
}
- Fl_Return_Button {} {
+ {fltk3::ReturnButton} {} {
label {Run Command}
callback do_shell_command
xywh {132 90 143 25}
}
- Fl_Button {} {
+ {fltk3::Button} {} {
label Cancel
callback {shell_window->hide();}
xywh {285 90 72 25}
}
}
- Fl_Window shell_run_window {
- label {Shell Command Output}
+ {fltk3::Window} shell_run_window {
+ label {Shell Command Output} open
xywh {592 332 555 430} type Double hide resizable
} {
- Fl_Text_Display shell_run_display {
+ {fltk3::TextDisplay} shell_run_display {
xywh {10 10 535 375} box DOWN_BOX textfont 4 resizable
- code0 {shell_run_buffer = new Fl_Text_Buffer();}
+ code0 {shell_run_buffer = new fltk3::TextBuffer();}
code1 {shell_run_display->buffer(shell_run_buffer);}
}
- Fl_Return_Button shell_run_button {
+ {fltk3::ReturnButton} shell_run_button {
label Close
callback {shell_run_window->hide();}
xywh {468 395 77 25}
@@ -332,104 +354,104 @@
}
Function {make_layout_window()} {} {
- Fl_Window grid_window {
+ {fltk3::Window} grid_window {
label {Layout Settings} open
xywh {760 427 285 245} type Double non_modal visible
} {
- Fl_Input horizontal_input {
+ {fltk3::Input} horizontal_input {
label x
user_data 1 user_data_type long
callback grid_cb
tooltip {Horizontal grid spacing.} xywh {106 10 50 25} type Int box
THIN_DOWN_BOX align 8
- code0 {o->when(FL_WHEN_RELEASE|FL_WHEN_ENTER_KEY);}
+ code0 {o->when(fltk3::WHEN_RELEASE|fltk3::WHEN_ENTER_KEY);}
}
- Fl_Input vertical_input {
+ {fltk3::Input} vertical_input {
label pixels
user_data 2 user_data_type long
callback grid_cb
tooltip {Vertical grid spacing.} xywh {166 10 50 25} type Int box
THIN_DOWN_BOX align 8
- code0 {o->when(FL_WHEN_RELEASE|FL_WHEN_ENTER_KEY);}
+ code0 {o->when(fltk3::WHEN_RELEASE|fltk3::WHEN_ENTER_KEY);}
}
- Fl_Input snap_input {
+ {fltk3::Input} snap_input {
label {pixel snap}
user_data 3 user_data_type long
callback grid_cb
tooltip {Snap to grid within this many pixels.} xywh {106 45 50 25} type
Int box THIN_DOWN_BOX align 8
- code0 {o->when(FL_WHEN_RELEASE|FL_WHEN_ENTER_KEY);}
+ code0 {o->when(fltk3::WHEN_RELEASE|fltk3::WHEN_ENTER_KEY);}
}
- Fl_Check_Button guides_toggle {
+ {fltk3::CheckButton} guides_toggle {
label {Show Guides}
user_data 4 user_data_type long
callback guides_cb
tooltip {Show distance and alignment guides in overlay} xywh {106 80 110
25} down_box DOWN_BOX
}
- Fl_Button {} {
+ {fltk3::Button} {} {
label Close
callback {grid_window->hide();}
tooltip {Close this dialog.} xywh {215 210 60 25}
}
- Fl_Box {} {
+ {fltk3::Box} {} {
label {Grid:}
xywh {26 10 70 25} labelfont 1 align 24
}
- Fl_Box {} {
+ {fltk3::Box} {} {
label {Widget Size:}
xywh {-1 115 97 25} labelfont 1 align 24
}
- Fl_Group {} {open
+ {fltk3::Group} {} {open
xywh {105 115 170 75}
} {
- Fl_Round_Button {def_widget_size[0]} {
+ {fltk3::RoundButton} {def_widget_size[0]} {
user_data 8 user_data_type long
callback default_widget_size_cb
xywh {105 115 70 25} type Radio down_box ROUND_DOWN_BOX
}
- Fl_Box {} {
+ {fltk3::Box} {} {
label tiny
xywh {120 115 50 25} labelsize 8 align 20
}
- Fl_Round_Button {def_widget_size[1]} {
+ {fltk3::RoundButton} {def_widget_size[1]} {
user_data 11 user_data_type long
callback default_widget_size_cb
xywh {180 115 70 25} type Radio down_box ROUND_DOWN_BOX
}
- Fl_Box {} {
+ {fltk3::Box} {} {
label small
xywh {195 115 50 25} labelsize 11 align 20
}
- Fl_Round_Button {def_widget_size[2]} {
+ {fltk3::RoundButton} {def_widget_size[2]} {
user_data 14 user_data_type long
callback default_widget_size_cb
xywh {105 140 70 25} type Radio down_box ROUND_DOWN_BOX
}
- Fl_Box {} {
+ {fltk3::Box} {} {
label normal
xywh {120 140 50 25} align 20
}
- Fl_Round_Button {def_widget_size[3]} {
+ {fltk3::RoundButton} {def_widget_size[3]} {
user_data 18 user_data_type long
callback default_widget_size_cb
xywh {180 140 90 25} type Radio down_box ROUND_DOWN_BOX
}
- Fl_Box {} {
+ {fltk3::Box} {} {
label medium
xywh {195 140 68 25} labelsize 18 align 20
}
- Fl_Round_Button {def_widget_size[4]} {
+ {fltk3::RoundButton} {def_widget_size[4]} {
user_data 24 user_data_type long
callback default_widget_size_cb
xywh {105 165 75 25} type Radio down_box ROUND_DOWN_BOX
}
- Fl_Box {} {
+ {fltk3::Box} {} {
label large
xywh {120 165 64 25} labelsize 24 align 20
}
- Fl_Round_Button {def_widget_size[5]} {
+ {fltk3::RoundButton} {def_widget_size[5]} {
user_data 32 user_data_type long
callback default_widget_size_cb
xywh {180 165 95 25} type Radio down_box ROUND_DOWN_BOX
}
- Fl_Box {} {
+ {fltk3::Box} {} {
label huge
xywh {195 165 76 25} labelsize 32 align 20
}
@@ -445,10 +467,10 @@
comment {Update the UI using the values in the opt array} private
return_type void
} {
code {int mode = wUserOrSystem->value();
-wVisibleFocus->value(opt[Fl::OPTION_VISIBLE_FOCUS][mode]);
-wArrowFocus->value(opt[Fl::OPTION_ARROW_FOCUS][mode]);
-wShowTooltips->value(opt[Fl::OPTION_SHOW_TOOLTIPS][mode]);
-wDNDText->value(opt[Fl::OPTION_DND_TEXT][mode]);} {}
+wVisibleFocus->value(opt[fltk3::OPTION_VISIBLE_FOCUS][mode]);
+wArrowFocus->value(opt[fltk3::OPTION_ARROW_FOCUS][mode]);
+wShowTooltips->value(opt[fltk3::OPTION_SHOW_TOOLTIPS][mode]);
+wDNDText->value(opt[fltk3::OPTION_DND_TEXT][mode]);} {}
}
Function {readPrefs()} {
@@ -456,20 +478,20 @@
} {
code {// read all preferences and refresh the GUI
{
- Fl_Preferences prefs(Fl_Preferences::SYSTEM, "fltk.org", "fltk");
- Fl_Preferences opt_prefs(prefs, "options");
- opt_prefs.get("ArrowFocus", opt[Fl::OPTION_ARROW_FOCUS][1], 2);
- opt_prefs.get("VisibleFocus", opt[Fl::OPTION_VISIBLE_FOCUS][1], 2);
- opt_prefs.get("DNDText", opt[Fl::OPTION_DND_TEXT][1], 2);
- opt_prefs.get("ShowTooltips", opt[Fl::OPTION_SHOW_TOOLTIPS][1], 2);
+ fltk3::Preferences prefs(fltk3::Preferences::SYSTEM, "fltk.org", "fltk");
+ fltk3::Preferences opt_prefs(prefs, "options");
+ opt_prefs.get("ArrowFocus", opt[fltk3::OPTION_ARROW_FOCUS][1], 2);
+ opt_prefs.get("VisibleFocus", opt[fltk3::OPTION_VISIBLE_FOCUS][1], 2);
+ opt_prefs.get("DNDText", opt[fltk3::OPTION_DND_TEXT][1], 2);
+ opt_prefs.get("ShowTooltips", opt[fltk3::OPTION_SHOW_TOOLTIPS][1], 2);
}
{
- Fl_Preferences prefs(Fl_Preferences::USER, "fltk.org", "fltk");
- Fl_Preferences opt_prefs(prefs, "options");
- opt_prefs.get("ArrowFocus", opt[Fl::OPTION_ARROW_FOCUS][0], 2);
- opt_prefs.get("VisibleFocus", opt[Fl::OPTION_VISIBLE_FOCUS][0], 2);
- opt_prefs.get("DNDText", opt[Fl::OPTION_DND_TEXT][0], 2);
- opt_prefs.get("ShowTooltips", opt[Fl::OPTION_SHOW_TOOLTIPS][0], 2);
+ fltk3::Preferences prefs(fltk3::Preferences::USER, "fltk.org", "fltk");
+ fltk3::Preferences opt_prefs(prefs, "options");
+ opt_prefs.get("ArrowFocus", opt[fltk3::OPTION_ARROW_FOCUS][0], 2);
+ opt_prefs.get("VisibleFocus", opt[fltk3::OPTION_VISIBLE_FOCUS][0], 2);
+ opt_prefs.get("DNDText", opt[fltk3::OPTION_DND_TEXT][0], 2);
+ opt_prefs.get("ShowTooltips", opt[fltk3::OPTION_SHOW_TOOLTIPS][0], 2);
}
refreshUI();} {}
}
@@ -479,61 +501,60 @@
} {
code {// write all preferences using the array
{
- Fl_Preferences prefs(Fl_Preferences::SYSTEM, "fltk.org", "fltk");
- Fl_Preferences opt_prefs(prefs, "options");
- if (opt[Fl::OPTION_ARROW_FOCUS][1]==2) opt_prefs.deleteEntry("ArrowFocus");
- else opt_prefs.set("ArrowFocus", opt[Fl::OPTION_ARROW_FOCUS][1]);
- if (opt[Fl::OPTION_VISIBLE_FOCUS][1]==2)
opt_prefs.deleteEntry("VisibleFocus");
- else opt_prefs.set("VisibleFocus", opt[Fl::OPTION_VISIBLE_FOCUS][1]);
- if (opt[Fl::OPTION_DND_TEXT][1]==2) opt_prefs.deleteEntry("DNDText");
- else opt_prefs.set("DNDText", opt[Fl::OPTION_DND_TEXT][1]);
- if (opt[Fl::OPTION_SHOW_TOOLTIPS][1]==2)
opt_prefs.deleteEntry("ShowTooltips");
- else opt_prefs.set("ShowTooltips", opt[Fl::OPTION_SHOW_TOOLTIPS][1]);
+ fltk3::Preferences prefs(fltk3::Preferences::SYSTEM, "fltk.org", "fltk");
+ fltk3::Preferences opt_prefs(prefs, "options");
+ if (opt[fltk3::OPTION_ARROW_FOCUS][1]==2)
opt_prefs.deleteEntry("ArrowFocus");
+ else opt_prefs.set("ArrowFocus", opt[fltk3::OPTION_ARROW_FOCUS][1]);
+ if (opt[fltk3::OPTION_VISIBLE_FOCUS][1]==2)
opt_prefs.deleteEntry("VisibleFocus");
+ else opt_prefs.set("VisibleFocus", opt[fltk3::OPTION_VISIBLE_FOCUS][1]);
+ if (opt[fltk3::OPTION_DND_TEXT][1]==2) opt_prefs.deleteEntry("DNDText");
+ else opt_prefs.set("DNDText", opt[fltk3::OPTION_DND_TEXT][1]);
+ if (opt[fltk3::OPTION_SHOW_TOOLTIPS][1]==2)
opt_prefs.deleteEntry("ShowTooltips");
+ else opt_prefs.set("ShowTooltips", opt[fltk3::OPTION_SHOW_TOOLTIPS][1]);
}
{
- Fl_Preferences prefs(Fl_Preferences::USER, "fltk.org", "fltk");
- Fl_Preferences opt_prefs(prefs, "options");
- if (opt[Fl::OPTION_ARROW_FOCUS][0]==2) opt_prefs.deleteEntry("ArrowFocus");
- else opt_prefs.set("ArrowFocus", opt[Fl::OPTION_ARROW_FOCUS][0]);
- if (opt[Fl::OPTION_VISIBLE_FOCUS][0]==2)
opt_prefs.deleteEntry("VisibleFocus");
- else opt_prefs.set("VisibleFocus", opt[Fl::OPTION_VISIBLE_FOCUS][0]);
- if (opt[Fl::OPTION_DND_TEXT][0]==2) opt_prefs.deleteEntry("DNDText");
- else opt_prefs.set("DNDText", opt[Fl::OPTION_DND_TEXT][0]);
- if (opt[Fl::OPTION_SHOW_TOOLTIPS][0]==2)
opt_prefs.deleteEntry("ShowTooltips");
- else opt_prefs.set("ShowTooltips", opt[Fl::OPTION_SHOW_TOOLTIPS][0]);
+ fltk3::Preferences prefs(fltk3::Preferences::USER, "fltk.org", "fltk");
+ fltk3::Preferences opt_prefs(prefs, "options");
+ if (opt[fltk3::OPTION_ARROW_FOCUS][0]==2)
opt_prefs.deleteEntry("ArrowFocus");
+ else opt_prefs.set("ArrowFocus", opt[fltk3::OPTION_ARROW_FOCUS][0]);
+ if (opt[fltk3::OPTION_VISIBLE_FOCUS][0]==2)
opt_prefs.deleteEntry("VisibleFocus");
+ else opt_prefs.set("VisibleFocus", opt[fltk3::OPTION_VISIBLE_FOCUS][0]);
+ if (opt[fltk3::OPTION_DND_TEXT][0]==2) opt_prefs.deleteEntry("DNDText");
+ else opt_prefs.set("DNDText", opt[fltk3::OPTION_DND_TEXT][0]);
+ if (opt[fltk3::OPTION_SHOW_TOOLTIPS][0]==2)
opt_prefs.deleteEntry("ShowTooltips");
+ else opt_prefs.set("ShowTooltips", opt[fltk3::OPTION_SHOW_TOOLTIPS][0]);
}} {}
}
-Function {show_global_settings_window()} {open return_type void
+Function {show_global_settings_window()} {return_type void
} {
code {if (!global_settings_window)
make_global_settings_window();
readPrefs();
refreshUI();
-fl_message(
+fltk3::message(
"WARNING!\\n\\n"
"The following dialog changes the user interface behavior\\n"
"of ALL FLTK applications, for the current user, or for \\n"
"ALL users on this machine.\\n\\n"
"Please choose these settings carefully, or reset\\n"
"user and system settings to \\"default\\".");
-global_settings_window->show();} {selected
- }
+global_settings_window->show();} {}
}
Function {make_global_settings_window()} {} {
- Fl_Window global_settings_window {
+ {fltk3::Window} global_settings_window {
label {FLTK Preferences} open
- xywh {444 220 403 317} type Double color 50 visible
+ xywh {445 753 403 317} type Double color 50 visible
} {
- Fl_Group {} {
+ {fltk3::Group} {} {
label {Keyboard Focus Options} open
xywh {10 10 380 100} box GTK_DOWN_BOX labelfont 2 align 21
} {
- Fl_Choice wVisibleFocus {
+ {fltk3::Choice} wVisibleFocus {
label {Visible Keyboard Focus:}
callback {int mode = wUserOrSystem->value();
-opt[Fl::OPTION_VISIBLE_FOCUS][mode] = wVisibleFocus->value();} open
+opt[fltk3::OPTION_VISIBLE_FOCUS][mode] = wVisibleFocus->value();} open
tooltip {OPTION_VISIBLE_FOCUS
If visible focus is switched on, FLTK will draw a dotted rectangle inside the
widget that will receive the next keystroke. If switched off, no such indicator
will be drawn and keyboard navigation is disabled.
@@ -556,10 +577,10 @@
xywh {10 10 31 20}
}
}
- Fl_Choice wArrowFocus {
+ {fltk3::Choice} wArrowFocus {
label {Arrow Keys move Focus:}
callback {int mode = wUserOrSystem->value();
-opt[Fl::OPTION_ARROW_FOCUS][mode] = wArrowFocus->value();} open
+opt[fltk3::OPTION_ARROW_FOCUS][mode] = wArrowFocus->value();} open
tooltip {OPTION_ARROW_FOCUS
When switched on, moving the text cursor beyond the start or end of the text
in a text widget will change focus to the next widget. When switched off, the
cursor will stop at the end of the text. Pressing Tab or Ctrl-Tab will advance
the keyboard focus. Switch this on, if you want the old behavior of FLTK 1.1.
@@ -583,14 +604,14 @@
}
}
}
- Fl_Group {} {
+ {fltk3::Group} {} {
label {Tooltip Options} open
xywh {10 120 380 65} box GTK_DOWN_BOX labelfont 2 align 21
} {
- Fl_Choice wShowTooltips {
+ {fltk3::Choice} wShowTooltips {
label {Show Tooltips:}
callback {int mode = wUserOrSystem->value();
-opt[Fl::OPTION_SHOW_TOOLTIPS][mode] = wShowTooltips->value();} open
+opt[fltk3::OPTION_SHOW_TOOLTIPS][mode] = wShowTooltips->value();} open
tooltip {OPTION_SHOW_TOOLTIPS
If tooltips are enabled, hovering the mouse over a widget with a tooltip text
will open a little tooltip window until the mouse leaves the widget. If
disabled, no tooltip is shown.
@@ -614,14 +635,14 @@
}
}
}
- Fl_Group {} {
+ {fltk3::Group} {} {
label {Drag And Drop Options} open
xywh {10 194 380 66} box GTK_DOWN_BOX labelfont 2 align 21
} {
- Fl_Choice wDNDText {
+ {fltk3::Choice} wDNDText {
label {Allow dragging Text:}
callback {int mode = wUserOrSystem->value();
-opt[Fl::OPTION_DND_TEXT][mode] = wDNDText->value();} open
+opt[fltk3::OPTION_DND_TEXT][mode] = wDNDText->value();} open
tooltip {OPTION_DND_TEXT
If text drag-and-drop is enabled, the user can select and drag text from any
text widget. If disabled, no dragging is possible, however dropping text from
other applications still works.
@@ -645,7 +666,7 @@
}
}
}
- Fl_Choice wUserOrSystem {
+ {fltk3::Choice} wUserOrSystem {
callback {refreshUI();} open
tooltip {Change settings for the current user, or default values for all
users of this computer. Individual users can override system options, if they
set their options to specific values (not 'default').} xywh {14 275 141 25}
down_box BORDER_BOX
} {
@@ -660,12 +681,12 @@
xywh {0 0 31 20}
}
}
- Fl_Button {} {
+ {fltk3::Button} {} {
label Cancel
callback {global_settings_window->hide();}
xywh {230 275 75 25}
}
- Fl_Button {} {
+ {fltk3::Button} {} {
label OK
callback {writePrefs();
global_settings_window->hide();}
@@ -673,7 +694,7 @@
}
}
code {readPrefs();
- Fl::option(Fl::OPTION_SHOW_TOOLTIPS,1); // make sure tooltips are on !} {}
+ fltk3::option(fltk3::OPTION_SHOW_TOOLTIPS,1); // make sure tooltips are on
!} {}
}
comment {
Modified: branches/branch-3.0/fluid/alignment_panel.h
===================================================================
--- branches/branch-3.0/fluid/alignment_panel.h 2011-06-20 17:32:26 UTC (rev
8836)
+++ branches/branch-3.0/fluid/alignment_panel.h 2011-06-21 11:31:40 UTC (rev
8837)
@@ -25,7 +25,7 @@
// http://www.fltk.org/str.php
//
-// generated by Fast Light User Interface Designer (fluid) version 1.0300
+// generated by Fast Light User Interface Designer (fluid) version 3.0000
#ifndef alignment_panel_h
#define alignment_panel_h
@@ -59,6 +59,8 @@
extern void use_FL_COMMAND_button_cb(fltk3::CheckButton*, void*);
extern fltk3::CheckButton *use_FL_COMMAND_button;
#include <fltk3/Choice.h>
+extern void proj_version_cb(fltk3::Choice*, void*);
+extern fltk3::Choice *proj_version_choice;
extern void i18n_type_cb(fltk3::Choice*, void*);
extern fltk3::Choice *i18n_type_chooser;
extern void i18n_text_cb(fltk3::Input*, void*);
@@ -69,6 +71,7 @@
extern fltk3::IntInput *i18n_set_input;
extern fltk3::Input *i18n_function_input;
fltk3::DoubleWindow* make_project_window();
+extern fltk3::MenuItem menu_proj_version_choice[];
extern fltk3::MenuItem menu_i18n_type_chooser[];
extern void i18n_cb(fltk3::Choice *,void *);
extern void scheme_cb(fltk3::Choice *, void *);
Modified: branches/branch-3.0/fluid/file.cxx
===================================================================
--- branches/branch-3.0/fluid/file.cxx 2011-06-20 17:32:26 UTC (rev 8836)
+++ branches/branch-3.0/fluid/file.cxx 2011-06-21 11:31:40 UTC (rev 8837)
@@ -41,6 +41,9 @@
static FILE *fout;
+double read_version;
+double write_version;
+
int open_write(const char *s) {
if (!s) {fout = stdout; return 1;}
FILE *f = fltk3::fopen(s,"w");
@@ -360,8 +363,6 @@
void read_fdesign();
-double read_version;
-
extern Fl_Type *Fl_Type_make(const char *tn);
static void read_children(Fl_Type *p, int paste) {
@@ -387,7 +388,7 @@
if (!strcmp(c,"version")) {
c = read_word();
- read_version = strtod(c,0);
+ read_version = write_version = strtod(c,0);
if (read_version<=0 || read_version>FL_VERSION)
read_error("unknown version '%s'",c);
continue;
@@ -505,7 +506,7 @@
Fl_Type *o;
read_version = 0.0;
if (!open_read(filename)) return 0;
- if (merge) deselect(); else delete_all();
+ if (merge) deselect(); else delete_all();
read_children(Fl_Type::current, merge);
Fl_Type::current = 0;
// Force menu items to be rebuilt...
Modified: branches/branch-3.0/test1/CubeViewUI.cxx
===================================================================
--- branches/branch-3.0/test1/CubeViewUI.cxx 2011-06-20 17:32:26 UTC (rev
8836)
+++ branches/branch-3.0/test1/CubeViewUI.cxx 2011-06-21 11:31:40 UTC (rev
8837)
@@ -1,124 +1,124 @@
-// generated by Fast Light User Interface Designer (fluid) version 1.0300
+// generated by Fast Light User Interface Designer (fluid) version 3.0000
#include "CubeViewUI.h"
-void CubeViewUI::cb_vrot_i(Fl_Roller* o, void*) {
+void CubeViewUI::cb_vrot_i(fltk3::Roller* o, void*) {
cube->v_angle(((Fl_Roller *)o)->value());
cube->redraw();
}
-void CubeViewUI::cb_vrot(Fl_Roller* o, void* v) {
+void CubeViewUI::cb_vrot(fltk3::Roller* o, void* v) {
((CubeViewUI*)(o->parent()->parent()->parent()->user_data()))->cb_vrot_i(o,v);
}
-void CubeViewUI::cb_ypan_i(Fl_Slider* o, void*) {
+void CubeViewUI::cb_ypan_i(fltk3::Slider* o, void*) {
cube->pany(((Fl_Slider *)o)->value());
cube->redraw();
}
-void CubeViewUI::cb_ypan(Fl_Slider* o, void* v) {
+void CubeViewUI::cb_ypan(fltk3::Slider* o, void* v) {
((CubeViewUI*)(o->parent()->parent()->parent()->user_data()))->cb_ypan_i(o,v);
}
-void CubeViewUI::cb_xpan_i(Fl_Slider* o, void*) {
+void CubeViewUI::cb_xpan_i(fltk3::Slider* o, void*) {
cube->panx(((Fl_Slider *)o)->value());
cube->redraw();
}
-void CubeViewUI::cb_xpan(Fl_Slider* o, void* v) {
+void CubeViewUI::cb_xpan(fltk3::Slider* o, void* v) {
((CubeViewUI*)(o->parent()->parent()->parent()->user_data()))->cb_xpan_i(o,v);
}
-void CubeViewUI::cb_hrot_i(Fl_Roller* o, void*) {
+void CubeViewUI::cb_hrot_i(fltk3::Roller* o, void*) {
cube->h_angle(((Fl_Roller *)o)->value());
cube->redraw();
}
-void CubeViewUI::cb_hrot(Fl_Roller* o, void* v) {
+void CubeViewUI::cb_hrot(fltk3::Roller* o, void* v) {
((CubeViewUI*)(o->parent()->parent()->parent()->user_data()))->cb_hrot_i(o,v);
}
-void CubeViewUI::cb_zoom_i(Fl_Value_Slider* o, void*) {
+void CubeViewUI::cb_zoom_i(fltk3::ValueSlider* o, void*) {
cube->size=((Fl_Value_Slider *)o)->value();
cube->redraw();
}
-void CubeViewUI::cb_zoom(Fl_Value_Slider* o, void* v) {
+void CubeViewUI::cb_zoom(fltk3::ValueSlider* o, void* v) {
((CubeViewUI*)(o->parent()->parent()->user_data()))->cb_zoom_i(o,v);
}
CubeViewUI::CubeViewUI() {
- { mainWindow = new Fl_Double_Window(415, 405, "CubeView");
- mainWindow->box(FL_UP_BOX);
+ { mainWindow = new fltk3::DoubleWindow(415, 405, "CubeView");
+ mainWindow->box(fltk3::UP_BOX);
mainWindow->labelsize(12);
mainWindow->user_data((void*)(this));
- { 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);
+ { 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);
vrot->labelsize(12);
vrot->minimum(-180);
vrot->maximum(180);
vrot->step(1);
- 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");
+ 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");
ypan->type(4);
- ypan->selection_color(FL_DARK_BLUE);
- ypan->labeltype(FL_NO_LABEL);
+ ypan->selection_color(fltk3::DARK_BLUE);
+ ypan->labeltype(fltk3::NO_LABEL);
ypan->labelsize(12);
ypan->minimum(-25);
ypan->maximum(25);
ypan->step(0.1);
- ypan->callback((Fl_Callback*)cb_ypan);
- ypan->align(Fl_Align(FL_ALIGN_CENTER));
- } // Fl_Slider* ypan
+ ypan->callback((fltk3::Callback*)cb_ypan);
+ ypan->align(fltk3::Align(fltk3::ALIGN_CENTER));
+ } // fltk3::Slider* ypan
VChange->end();
- } // Fl_Group* VChange
- { HChange = new Fl_Group(120, 362, 190, 40);
- { xpan = new Fl_Slider(122, 364, 186, 17, "H Pan");
+ } // fltk3::Group* VChange
+ { HChange = new fltk3::Group(120, 362, 190, 40);
+ { xpan = new fltk3::Slider(122, 364, 186, 17, "H Pan");
xpan->type(5);
- xpan->selection_color(FL_DARK_BLUE);
- xpan->labeltype(FL_NO_LABEL);
+ xpan->selection_color(fltk3::DARK_BLUE);
+ xpan->labeltype(fltk3::NO_LABEL);
xpan->labelsize(12);
xpan->minimum(25);
xpan->maximum(-25);
xpan->step(0.1);
- 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");
+ 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");
hrot->type(1);
- hrot->labeltype(FL_NO_LABEL);
+ hrot->labeltype(fltk3::NO_LABEL);
hrot->labelsize(12);
hrot->minimum(-180);
hrot->maximum(180);
hrot->step(1);
- hrot->callback((Fl_Callback*)cb_hrot);
- hrot->align(Fl_Align(FL_ALIGN_RIGHT));
- } // Fl_Roller* hrot
+ hrot->callback((fltk3::Callback*)cb_hrot);
+ hrot->align(fltk3::Align(fltk3::ALIGN_RIGHT));
+ } // fltk3::Roller* hrot
HChange->end();
- } // 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
+ } // 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
{ cube = new CubeView(48, 29, 329, 329, "This is the cube_view");
- cube->box(FL_NO_BOX);
- cube->color(FL_BACKGROUND_COLOR);
- cube->selection_color(FL_BACKGROUND_COLOR);
- cube->labeltype(FL_NORMAL_LABEL);
+ cube->box(fltk3::NO_BOX);
+ cube->color(fltk3::BACKGROUND_COLOR);
+ cube->selection_color(fltk3::BACKGROUND_COLOR);
+ cube->labeltype(fltk3::NORMAL_LABEL);
cube->labelfont(0);
cube->labelsize(14);
- 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);
+ 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);
} // CubeView* cube
MainView->end();
- Fl_Group::current()->resizable(MainView);
- } // Fl_Group* MainView
- { zoom = new Fl_Value_Slider(106, 3, 227, 19, "Zoom");
+ fltk3::Group::current()->resizable(MainView);
+ } // fltk3::Group* MainView
+ { zoom = new fltk3::ValueSlider(106, 3, 227, 19, "Zoom");
zoom->type(5);
- zoom->selection_color(FL_DARK_BLUE);
+ zoom->selection_color(fltk3::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((Fl_Callback*)cb_zoom);
- zoom->align(Fl_Align(FL_ALIGN_LEFT));
- } // Fl_Value_Slider* zoom
+ zoom->callback((fltk3::Callback*)cb_zoom);
+ zoom->align(fltk3::Align(fltk3::ALIGN_LEFT));
+ } // fltk3::ValueSlider* zoom
o->end();
- } // Fl_Group* o
+ } // fltk3::Group* o
mainWindow->end();
mainWindow->resizable(mainWindow);
- } // Fl_Double_Window* mainWindow
+ } // fltk3::DoubleWindow* mainWindow
}
void CubeViewUI::show(int argc, char **argv) {
Modified: branches/branch-3.0/test1/CubeViewUI.h
===================================================================
--- branches/branch-3.0/test1/CubeViewUI.h 2011-06-20 17:32:26 UTC (rev
8836)
+++ branches/branch-3.0/test1/CubeViewUI.h 2011-06-21 11:31:40 UTC (rev
8837)
@@ -1,52 +1,52 @@
-// generated by Fast Light User Interface Designer (fluid) version 1.0300
+// generated by Fast Light User Interface Designer (fluid) version 3.0000
#ifndef CubeViewUI_h
#define CubeViewUI_h
-#include <FL/Fl.H>
-#include <FL/Fl_Double_Window.H>
-#include <FL/Fl_Group.H>
-#include <FL/Fl_Roller.H>
+#include <fltk3/run.h>
+#include <fltk3/DoubleWindow.h>
+#include <fltk3/Group.h>
+#include <fltk3/Roller.h>
#include <stdio.h>
-#include <FL/Fl_Slider.H>
-#include <FL/Fl_Box.H>
+#include <fltk3/Slider.h>
+#include <fltk3/Box.h>
#include "CubeView.h"
-#include <FL/Fl_Value_Slider.H>
+#include <fltk3/ValueSlider.h>
class CubeViewUI {
public:
CubeViewUI();
private:
- Fl_Double_Window *mainWindow;
+ fltk3::DoubleWindow *mainWindow;
public:
- Fl_Group *VChange;
- Fl_Roller *vrot;
+ fltk3::Group *VChange;
+ fltk3::Roller *vrot;
private:
- void cb_vrot_i(Fl_Roller*, void*);
- static void cb_vrot(Fl_Roller*, void*);
+ void cb_vrot_i(fltk3::Roller*, void*);
+ static void cb_vrot(fltk3::Roller*, void*);
public:
- Fl_Slider *ypan;
+ fltk3::Slider *ypan;
private:
- void cb_ypan_i(Fl_Slider*, void*);
- static void cb_ypan(Fl_Slider*, void*);
+ void cb_ypan_i(fltk3::Slider*, void*);
+ static void cb_ypan(fltk3::Slider*, void*);
public:
- Fl_Group *HChange;
- Fl_Slider *xpan;
+ fltk3::Group *HChange;
+ fltk3::Slider *xpan;
private:
- void cb_xpan_i(Fl_Slider*, void*);
- static void cb_xpan(Fl_Slider*, void*);
+ void cb_xpan_i(fltk3::Slider*, void*);
+ static void cb_xpan(fltk3::Slider*, void*);
public:
- Fl_Roller *hrot;
+ fltk3::Roller *hrot;
private:
- void cb_hrot_i(Fl_Roller*, void*);
- static void cb_hrot(Fl_Roller*, void*);
+ void cb_hrot_i(fltk3::Roller*, void*);
+ static void cb_hrot(fltk3::Roller*, void*);
public:
- Fl_Group *MainView;
- Fl_Box *cframe;
+ fltk3::Group *MainView;
+ fltk3::Box *cframe;
CubeView *cube;
- Fl_Value_Slider *zoom;
+ fltk3::ValueSlider *zoom;
private:
- void cb_zoom_i(Fl_Value_Slider*, void*);
- static void cb_zoom(Fl_Value_Slider*, void*);
+ void cb_zoom_i(fltk3::ValueSlider*, void*);
+ static void cb_zoom(fltk3::ValueSlider*, void*);
public:
void show(int argc, char **argv);
};
_______________________________________________
fltk-commit mailing list
[email protected]
http://lists.easysw.com/mailman/listinfo/fltk-commit
