diff options
| author | Bill Spitzak <spitzak@gmail.com> | 2000-03-05 06:51:07 +0000 |
|---|---|---|
| committer | Bill Spitzak <spitzak@gmail.com> | 2000-03-05 06:51:07 +0000 |
| commit | a32453e68093718f88cf6f17a165e4b8fe2a784f (patch) | |
| tree | ba3a8ab32300090abf1807610a7a7c6c3c11d7f0 /FL | |
| parent | d6caf3aff8f9be57e15491134e4f6fb6941c2a17 (diff) | |
Moved FL_LEFT_MOUSE, FL_MIDDLE_MOUSE, and FL_RIGHT_MOUSE from forms.h to
Enumerations.H so they are available to any fltk programs.
More fixes to the fake-overlay code in Fl_Gl_Window (it did not work on
Win32 when there were 2 different-sized windows)
Fix to Fl_compose to not quote the Delete key fixed to allow the right-
control key to still be the compose prefix and to allow it to quote
control characters.
OSF1 used the same parameters for scandir as SGI and unlike Linux and
apparently most other Unix's
fl_ask, message, etc windows are resizable, which is useful if you use
them to display arbitrary output from a program.
On Win32 non_modal (but not modal) windows have close and size boxes, as per
popular demand at Digital Domain.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.0@1028 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'FL')
| -rw-r--r-- | FL/Enumerations.H | 11 | ||||
| -rw-r--r-- | FL/forms.H | 7 |
2 files changed, 10 insertions, 8 deletions
diff --git a/FL/Enumerations.H b/FL/Enumerations.H index 1a9f14f6e..05b1d4f2a 100644 --- a/FL/Enumerations.H +++ b/FL/Enumerations.H @@ -1,5 +1,5 @@ // -// "$Id: Enumerations.H,v 1.18.2.8 2000/02/25 03:44:19 mike Exp $" +// "$Id: Enumerations.H,v 1.18.2.9 2000/03/05 06:51:03 bill Exp $" // // Enumerations for the Fast Light Tool Kit (FLTK). // @@ -97,7 +97,7 @@ enum Fl_When { // Fl_Widget::when(): }; // Fl::event_key() and Fl::get_key(n) (use ascii letters for all other keys): -#define FL_Button 0xfee8 // use Fl_Button+n for mouse button n +#define FL_Button 0xfee8 // use Fl_Button+FL_*_MOUSE #define FL_BackSpace 0xff08 #define FL_Tab 0xff09 #define FL_Enter 0xff0d @@ -132,6 +132,11 @@ enum Fl_When { // Fl_Widget::when(): #define FL_Alt_R 0xffea #define FL_Delete 0xffff +// Fl::event_button(): +#define FL_LEFT_MOUSE 1 +#define FL_MIDDLE_MOUSE 2 +#define FL_RIGHT_MOUSE 3 + // Fl::event_state(): #define FL_SHIFT 0x00010000 #define FL_CAPS_LOCK 0x00020000 @@ -366,5 +371,5 @@ enum Fl_Damage { #endif // -// End of "$Id: Enumerations.H,v 1.18.2.8 2000/02/25 03:44:19 mike Exp $". +// End of "$Id: Enumerations.H,v 1.18.2.9 2000/03/05 06:51:03 bill Exp $". // diff --git a/FL/forms.H b/FL/forms.H index 68ca31426..e0eafbf3c 100644 --- a/FL/forms.H +++ b/FL/forms.H @@ -1,5 +1,5 @@ // -// "$Id: forms.H,v 1.7.2.1 1999/05/11 09:39:27 bill Exp $" +// "$Id: forms.H,v 1.7.2.2 2000/03/05 06:51:04 bill Exp $" // // Forms emulation header file for the Fast Light Tool Kit (FLTK). // @@ -104,13 +104,10 @@ typedef Fl_Window FL_FORM; #define FL_OVAL3D_DOWNBOX FL_ROUND_DOWN_BOX #define FL_MBUTTON1 1 -#define FL_LEFT_MOUSE 1 #define FL_LEFTMOUSE 1 #define FL_MBUTTON2 2 -#define FL_MIDDLE_MOUSE 2 #define FL_MIDDLEMOUSE 2 #define FL_MBUTTON3 3 -#define FL_RIGHT_MOUSE 3 #define FL_RIGHTMOUSE 3 #define FL_MBUTTON4 4 #define FL_MBUTTON5 5 @@ -841,5 +838,5 @@ inline void fl_draw() {Fl::flush();} #endif /* define __FORMS_H__ */ // -// End of "$Id: forms.H,v 1.7.2.1 1999/05/11 09:39:27 bill Exp $". +// End of "$Id: forms.H,v 1.7.2.2 2000/03/05 06:51:04 bill Exp $". // |