diff options
| author | Albrecht Schlosser <albrechts.fltk@online.de> | 2014-10-05 11:28:29 +0000 |
|---|---|---|
| committer | Albrecht Schlosser <albrechts.fltk@online.de> | 2014-10-05 11:28:29 +0000 |
| commit | 386c2413f8bb48d46e57275128becf9814da5a1e (patch) | |
| tree | c3daf98840c8a115a4e45fc7aea826bd90dec8ab /FL | |
| parent | b60e474bc3c745cb85f02aaebe109c346d4831ef (diff) | |
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
Diffstat (limited to 'FL')
| -rw-r--r-- | FL/Fl_File_Chooser.H | 45 | ||||
| -rw-r--r-- | FL/Fl_Help_Dialog.H | 30 |
2 files changed, 43 insertions, 32 deletions
diff --git a/FL/Fl_File_Chooser.H b/FL/Fl_File_Chooser.H index a4baa08ba..f55b19437 100644 --- a/FL/Fl_File_Chooser.H +++ b/FL/Fl_File_Chooser.H @@ -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(); diff --git a/FL/Fl_Help_Dialog.H b/FL/Fl_Help_Dialog.H index 677822dda..9614970ce 100644 --- a/FL/Fl_Help_Dialog.H +++ b/FL/Fl_Help_Dialog.H @@ -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(); |
