From 2df3459457eb7c83fea191fa6105fca0c8ca7e8d Mon Sep 17 00:00:00 2001 From: Michael R Sweet Date: Thu, 24 Feb 2005 21:14:22 +0000 Subject: Added Greg Ercolano's simple Fl_Input_Choice widget which is a combination of the Fl_Input and Fl_Menu_Button widgets (STR #650) FL/Fl_Input_Choice.H: documentation/Fl_Input_Choice.html: - Added. documentation/fltk.book: - Added Fl_Input_Choice.html + --no-embedfonts option. documentation/index.html: - Update version number and revision. documentation/input_choice.jpg: - Added. documentation/preface.html: - Update version number and revision. documentation/widgets.html: - Add Fl_Input_Choice to lists. fluid/Fl_Menu_Type.cxx: - Add Fl_Input_Choice_Type class and instance. fluid/Fl_Type.h: - Add Fl_Input_Choice_Type class and instance. fluid/factory.cxx: - Add Fl_Input_Choice menu item. test/Makefile: - Add input_choice example. test/input_choice.cxx: - Added. test/demo.menu: - Add input_choice example. git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@4050 ea41ed52-d2ee-0310-a9c1-e6b18d33e121 --- test/Makefile | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'test/Makefile') diff --git a/test/Makefile b/test/Makefile index 3c7d74bb4..ead8a4753 100644 --- a/test/Makefile +++ b/test/Makefile @@ -1,5 +1,5 @@ # -# "$Id: Makefile,v 1.19.2.7.2.42 2004/08/26 22:24:24 matthiaswm Exp $" +# "$Id$" # # Test/example program makefile for the Fast Light Tool Kit (FLTK). # @@ -61,6 +61,7 @@ CPPFILES =\ image.cxx \ inactive.cxx \ input.cxx \ + input_choice.cxx \ keyboard.cxx \ label.cxx \ line_style.cxx \ @@ -118,6 +119,7 @@ ALL = \ image$(EXEEXT) \ inactive$(EXEEXT) \ input$(EXEEXT) \ + input_choice$(EXEEXT) \ keyboard$(EXEEXT) \ label$(EXEEXT) \ line_style$(EXEEXT) \ @@ -259,6 +261,8 @@ inactive.cxx: inactive.fl input$(EXEEXT): input.o +input_choice$(EXEEXT): input_choice.o + keyboard$(EXEEXT): keyboard_ui.o keyboard.o echo Linking $@... $(CXX) -I.. $(CXXFLAGS) -o $@ keyboard.o keyboard_ui.o $(LINKFLTK) $(LDLIBS) @@ -376,5 +380,5 @@ shape$(EXEEXT): shape.o # -# End of "$Id: Makefile,v 1.19.2.7.2.42 2004/08/26 22:24:24 matthiaswm Exp $". +# End of "$Id$". # -- cgit v1.2.3