summaryrefslogtreecommitdiff
path: root/fluid
diff options
context:
space:
mode:
authorMichael R Sweet <michael.r.sweet@gmail.com>2001-09-29 14:38:59 +0000
committerMichael R Sweet <michael.r.sweet@gmail.com>2001-09-29 14:38:59 +0000
commit6a4714ce12d546c8131389853fe5593555c73b77 (patch)
tree158726de167a805d6aaa325f8250b89bf3a2db08 /fluid
parentde6c7f66eeaeeae52ca33221db885ae6cd7ea114 (diff)
Fl_FileXYZ -> Fl_File_XYZ
Fl_HelpXYZ -> Fl_Help_XYZ Fl_File_Chooser now supports directory choosing. Added fl_dir_chooser() function. Now set FLTK_DOCDIR env var in test/demo. git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@1612 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'fluid')
-rw-r--r--fluid/factory.cxx48
-rw-r--r--fluid/fluid.cxx10
-rw-r--r--fluid/makedepend33
3 files changed, 44 insertions, 47 deletions
diff --git a/fluid/factory.cxx b/fluid/factory.cxx
index 4456c744d..181a626d4 100644
--- a/fluid/factory.cxx
+++ b/fluid/factory.cxx
@@ -1,5 +1,5 @@
//
-// "$Id: factory.cxx,v 1.4.2.11.2.1 2001/08/11 16:09:26 easysw Exp $"
+// "$Id: factory.cxx,v 1.4.2.11.2.2 2001/09/29 14:38:59 easysw Exp $"
//
// Widget factory code for the Fast Light Tool Kit (FLTK).
//
@@ -174,7 +174,7 @@ extern int compile_only;
#include <FL/Fl_Browser.H>
#include <FL/Fl_Check_Browser.H>
-#include <FL/Fl_FileBrowser.H>
+#include <FL/Fl_File_Browser.H>
static Fl_Menu_Item browser_type_menu[] = {
{"No Select",0,0,(void*)FL_NORMAL_BROWSER},
@@ -250,30 +250,26 @@ int Fl_Check_Browser_Type::textstuff(int w, Fl_Font& f, int& s, Fl_Color& c) {
return 1;
}
-class Fl_FileBrowser_Type : public Fl_Widget_Type {
+class Fl_File_Browser_Type : public Fl_Widget_Type {
Fl_Menu_Item *subtypes() {return browser_type_menu;}
int textstuff(int w, Fl_Font& f, int& s, Fl_Color& c);
public:
- virtual const char *type_name() {return "Fl_FileBrowser";}
+ virtual const char *type_name() {return "Fl_File_Browser";}
Fl_Widget *widget(int x,int y,int w,int h) {
- Fl_FileBrowser* b = new Fl_FileBrowser(x,y,w,h);
- // Fl_FileBrowser::add calls fl_height(), which requires the X display open.
+ Fl_File_Browser* b = new Fl_File_Browser(x,y,w,h);
+ // Fl_File_Browser::add calls fl_height(), which requires the X display open.
// Avoid this when compiling so it works w/o a display:
if (!compile_only) {
- char buffer[20];
- for (int i = 1; i <= 20; i++) {
- sprintf(buffer,"Browser Line %d",i);
- b->add(buffer);
- }
+ b->load(".");
}
return b;
}
- Fl_Widget_Type *_make() {return new Fl_FileBrowser_Type();}
+ Fl_Widget_Type *_make() {return new Fl_File_Browser_Type();}
};
-static Fl_FileBrowser_Type Fl_FileBrowser_type;
+static Fl_File_Browser_Type Fl_File_Browser_type;
-int Fl_FileBrowser_Type::textstuff(int w, Fl_Font& f, int& s, Fl_Color& c) {
- Fl_FileBrowser *myo = (Fl_FileBrowser*)(w==4 ? ((Fl_Widget_Type*)factory)->o : o);
+int Fl_File_Browser_Type::textstuff(int w, Fl_Font& f, int& s, Fl_Color& c) {
+ Fl_File_Browser *myo = (Fl_File_Browser*)(w==4 ? ((Fl_Widget_Type*)factory)->o : o);
switch (w) {
case 4:
case 0: f = myo->textfont(); s = myo->textsize(); c = myo->textcolor(); break;
@@ -419,18 +415,18 @@ static Fl_Clock_Type Fl_Clock_type;
////////////////////////////////////////////////////////////////
-#include <FL/Fl_HelpView.H>
-class Fl_HelpView_Type : public Fl_Widget_Type {
+#include <FL/Fl_Help_View.H>
+class Fl_Help_View_Type : public Fl_Widget_Type {
public:
- virtual const char *type_name() {return "Fl_HelpView";}
+ virtual const char *type_name() {return "Fl_Help_View";}
Fl_Widget *widget(int x,int y,int w,int h) {
- Fl_HelpView *myo = new Fl_HelpView(x,y,w,h);
- myo->value("<HTML><BODY><H1>Fl_HelpView Widget</H1>"
- "<P>This is a Fl_HelpView widget.</P></BODY></HTML>");
+ Fl_Help_View *myo = new Fl_Help_View(x,y,w,h);
+ myo->value("<HTML><BODY><H1>Fl_Help_View Widget</H1>"
+ "<P>This is a Fl_Help_View widget.</P></BODY></HTML>");
return myo;}
- Fl_Widget_Type *_make() {return new Fl_HelpView_Type();}
+ Fl_Widget_Type *_make() {return new Fl_Help_View_Type();}
};
-static Fl_HelpView_Type Fl_HelpView_type;
+static Fl_Help_View_Type Fl_Help_View_type;
////////////////////////////////////////////////////////////////
@@ -715,12 +711,12 @@ Fl_Menu_Item New_Menu[] = {
{"browsers",0,0,0,FL_SUBMENU},
{0,0,cb,(void*)&Fl_Browser_type},
{0,0,cb,(void*)&Fl_Check_Browser_type},
- {0,0,cb,(void*)&Fl_FileBrowser_type},
+ {0,0,cb,(void*)&Fl_File_Browser_type},
{0},
{"other",0,0,0,FL_SUBMENU},
{0,0,cb,(void*)&Fl_Box_type},
{0,0,cb,(void*)&Fl_Clock_type},
- {0,0,cb,(void*)&Fl_HelpView_type},
+ {0,0,cb,(void*)&Fl_Help_View_type},
{0,0,cb,(void*)&Fl_Progress_type},
{0},
{0}};
@@ -891,5 +887,5 @@ int lookup_symbol(const char *name, int &v, int numberok) {
}
//
-// End of "$Id: factory.cxx,v 1.4.2.11.2.1 2001/08/11 16:09:26 easysw Exp $".
+// End of "$Id: factory.cxx,v 1.4.2.11.2.2 2001/09/29 14:38:59 easysw Exp $".
//
diff --git a/fluid/fluid.cxx b/fluid/fluid.cxx
index 6f053f9f9..d8cd82cc9 100644
--- a/fluid/fluid.cxx
+++ b/fluid/fluid.cxx
@@ -1,5 +1,5 @@
//
-// "$Id: fluid.cxx,v 1.15.2.13.2.5 2001/09/23 13:08:02 easysw Exp $"
+// "$Id: fluid.cxx,v 1.15.2.13.2.6 2001/09/29 14:38:59 easysw Exp $"
//
// FLUID main entry for the Fast Light Tool Kit (FLTK).
//
@@ -48,7 +48,7 @@ const char *copyright =
#include <FL/Fl_Double_Window.H>
#include <FL/Fl_Box.H>
#include <FL/Fl_Button.H>
-#include <FL/Fl_HelpDialog.H>
+#include <FL/Fl_Help_Dialog.H>
#include <FL/Fl_Hold_Browser.H>
#include <FL/Fl_Menu_Bar.H>
#include <FL/Fl_Input.H>
@@ -81,7 +81,7 @@ extern int snprintf(char* str, size_t size, const char* fmt, ...);
#include "Fl_Type.h"
-static Fl_HelpDialog *help_dialog = 0;
+static Fl_Help_Dialog *help_dialog = 0;
////////////////////////////////////////////////////////////////
@@ -350,7 +350,7 @@ void show_help(const char *name) {
const char *docdir;
char filename[1024];
- if (!help_dialog) help_dialog = new Fl_HelpDialog();
+ if (!help_dialog) help_dialog = new Fl_Help_Dialog();
if ((docdir = getenv("FLTK_DOCDIR")) == NULL)
docdir = FLTK_DOCDIR;
@@ -518,5 +518,5 @@ int main(int argc,char **argv) {
}
//
-// End of "$Id: fluid.cxx,v 1.15.2.13.2.5 2001/09/23 13:08:02 easysw Exp $".
+// End of "$Id: fluid.cxx,v 1.15.2.13.2.6 2001/09/29 14:38:59 easysw Exp $".
//
diff --git a/fluid/makedepend b/fluid/makedepend
index ca3b5e71c..a39e1cce6 100644
--- a/fluid/makedepend
+++ b/fluid/makedepend
@@ -91,11 +91,11 @@ factory.o: ../FL/Fl_Repeat_Button.H ../FL/Fl.H ../FL/Fl_Light_Button.H
factory.o: ../FL/Fl_Check_Button.H ../FL/Fl_Light_Button.H
factory.o: ../FL/Fl_Round_Button.H ../FL/Fl_Browser.H ../FL/Fl_Browser_.H
factory.o: ../FL/Fl_Scrollbar.H ../FL/Fl_Slider.H ../FL/Fl_Valuator.H
-factory.o: ../FL/Fl_Check_Browser.H ../FL/Fl_FileBrowser.H ../FL/Fl_Browser.H
-factory.o: ../FL/Fl_FileIcon.H ../FL/Fl_Counter.H ../FL/Fl_Input.H
-factory.o: ../FL/Fl_Input_.H ../FL/Fl_Text_Display.H ../FL/fl_draw.H
-factory.o: ../FL/Fl_Text_Buffer.H ../FL/Fl_Text_Editor.H
-factory.o: ../FL/Fl_Text_Display.H ../FL/Fl_Clock.H ../FL/Fl_HelpView.H
+factory.o: ../FL/Fl_Check_Browser.H ../FL/Fl_File_Browser.H
+factory.o: ../FL/Fl_Browser.H ../FL/Fl_File_Icon.H ../FL/Fl_Counter.H
+factory.o: ../FL/Fl_Input.H ../FL/Fl_Input_.H ../FL/Fl_Text_Display.H
+factory.o: ../FL/fl_draw.H ../FL/Fl_Text_Buffer.H ../FL/Fl_Text_Editor.H
+factory.o: ../FL/Fl_Text_Display.H ../FL/Fl_Clock.H ../FL/Fl_Help_View.H
factory.o: ../FL/Fl_Scrollbar.H ../FL/fl_draw.H ../FL/Fl_Progress.H
factory.o: ../FL/Fl_Adjuster.H ../FL/Fl_Dial.H ../FL/Fl_Roller.H
factory.o: ../FL/Fl_Output.H ../FL/Fl_Value_Input.H ../FL/Fl_Input.H
@@ -110,13 +110,13 @@ file.o: ../FL/Fl_Tabs.H ../FL/Fl_Pack.H ../FL/Fl_Group.H ../FL/Fl_Wizard.H
file.o: ../FL/Fl_Menu_.H ../FL/Fl_Menu_Button.H ../FL/Fl_Menu_Bar.H
fluid.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H
fluid.o: ../FL/Fl_Double_Window.H ../FL/Fl_Window.H ../FL/Fl_Group.H
-fluid.o: ../FL/Fl_Box.H ../FL/Fl_Button.H ../FL/Fl_HelpDialog.H
-fluid.o: ../FL/Fl_Window.H ../FL/Fl_HelpView.H ../FL/Fl_Group.H
-fluid.o: ../FL/Fl_Scrollbar.H ../FL/fl_draw.H ../FL/Fl_Hold_Browser.H
-fluid.o: ../FL/Fl_Browser.H ../FL/Fl_Menu_Bar.H ../FL/Fl_Menu_.H
-fluid.o: ../FL/Fl_Input.H ../FL/Fl_Input_.H ../FL/fl_ask.H
-fluid.o: ../FL/fl_file_chooser.H ../FL/fl_message.H ../FL/fl_ask.H
-fluid.o: ../FL/filename.H ../config.h about_panel.h ../FL/Fl_Return_Button.H
+fluid.o: ../FL/Fl_Box.H ../FL/Fl_Button.H ../FL/Fl_Help_Dialog.H
+fluid.o: ../FL/Fl_Help_View.H ../FL/Fl_Group.H ../FL/Fl_Scrollbar.H
+fluid.o: ../FL/fl_draw.H ../FL/Fl_Hold_Browser.H ../FL/Fl_Browser.H
+fluid.o: ../FL/Fl_Menu_Bar.H ../FL/Fl_Menu_.H ../FL/Fl_Input.H
+fluid.o: ../FL/Fl_Input_.H ../FL/fl_ask.H ../FL/fl_file_chooser.H
+fluid.o: ../FL/fl_message.H ../FL/fl_ask.H ../FL/filename.H ../config.h
+fluid.o: about_panel.h ../FL/Fl_Window.H ../FL/Fl_Return_Button.H
fluid.o: ../FL/Fl_Button.H Fl_Type.h ../FL/Fl_Widget.H ../FL/Fl_Menu.H
fluid.o: ../FL/Fl_Menu_Item.H Fluid_Image.h ../FL/Fl_Tabs.H ../FL/Fl_Pack.H
fluid.o: ../FL/Fl_Wizard.H ../FL/Fl_Menu_.H ../FL/Fl_Menu_Button.H
@@ -127,11 +127,12 @@ about_panel.o: ../FL/Fl_Group.H ../FL/Fl_Box.H ../FL/Fl_Button.H
about_panel.o: ../FL/Fl_Return_Button.H ../FL/Fl_Button.H
widget_panel.o: widget_panel.h ../FL/Fl.H ../FL/Enumerations.H
widget_panel.o: ../FL/Fl_Export.H ../FL/Fl_Window.H ../FL/Fl_Group.H
-widget_panel.o: ../FL/Fl_Input.H ../FL/Fl_Input_.H ../FL/Fl_Light_Button.H
-widget_panel.o: ../FL/Fl_Button.H ../FL/Fl_Choice.H ../FL/Fl_Menu_.H
+widget_panel.o: ../FL/Fl_Tabs.H ../FL/Fl_Group.H ../FL/Fl_Input.H
+widget_panel.o: ../FL/Fl_Input_.H ../FL/Fl_Choice.H ../FL/Fl_Menu_.H
widget_panel.o: ../FL/Fl_Button.H ../FL/Fl_Value_Input.H ../FL/Fl_Valuator.H
-widget_panel.o: ../FL/Fl_Input.H Shortcut_Button.h ../FL/Fl_Group.H
-widget_panel.o: ../FL/Fl_Box.H ../FL/Fl_Return_Button.H
+widget_panel.o: ../FL/Fl_Input.H ../FL/Fl_Box.H Shortcut_Button.h
+widget_panel.o: ../FL/Fl_Light_Button.H ../FL/Fl_Button.H
+widget_panel.o: ../FL/Fl_Return_Button.H
alignment_panel.o: alignment_panel.h ../FL/Fl.H ../FL/Enumerations.H
alignment_panel.o: ../FL/Fl_Export.H ../FL/Fl_Window.H ../FL/Fl_Group.H
alignment_panel.o: ../FL/Fl_Box.H ../FL/Fl_Input.H ../FL/Fl_Input_.H
generated by cgit v1.2.3 (git 2.25.1) at 2026-02-08 13:22:13 +0000