summaryrefslogtreecommitdiff
path: root/FL
diff options
context:
space:
mode:
authorMichael R Sweet <michael.r.sweet@gmail.com>2002-10-29 19:45:10 +0000
committerMichael R Sweet <michael.r.sweet@gmail.com>2002-10-29 19:45:10 +0000
commit7d0d281fb41d407984e24d55c65c868d0eff0690 (patch)
tree56979836d17ed64930012b74cdaa4ef347676a36 /FL
parent314a351940e9537304ea3eacdf6663472d3dc85b (diff)
2.0 tooltip changes into 1.1.x.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@2704 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'FL')
-rw-r--r--FL/Enumerations.H6
-rw-r--r--FL/Fl_Tooltip.H7
2 files changed, 9 insertions, 4 deletions
diff --git a/FL/Enumerations.H b/FL/Enumerations.H
index 1e93d9064..ffb67d46f 100644
--- a/FL/Enumerations.H
+++ b/FL/Enumerations.H
@@ -1,5 +1,5 @@
//
-// "$Id: Enumerations.H,v 1.18.2.14.2.28 2002/10/24 12:53:40 easysw Exp $"
+// "$Id: Enumerations.H,v 1.18.2.14.2.29 2002/10/29 19:45:08 easysw Exp $"
//
// Enumerations for the Fast Light Tool Kit (FLTK).
//
@@ -145,6 +145,8 @@ enum Fl_When { // Fl_Widget::when():
#define FL_BUTTON1 0x01000000
#define FL_BUTTON2 0x02000000
#define FL_BUTTON3 0x04000000
+#define FL_BUTTONS 0x7f000000 // All possible buttons
+#define FL_BUTTON(n) (0x00800000<<(n))
enum Fl_Boxtype { // boxtypes (if you change these you must fix fl_boxtype.C):
FL_NO_BOX = 0, FL_FLAT_BOX,
@@ -406,5 +408,5 @@ enum Fl_Damage {
#endif
//
-// End of "$Id: Enumerations.H,v 1.18.2.14.2.28 2002/10/24 12:53:40 easysw Exp $".
+// End of "$Id: Enumerations.H,v 1.18.2.14.2.29 2002/10/29 19:45:08 easysw Exp $".
//
diff --git a/FL/Fl_Tooltip.H b/FL/Fl_Tooltip.H
index 5328dc510..b1512d151 100644
--- a/FL/Fl_Tooltip.H
+++ b/FL/Fl_Tooltip.H
@@ -1,5 +1,5 @@
//
-// "$Id: Fl_Tooltip.H,v 1.16.2.8 2002/05/13 05:05:11 spitzak Exp $"
+// "$Id: Fl_Tooltip.H,v 1.16.2.9 2002/10/29 19:45:09 easysw Exp $"
//
// Tooltip header file for the Fast Light Tool Kit (FLTK).
//
@@ -39,6 +39,8 @@ public:
static void (*enter)(Fl_Widget* w);
static void enter_area(Fl_Widget* w, int X, int Y, int W, int H, const char* tip);
static void (*exit)(Fl_Widget *w);
+ static Fl_Widget* current() {return widget_;}
+ static void current(Fl_Widget*);
static int font() { return font_; }
static int size() { return size_; }
@@ -55,10 +57,11 @@ private:
static unsigned textcolor_;
static int font_;
static int size_;
+ static Fl_Widget* widget_;
};
#endif
//
-// End of "$Id: Fl_Tooltip.H,v 1.16.2.8 2002/05/13 05:05:11 spitzak Exp $".
+// End of "$Id: Fl_Tooltip.H,v 1.16.2.9 2002/10/29 19:45:09 easysw Exp $".
//