summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlbrecht Schlosser <albrechts.fltk@online.de>2011-01-22 22:38:55 +0000
committerAlbrecht Schlosser <albrechts.fltk@online.de>2011-01-22 22:38:55 +0000
commit1c38a0f2f7187322959e8ff165ae4d891acf9cae (patch)
tree035a30a0d129be6eac01542a6bf59b2da07841e2
parent00710928d41755a31c2c7a97c7bfea368032ac6f (diff)
Tweaks to silence more MS compiler warnings.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@8300 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
-rw-r--r--FL/Fl.H4
-rw-r--r--FL/Fl_Tooltip.H2
-rw-r--r--src/Fl.cxx2
3 files changed, 4 insertions, 4 deletions
diff --git a/FL/Fl.H b/FL/Fl.H
index 874769354..379eec84e 100644
--- a/FL/Fl.H
+++ b/FL/Fl.H
@@ -940,7 +940,7 @@ public:
non-text widgets. The default mode is to enable keyboard focus
for all widgets.
*/
- static void visible_focus(int v) { option(OPTION_VISIBLE_FOCUS, v); }
+ static void visible_focus(int v) { option(OPTION_VISIBLE_FOCUS, (v!=0)); }
/**
Gets or sets the visible keyboard focus on buttons and other
non-text widgets. The default mode is to enable keyboard focus
@@ -955,7 +955,7 @@ public:
be dragged from text fields or dragged within a text field as a
cut/paste shortcut.
*/
- static void dnd_text_ops(int v) { option(OPTION_DND_TEXT, v); }
+ static void dnd_text_ops(int v) { option(OPTION_DND_TEXT, (v!=0)); }
/**
Gets or sets whether drag and drop text operations are
supported. This specifically affects whether selected text can
diff --git a/FL/Fl_Tooltip.H b/FL/Fl_Tooltip.H
index 33b69cb6a..ef7633c7f 100644
--- a/FL/Fl_Tooltip.H
+++ b/FL/Fl_Tooltip.H
@@ -57,7 +57,7 @@ public:
/** Returns non-zero if tooltips are enabled. */
static int enabled() { return Fl::option(Fl::OPTION_SHOW_TOOLTIPS); }
/** Enables tooltips on all widgets (or disables if <i>b</i> is false). */
- static void enable(int b = 1) { Fl::option(Fl::OPTION_SHOW_TOOLTIPS, b);}
+ static void enable(int b = 1) { Fl::option(Fl::OPTION_SHOW_TOOLTIPS, (b!=0));}
/** Same as enable(0), disables tooltips on all widgets. */
static void disable() { enable(0); }
static void (*enter)(Fl_Widget* w);
diff --git a/src/Fl.cxx b/src/Fl.cxx
index a8cc29d52..00ecaf788 100644
--- a/src/Fl.cxx
+++ b/src/Fl.cxx
@@ -1806,7 +1806,7 @@ bool Fl::option(Fl_Option opt)
}
if (opt<0 || opt>=OPTION_LAST)
return false;
- return (bool)options_[opt];
+ return (bool)(options_[opt]!=0);
}
/**