From 74824267355c4ac6f51bcec10bdf66b45b46ee0a Mon Sep 17 00:00:00 2001 From: Michael R Sweet Date: Thu, 11 Apr 2002 11:52:43 +0000 Subject: Make Fl_Output a subclass of Fl_Input, and add input_type and readonly methods/constants to support Fl_Output as a special case of Fl_Input (you can do everything but change the text in Fl_Output...) git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@2073 ea41ed52-d2ee-0310-a9c1-e6b18d33e121 --- fluid/factory.cxx | 8 ++++---- fluid/makedepend | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'fluid') diff --git a/fluid/factory.cxx b/fluid/factory.cxx index 6d4922f6c..320938794 100644 --- a/fluid/factory.cxx +++ b/fluid/factory.cxx @@ -1,5 +1,5 @@ // -// "$Id: factory.cxx,v 1.4.2.11.2.5 2002/01/15 01:33:16 easysw Exp $" +// "$Id: factory.cxx,v 1.4.2.11.2.6 2002/04/11 11:52:41 easysw Exp $" // // Widget factory code for the Fast Light Tool Kit (FLTK). // @@ -539,8 +539,8 @@ static Fl_Scrollbar_Type Fl_Scrollbar_type; #include static Fl_Menu_Item output_type_menu[] = { - {"Normal",0,0,(void*)FL_NORMAL_INPUT}, - {"Multiline",0,0,(void*)FL_MULTILINE_INPUT}, + {"Normal",0,0,(void*)FL_NORMAL_OUTPUT}, + {"Multiline",0,0,(void*)FL_MULTILINE_OUTPUT}, {0}}; class Fl_Output_Type : public Fl_Input_Type { Fl_Menu_Item *subtypes() {return output_type_menu;} @@ -894,5 +894,5 @@ int lookup_symbol(const char *name, int &v, int numberok) { } // -// End of "$Id: factory.cxx,v 1.4.2.11.2.5 2002/01/15 01:33:16 easysw Exp $". +// End of "$Id: factory.cxx,v 1.4.2.11.2.6 2002/04/11 11:52:41 easysw Exp $". // diff --git a/fluid/makedepend b/fluid/makedepend index 287d6c486..aa652044e 100644 --- a/fluid/makedepend +++ b/fluid/makedepend @@ -23,8 +23,8 @@ Fl_Menu_Type.o: ../FL/Fl_Menu_.H ../FL/Fl_Choice.H ../FL/Fl_Menu_Bar.H Fl_Menu_Type.o: alignment_panel.h ../FL/Fl_Window.H ../FL/Fl_Box.H Fl_Menu_Type.o: ../FL/Fl_Input.H ../FL/Fl_Input_.H ../FL/Fl_Button.H Fl_Menu_Type.o: ../FL/Fl_Light_Button.H ../FL/Fl_Button.H ../FL/fl_message.H -Fl_Menu_Type.o: ../FL/fl_ask.H ../FL/Fl_Output.H Shortcut_Button.h -Fl_Menu_Type.o: ../FL/fl_draw.H +Fl_Menu_Type.o: ../FL/fl_ask.H ../FL/Fl_Output.H ../FL/Fl_Input.H +Fl_Menu_Type.o: Shortcut_Button.h ../FL/fl_draw.H Fl_Group_Type.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H Fl_Group_Type.o: ../FL/Fl_Group.H ../FL/fl_message.H ../FL/fl_ask.H Fl_Group_Type.o: Fl_Widget_Type.h Fl_Type.h ../FL/Fl_Widget.H ../FL/Fl_Menu.H @@ -114,7 +114,7 @@ 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_Shared_Image.H ../FL/Fl_Progress.H ../FL/Fl_Adjuster.H factory.o: ../FL/Fl_Dial.H ../FL/Fl_Roller.H ../FL/Fl_Scrollbar.H -factory.o: ../FL/Fl_Output.H ../FL/Fl_Value_Input.H ../FL/Fl_Input.H +factory.o: ../FL/Fl_Output.H ../FL/Fl_Input.H ../FL/Fl_Value_Input.H factory.o: ../FL/Fl_Value_Output.H ../FL/Fl_Value_Slider.H file.o: alignment_panel.h ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H file.o: ../FL/Fl_Window.H ../FL/Fl_Box.H ../FL/Fl_Input.H ../FL/Fl_Input_.H -- cgit v1.2.3