More 1.3.3 version updates and changes in src/*.fl.

There had been manual changes in fluid-generated files, so the .fl files
had to be adjusted and updated to fltk 1.3.3.

Note that fluid SHOULD generate 'const' data for embedded images, but
doesn't yet, so I had to re-edit src/Fl_File_Chooser.cxx to keep the
previous 'const' changes in this file.


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10357 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Albrecht Schlosser 2014-10-05 11:28:29 +00:00
parent b60e474bc3
commit 386c2413f8
6 changed files with 184 additions and 119 deletions

View File

@ -3,7 +3,7 @@
//
// Fl_File_Chooser dialog for the Fast Light Tool Kit (FLTK).
//
// Copyright 1998-2011 by Bill Spitzak and others.
// Copyright 1998-2014 by Bill Spitzak and others.
//
// This library is free software. Distribution and use rights are outlined in
// the file "COPYING" which should have been included with this file. If this
@ -15,8 +15,15 @@
//
// http://www.fltk.org/str.php
//
// ========================================================================
// DO NOT EDIT FL/Fl_File_Chooser.H and src/Fl_File_Chooser.cxx !!!
// ========================================================================
// Please use fluid to change src/Fl_File_Chooser.fl interactively
// and then use fluid to "write code" or edit and use fluid -c .
// ========================================================================
//
// generated by Fast Light User Interface Designer (fluid) version 1.0300
// generated by Fast Light User Interface Designer (fluid) version 1.0303
#ifndef Fl_File_Chooser_H
#define Fl_File_Chooser_H
@ -62,62 +69,62 @@ public:
Fl_File_Chooser(const char *d, const char *p, int t, const char *title);
private:
Fl_Double_Window *window;
void cb_window_i(Fl_Double_Window*, void*);
inline void cb_window_i(Fl_Double_Window*, void*);
static void cb_window(Fl_Double_Window*, void*);
Fl_Choice *showChoice;
void cb_showChoice_i(Fl_Choice*, void*);
inline void cb_showChoice_i(Fl_Choice*, void*);
static void cb_showChoice(Fl_Choice*, void*);
Fl_Menu_Button *favoritesButton;
void cb_favoritesButton_i(Fl_Menu_Button*, void*);
inline void cb_favoritesButton_i(Fl_Menu_Button*, void*);
static void cb_favoritesButton(Fl_Menu_Button*, void*);
public:
Fl_Button *newButton;
private:
void cb_newButton_i(Fl_Button*, void*);
inline void cb_newButton_i(Fl_Button*, void*);
static void cb_newButton(Fl_Button*, void*);
void cb__i(Fl_Tile*, void*);
inline void cb__i(Fl_Tile*, void*);
static void cb_(Fl_Tile*, void*);
Fl_File_Browser *fileList;
void cb_fileList_i(Fl_File_Browser*, void*);
inline void cb_fileList_i(Fl_File_Browser*, void*);
static void cb_fileList(Fl_File_Browser*, void*);
Fl_Box *previewBox;
public:
Fl_Check_Button *previewButton;
private:
void cb_previewButton_i(Fl_Check_Button*, void*);
inline void cb_previewButton_i(Fl_Check_Button*, void*);
static void cb_previewButton(Fl_Check_Button*, void*);
public:
Fl_Check_Button *showHiddenButton;
private:
void cb_showHiddenButton_i(Fl_Check_Button*, void*);
inline void cb_showHiddenButton_i(Fl_Check_Button*, void*);
static void cb_showHiddenButton(Fl_Check_Button*, void*);
Fl_File_Input *fileName;
void cb_fileName_i(Fl_File_Input*, void*);
inline void cb_fileName_i(Fl_File_Input*, void*);
static void cb_fileName(Fl_File_Input*, void*);
Fl_Return_Button *okButton;
void cb_okButton_i(Fl_Return_Button*, void*);
inline void cb_okButton_i(Fl_Return_Button*, void*);
static void cb_okButton(Fl_Return_Button*, void*);
Fl_Button *cancelButton;
void cb_cancelButton_i(Fl_Button*, void*);
inline void cb_cancelButton_i(Fl_Button*, void*);
static void cb_cancelButton(Fl_Button*, void*);
Fl_Double_Window *favWindow;
Fl_File_Browser *favList;
void cb_favList_i(Fl_File_Browser*, void*);
inline void cb_favList_i(Fl_File_Browser*, void*);
static void cb_favList(Fl_File_Browser*, void*);
Fl_Button *favUpButton;
void cb_favUpButton_i(Fl_Button*, void*);
inline void cb_favUpButton_i(Fl_Button*, void*);
static void cb_favUpButton(Fl_Button*, void*);
Fl_Button *favDeleteButton;
void cb_favDeleteButton_i(Fl_Button*, void*);
inline void cb_favDeleteButton_i(Fl_Button*, void*);
static void cb_favDeleteButton(Fl_Button*, void*);
Fl_Button *favDownButton;
void cb_favDownButton_i(Fl_Button*, void*);
inline void cb_favDownButton_i(Fl_Button*, void*);
static void cb_favDownButton(Fl_Button*, void*);
Fl_Button *favCancelButton;
void cb_favCancelButton_i(Fl_Button*, void*);
inline void cb_favCancelButton_i(Fl_Button*, void*);
static void cb_favCancelButton(Fl_Button*, void*);
Fl_Return_Button *favOkButton;
void cb_favOkButton_i(Fl_Return_Button*, void*);
inline void cb_favOkButton_i(Fl_Return_Button*, void*);
static void cb_favOkButton(Fl_Return_Button*, void*);
public:
~Fl_File_Chooser();

View File

@ -3,7 +3,7 @@
//
// Fl_Help_Dialog dialog for the Fast Light Tool Kit (FLTK).
//
// Copyright 1998-2010 by Bill Spitzak and others.
// Copyright 1998-2014 by Bill Spitzak and others.
//
// This library is free software. Distribution and use rights are outlined in
// the file "COPYING" which should have been included with this file. If this
@ -15,11 +15,15 @@
//
// http://www.fltk.org/str.php
//
// ========================================================================
// DO NOT EDIT FL/Fl_Help_Dialog.H and src/Fl_Help_Dialog.cxx !!!
// ========================================================================
// Please use fluid to change src/Fl_Help_Dialog.fl interactively
// and then use fluid to "write code" or edit and use fluid -c .
// ========================================================================
//
/* \file
Fl_Help_Dialog widget . */
// generated by Fast Light User Interface Designer (fluid) version 1.0108
// generated by Fast Light User Interface Designer (fluid) version 1.0303
#ifndef Fl_Help_Dialog_H
#define Fl_Help_Dialog_H
@ -34,30 +38,30 @@
class FL_EXPORT Fl_Help_Dialog {
int index_;
int max_;
int line_[100]; // FIXME: we must remove those static numbers
char file_[100][FL_PATH_MAX]; // FIXME: we must remove those static numbers
int line_[100]; // FIXME: we must remove those static numbers
char file_[100][FL_PATH_MAX]; // FIXME: we must remove those static numbers
int find_pos_;
public:
Fl_Help_Dialog();
private:
Fl_Double_Window *window_;
Fl_Button *back_;
void cb_back__i(Fl_Button*, void*);
inline void cb_back__i(Fl_Button*, void*);
static void cb_back_(Fl_Button*, void*);
Fl_Button *forward_;
void cb_forward__i(Fl_Button*, void*);
inline void cb_forward__i(Fl_Button*, void*);
static void cb_forward_(Fl_Button*, void*);
Fl_Button *smaller_;
void cb_smaller__i(Fl_Button*, void*);
inline void cb_smaller__i(Fl_Button*, void*);
static void cb_smaller_(Fl_Button*, void*);
Fl_Button *larger_;
void cb_larger__i(Fl_Button*, void*);
inline void cb_larger__i(Fl_Button*, void*);
static void cb_larger_(Fl_Button*, void*);
Fl_Input *find_;
void cb_find__i(Fl_Input*, void*);
inline void cb_find__i(Fl_Input*, void*);
static void cb_find_(Fl_Input*, void*);
Fl_Help_View *view_;
void cb_view__i(Fl_Help_View*, void*);
inline void cb_view__i(Fl_Help_View*, void*);
static void cb_view_(Fl_Help_View*, void*);
public:
~Fl_Help_Dialog();

View File

@ -3,7 +3,7 @@
//
// Fl_File_Chooser dialog for the Fast Light Tool Kit (FLTK).
//
// Copyright 1998-2011 by Bill Spitzak and others.
// Copyright 1998-2014 by Bill Spitzak and others.
//
// This library is free software. Distribution and use rights are outlined in
// the file "COPYING" which should have been included with this file. If this
@ -15,8 +15,15 @@
//
// http://www.fltk.org/str.php
//
// ========================================================================
// DO NOT EDIT FL/Fl_File_Chooser.H and src/Fl_File_Chooser.cxx !!!
// ========================================================================
// Please use fluid to change src/Fl_File_Chooser.fl interactively
// and then use fluid to "write code" or edit and use fluid -c .
// ========================================================================
//
// generated by Fast Light User Interface Designer (fluid) version 1.0300
// generated by Fast Light User Interface Designer (fluid) version 1.0303
#include "../FL/Fl_File_Chooser.H"
#include <FL/fl_draw.H>
@ -53,6 +60,7 @@ void Fl_File_Chooser::cb_newButton(Fl_Button* o, void* v) {
}
#include <FL/Fl_Bitmap.H>
// FIXME: fluid does NOT (yet?) generate 'const' image data !
static const unsigned char idata_new[] =
{0,0,120,0,132,0,2,1,1,254,1,128,49,128,49,128,253,128,253,128,49,128,49,
128,1,128,1,128,255,255,0,0};

View File

@ -1,5 +1,5 @@
# data file for the Fltk User Interface Designer (fluid)
version 1.0300
version 1.0303
header_name {../FL/Fl_File_Chooser.H}
code_name {.cxx}
comment {//
@ -7,7 +7,7 @@ comment {//
//
// Fl_File_Chooser dialog for the Fast Light Tool Kit (FLTK).
//
// Copyright 1998-2011 by Bill Spitzak and others.
// Copyright 1998-2014 by Bill Spitzak and others.
//
// This library is free software. Distribution and use rights are outlined in
// the file "COPYING" which should have been included with this file. If this
@ -19,31 +19,55 @@ comment {//
//
// http://www.fltk.org/str.php
//
// ========================================================================
// DO NOT EDIT FL/Fl_File_Chooser.H and src/Fl_File_Chooser.cxx !!!
// ========================================================================
// Please use fluid to change src/Fl_File_Chooser.fl interactively
// and then use fluid to "write code" or edit and use fluid -c .
// ========================================================================
//
} {in_source in_header
}
decl {\#include <FL/fl_draw.H>} {}
decl {\#include <FL/fl_draw.H>} {private local
}
class FL_EXPORT Fl_File_Chooser {open
} {
decl {enum { SINGLE = 0, MULTI = 1, CREATE = 2, DIRECTORY = 4 };} {public
decl {enum { SINGLE = 0, MULTI = 1, CREATE = 2, DIRECTORY = 4 };} {public local
}
decl {static Fl_Preferences prefs_;} {private local
}
decl {void (*callback_)(Fl_File_Chooser*, void *);} {private local
}
decl {void *data_;} {private local
}
decl {char directory_[FL_PATH_MAX];} {private local
}
decl {char pattern_[FL_PATH_MAX];} {private local
}
decl {char preview_text_[2048];} {private local
}
decl {int type_;} {private local
}
decl {void favoritesButtonCB();} {private local
}
decl {void favoritesCB(Fl_Widget *w);} {private local
}
decl {void fileListCB();} {private local
}
decl {void fileNameCB();} {private local
}
decl {void newdir();} {private local
}
decl {static void previewCB(Fl_File_Chooser *fc);} {private local
}
decl {void showChoiceCB();} {private local
}
decl {void update_favorites();} {private local
}
decl {void update_preview();} {private local
}
decl {static Fl_Preferences prefs_;} {}
decl {void (*callback_)(Fl_File_Chooser*, void *);} {}
decl {void *data_;} {}
decl {char directory_[FL_PATH_MAX];} {}
decl {char pattern_[FL_PATH_MAX];} {}
decl {char preview_text_[2048];} {}
decl {int type_;} {}
decl {void favoritesButtonCB();} {}
decl {void favoritesCB(Fl_Widget *w);} {}
decl {void fileListCB();} {}
decl {void fileNameCB();} {}
decl {void newdir();} {}
decl {static void previewCB(Fl_File_Chooser *fc);} {}
decl {void showChoiceCB();} {}
decl {void update_favorites();} {}
decl {void update_preview();} {}
Function {Fl_File_Chooser(const char *d, const char *p, int t, const char *title)} {} {
code {Fl_Group *prev_current = Fl_Group::current();} {}
Fl_Window window {
@ -119,7 +143,7 @@ window->hide();} open
Fl_File_Input fileName {
callback {fileNameCB();}
private xywh {115 300 365 35} labelfont 1 when 8 resizable
code0 {fileName->when(FL_WHEN_CHANGED | FL_WHEN_ENTER_KEY);}
code0 {fileName->when(FL_WHEN_CHANGED | FL_WHEN_ENTER_KEY_ALWAYS);}
}
Fl_Box {} {
label {Filename:}
@ -238,15 +262,15 @@ data_ = d;} {}
} {
code {return (fileList->color());} {}
}
decl {int count();} {public
decl {int count();} {public local
}
decl {void directory(const char *d);} {public
decl {void directory(const char *d);} {public local
}
Function {directory()} {return_type {char *}
} {
code {return directory_;} {}
}
decl {void filter(const char *p);} {public
decl {void filter(const char *p);} {public local
}
Function {filter()} {return_type {const char *}
} {
@ -294,19 +318,19 @@ okButton->parent()->init_sizes();} {}
} {
code {return (okButton->label());} {}
}
decl {void preview(int e);} {public
decl {void preview(int e);} {public local
}
decl {int preview() const { return previewButton->value(); }} {public
decl {int preview() const { return previewButton->value(); }} {public local
}
decl {void showHidden(int e);} {private
decl {void showHidden(int e);} {private local
}
decl {void remove_hidden_files();} {private
decl {void remove_hidden_files();} {private local
}
decl {void rescan();} {public
decl {void rescan();} {public local
}
decl {void rescan_keep_filename();} {public
decl {void rescan_keep_filename();} {public local
}
decl {void show();} {public
decl {void show();} {public local
}
Function {shown()} {return_type int
} {
@ -364,61 +388,62 @@ else
} {
code {data_ = d;} {}
}
decl {const char *value(int f = 1);} {public
decl {const char *value(int f = 1);} {public local
}
decl {void value(const char *filename);} {public
decl {void value(const char *filename);} {public local
}
Function {visible()} {return_type int
} {
code {return window->visible();} {}
}
decl {static const char *add_favorites_label;} {
comment {[standard text may be customized at run-time]} public
comment {[standard text may be customized at run-time]} public local
}
decl {static const char *all_files_label;} {
comment {[standard text may be customized at run-time]} public
comment {[standard text may be customized at run-time]} public local
}
decl {static const char *custom_filter_label;} {
comment {[standard text may be customized at run-time]} public
comment {[standard text may be customized at run-time]} public local
}
decl {static const char *existing_file_label;} {
comment {[standard text may be customized at run-time]} public
comment {[standard text may be customized at run-time]} public local
}
decl {static const char *favorites_label;} {
comment {[standard text may be customized at run-time]} public
comment {[standard text may be customized at run-time]} public local
}
decl {static const char *filename_label;} {
comment {[standard text may be customized at run-time]} public
comment {[standard text may be customized at run-time]} public local
}
decl {static const char *filesystems_label;} {
comment {[standard text may be customized at run-time]} public
comment {[standard text may be customized at run-time]} public local
}
decl {static const char *manage_favorites_label;} {
comment {[standard text may be customized at run-time]} public
comment {[standard text may be customized at run-time]} public local
}
decl {static const char *new_directory_label;} {
comment {[standard text may be customized at run-time]} public
comment {[standard text may be customized at run-time]} public local
}
decl {static const char *new_directory_tooltip;} {
comment {[standard text may be customized at run-time]} public
comment {[standard text may be customized at run-time]} public local
}
decl {static const char *preview_label;} {
comment {[standard text may be customized at run-time]} public
comment {[standard text may be customized at run-time]} public local
}
decl {static const char *save_label;} {
comment {[standard text may be customized at run-time]} public
comment {[standard text may be customized at run-time]} public local
}
decl {static const char *show_label;} {
comment {[standard text may be customized at run-time]} public
comment {[standard text may be customized at run-time]} public local
}
decl {static const char *hidden_label;} {
comment {[standard text may be customized at run-time]} public
comment {[standard text may be customized at run-time]} public local
}
decl {static Fl_File_Sort_F *sort;} {
comment {the sort function that is used when loading
the contents of a directory.} public
the contents of a directory.} public local
}
decl {Fl_Widget* ext_group;} {private local
}
decl {Fl_Widget* ext_group;} {}
Function {add_extra(Fl_Widget* gr)} {open return_type {Fl_Widget*}
} {
code {Fl_Widget* ret=ext_group;} {}
@ -451,16 +476,16 @@ window->resizable(svres);} {}
}
}
decl {FL_EXPORT char *fl_dir_chooser(const char *message,const char *fname,int relative=0);} {public
decl {FL_EXPORT char *fl_dir_chooser(const char *message,const char *fname,int relative=0);} {public local
}
decl {FL_EXPORT char *fl_file_chooser(const char *message,const char *pat,const char *fname,int relative=0);} {public
decl {FL_EXPORT char *fl_file_chooser(const char *message,const char *pat,const char *fname,int relative=0);} {public local
}
decl {FL_EXPORT void fl_file_chooser_callback(void (*cb)(const char*));} {public
decl {FL_EXPORT void fl_file_chooser_callback(void (*cb)(const char*));} {public local
}
decl {FL_EXPORT void fl_file_chooser_ok_label(const char*l);} {public
decl {FL_EXPORT void fl_file_chooser_ok_label(const char*l);} {public local
}
comment {

View File

@ -3,7 +3,7 @@
//
// Fl_Help_Dialog dialog for the Fast Light Tool Kit (FLTK).
//
// Copyright 1998-2010 by Bill Spitzak and others.
// Copyright 1998-2014 by Bill Spitzak and others.
//
// This library is free software. Distribution and use rights are outlined in
// the file "COPYING" which should have been included with this file. If this
@ -15,8 +15,15 @@
//
// http://www.fltk.org/str.php
//
// ========================================================================
// DO NOT EDIT FL/Fl_Help_Dialog.H and src/Fl_Help_Dialog.cxx !!!
// ========================================================================
// Please use fluid to change src/Fl_Help_Dialog.fl interactively
// and then use fluid to "write code" or edit and use fluid -c .
// ========================================================================
//
// generated by Fast Light User Interface Designer (fluid) version 1.0108
// generated by Fast Light User Interface Designer (fluid) version 1.0303
#include "../FL/Fl_Help_Dialog.H"
#include "flstring.h"
@ -192,13 +199,13 @@ Fl_Help_Dialog::Fl_Help_Dialog() {
window_->end();
} // Fl_Double_Window* window_
back_->deactivate();
forward_->deactivate();
index_ = -1;
max_ = 0;
find_pos_ = 0;
fl_register_images();
forward_->deactivate();
index_ = -1;
max_ = 0;
find_pos_ = 0;
fl_register_images();
}
Fl_Help_Dialog::~Fl_Help_Dialog() {
@ -215,8 +222,8 @@ void Fl_Help_Dialog::hide() {
void Fl_Help_Dialog::load(const char *f) {
view_->set_changed();
view_->load(f);
window_->label(view_->title());
view_->load(f);
window_->label(view_->title());
}
void Fl_Help_Dialog::position(int xx, int yy) {
@ -237,16 +244,16 @@ void Fl_Help_Dialog::show(int argc, char **argv) {
void Fl_Help_Dialog::textsize(Fl_Fontsize s) {
view_->textsize(s);
if (s <= 8)
smaller_->deactivate();
else
smaller_->activate();
if (s >= 18)
larger_->deactivate();
else
larger_->activate();
if (s <= 8)
smaller_->deactivate();
else
smaller_->activate();
if (s >= 18)
larger_->deactivate();
else
larger_->activate();
}
Fl_Fontsize Fl_Help_Dialog::textsize() {
@ -263,8 +270,8 @@ void Fl_Help_Dialog::topline(int n) {
void Fl_Help_Dialog::value(const char *f) {
view_->set_changed();
view_->value(f);
window_->label(view_->title());
view_->value(f);
window_->label(view_->title());
}
const char * Fl_Help_Dialog::value() const {

View File

@ -1,5 +1,5 @@
# data file for the Fltk User Interface Designer (fluid)
version 1.0108
version 1.0303
header_name {../FL/Fl_Help_Dialog.H}
code_name {.cxx}
comment {//
@ -7,7 +7,7 @@ comment {//
//
// Fl_Help_Dialog dialog for the Fast Light Tool Kit (FLTK).
//
// Copyright 1998-2010 by Bill Spitzak and others.
// Copyright 1998-2014 by Bill Spitzak and others.
//
// This library is free software. Distribution and use rights are outlined in
// the file "COPYING" which should have been included with this file. If this
@ -19,20 +19,34 @@ comment {//
//
// http://www.fltk.org/str.php
//
// ========================================================================
// DO NOT EDIT FL/Fl_Help_Dialog.H and src/Fl_Help_Dialog.cxx !!!
// ========================================================================
// Please use fluid to change src/Fl_Help_Dialog.fl interactively
// and then use fluid to "write code" or edit and use fluid -c .
// ========================================================================
//
} {in_source in_header
}
decl {\#include "flstring.h"} {}
decl {\#include "flstring.h"} {private local
}
decl {\#include <FL/fl_ask.H>} {}
decl {\#include <FL/fl_ask.H>} {private local
}
class FL_EXPORT Fl_Help_Dialog {open
} {
decl {int index_;} {}
decl {int max_;} {}
decl {int line_[100];} {}
decl {char file_[100][256];} {}
decl {int find_pos_;} {}
decl {int index_;} {private local
}
decl {int max_;} {private local
}
decl {int line_[100]; // FIXME: we must remove those static numbers} {private local
}
decl {char file_[100][FL_PATH_MAX]; // FIXME: we must remove those static numbers} {private local
}
decl {int find_pos_;} {private local
}
Function {Fl_Help_Dialog()} {open
} {
Fl_Window window_ {