summaryrefslogtreecommitdiff
path: root/FL
diff options
context:
space:
mode:
authorMichael R Sweet <michael.r.sweet@gmail.com>2004-12-03 02:48:22 +0000
committerMichael R Sweet <michael.r.sweet@gmail.com>2004-12-03 02:48:22 +0000
commit0184365c807d9ca2b414ff52d7d5c1b36e1e4d30 (patch)
tree89f9854ef79c52fd7b26e62f01b4211c317d595d /FL
parenta50a8b702aec0849d778f6e36e9b5f5703dff48c (diff)
Fl_Help_View::topline() incorrectly set the changed() flag (STR
#631) Fl_Choice::value() now supports NULL or -1 to deselect the current item (STR #637) More VC++ 6 project file fixes (STR #638) git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@3928 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'FL')
-rw-r--r--FL/Fl_Menu_.H6
1 files changed, 3 insertions, 3 deletions
diff --git a/FL/Fl_Menu_.H b/FL/Fl_Menu_.H
index 54a62c95c..eb646af31 100644
--- a/FL/Fl_Menu_.H
+++ b/FL/Fl_Menu_.H
@@ -1,5 +1,5 @@
//
-// "$Id: Fl_Menu_.H,v 1.7.2.4.2.10 2004/04/11 04:38:54 easysw Exp $"
+// "$Id: Fl_Menu_.H,v 1.7.2.4.2.11 2004/12/03 02:48:21 easysw Exp $"
//
// Menu base class header file for the Fast Light Tool Kit (FLTK).
//
@@ -72,7 +72,7 @@ public:
int mode(int i) const {return menu_[i].flags;}
const Fl_Menu_Item *mvalue() const {return value_;}
- int value() const {return (int)(value_-menu_);}
+ int value() const {return value_ ? (int)(value_-menu_) : -1;}
int value(const Fl_Menu_Item*);
int value(int i) {return value(menu_+i);}
const char *text() const {return value_ ? value_->text : 0;}
@@ -96,5 +96,5 @@ public:
#endif
//
-// End of "$Id: Fl_Menu_.H,v 1.7.2.4.2.10 2004/04/11 04:38:54 easysw Exp $".
+// End of "$Id: Fl_Menu_.H,v 1.7.2.4.2.11 2004/12/03 02:48:21 easysw Exp $".
//