From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Tue, 27 Jun 2006 14:12:05 +0000 (+0000)
Subject: fix VC compilation warnings about implicit int->bool conversion after last check in
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/57b49e9445306848a3318713c906a0976a1e36bf

fix VC compilation warnings about implicit int->bool conversion after last check in


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39847 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/include/wx/pickerbase.h b/include/wx/pickerbase.h
index 705924b362..ff262683e9 100644
--- a/include/wx/pickerbase.h
+++ b/include/wx/pickerbase.h
@@ -64,25 +64,29 @@ public:     // public API
         { return GetTextCtrlItem()->GetProportion(); }
 
     bool IsTextCtrlGrowable() const
-        { return GetTextCtrlItem()->GetFlag() & wxGROW; }
+        { return (GetTextCtrlItem()->GetFlag() & wxGROW) != 0; }
     void SetTextCtrlGrowable(bool grow = true)
     {
         int f = GetDefaultTextCtrlFlag();
-        if (grow)
-            GetTextCtrlItem()->SetFlag(f | wxGROW);
+        if ( grow )
+            f |= wxGROW;
         else
-            GetTextCtrlItem()->SetFlag(f & ~wxGROW);
+            f &= ~wxGROW;
+
+        GetTextCtrlItem()->SetFlag(f);
     }
 
     bool IsPickerCtrlGrowable() const
-        { return GetPickerCtrlItem()->GetFlag() & wxGROW; }
+        { return (GetPickerCtrlItem()->GetFlag() & wxGROW) != 0; }
     void SetPickerCtrlGrowable(bool grow = true)
     {
         int f = GetDefaultPickerCtrlFlag();
-        if (grow)
-            GetPickerCtrlItem()->SetFlag(f | wxGROW);
+        if ( grow )
+            f |= wxGROW;
         else
-            GetPickerCtrlItem()->SetFlag(f & ~wxGROW);
+            f &= ~wxGROW;
+
+        GetPickerCtrlItem()->SetFlag(f);
     }
 
     bool HasTextCtrl() const