From 386c2413f8bb48d46e57275128becf9814da5a1e Mon Sep 17 00:00:00 2001 From: Albrecht Schlosser Date: Sun, 5 Oct 2014 11:28:29 +0000 Subject: 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 --- FL/Fl_File_Chooser.H | 45 ++++++++++++++++++++++++++------------------- 1 file changed, 26 insertions(+), 19 deletions(-) (limited to 'FL/Fl_File_Chooser.H') 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(); -- cgit v1.2.3