Author: AlbrechtS
Date: 2011-01-22 14:38:55 -0800 (Sat, 22 Jan 2011)
New Revision: 8300
Log:
Tweaks to silence more MS compiler warnings.


Modified:
   branches/branch-1.3/FL/Fl.H
   branches/branch-1.3/FL/Fl_Tooltip.H
   branches/branch-1.3/src/Fl.cxx

Modified: branches/branch-1.3/FL/Fl.H
===================================================================
--- branches/branch-1.3/FL/Fl.H 2011-01-22 22:35:56 UTC (rev 8299)
+++ branches/branch-1.3/FL/Fl.H 2011-01-22 22:38:55 UTC (rev 8300)
@@ -940,7 +940,7 @@
     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 @@
     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

Modified: branches/branch-1.3/FL/Fl_Tooltip.H
===================================================================
--- branches/branch-1.3/FL/Fl_Tooltip.H 2011-01-22 22:35:56 UTC (rev 8299)
+++ branches/branch-1.3/FL/Fl_Tooltip.H 2011-01-22 22:38:55 UTC (rev 8300)
@@ -57,7 +57,7 @@
   /**    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);

Modified: branches/branch-1.3/src/Fl.cxx
===================================================================
--- branches/branch-1.3/src/Fl.cxx      2011-01-22 22:35:56 UTC (rev 8299)
+++ branches/branch-1.3/src/Fl.cxx      2011-01-22 22:38:55 UTC (rev 8300)
@@ -1806,7 +1806,7 @@
   }
   if (opt<0 || opt>=OPTION_LAST) 
     return false;
-  return (bool)options_[opt];
+  return (bool)(options_[opt]!=0);
 }
 
 /**

_______________________________________________
fltk-commit mailing list
[email protected]
http://lists.easysw.com/mailman/listinfo/fltk-commit

Reply via email to