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 --- fluid/Fl_Type.h | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) (limited to 'fluid/Fl_Type.h') diff --git a/fluid/Fl_Type.h b/fluid/Fl_Type.h index 1a732ad2e..cc0c246cb 100644 --- a/fluid/Fl_Type.h +++ b/fluid/Fl_Type.h @@ -1,5 +1,5 @@ // -// "$Id: Fl_Type.h,v 1.5.2.11.2.13 2004/04/11 04:38:55 easysw Exp $" +// "$Id$" // // Widget type header file for the Fast Light Tool Kit (FLTK). // @@ -549,6 +549,20 @@ public: int pixmapID() { return 15; } }; +#include +class Fl_Input_Choice_Type : public Fl_Menu_Type { +public: + virtual const char *type_name() {return "Fl_Input_Choice";} + Fl_Widget *widget(int X,int Y,int W,int H) { + Fl_Input_Choice *myo = new Fl_Input_Choice(X,Y,W,H,"input choice:"); + myo->menu(dummymenu); + myo->value("input"); + return myo; + } + Fl_Widget_Type *_make() {return new Fl_Input_Choice_Type();} + int pixmapID() { return 15; } +}; + #include class Fl_Menu_Bar_Type : public Fl_Menu_Type { public: @@ -599,5 +613,5 @@ int storestring(const char *n, const char * & p, int nostrip=0); extern int include_H_from_C; // -// End of "$Id: Fl_Type.h,v 1.5.2.11.2.13 2004/04/11 04:38:55 easysw Exp $". +// End of "$Id$". // -- cgit v1.2.3