use bool expression rather than implicit conversion

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

diff --git a/include/wx/event.h b/include/wx/event.h
index 70fd7df823d32e6e5e928adedc573a598a4c7492..4711b4d353c6e6b012593f89a530d9b07273b786 100644 (file)
--- a/include/wx/event.h
+++ b/include/wx/event.h
@@ -397,7 +397,7 @@ class wxEventFunctorMethod
               <
                 Class,
                 EventArg,
-                wxConvertibleTo<Class, wxEvtHandler>::value
+                wxConvertibleTo<Class, wxEvtHandler>::value != 0
               >
 {
 private:

diff --git a/include/wx/osx/core/colour.h b/include/wx/osx/core/colour.h
index 3c6674c589f75c4db00502d00387f62634fdc1dd..1cf694140c7e3ce7d81ea3801dd4dd8c42cac4a2 100644 (file)
--- a/include/wx/osx/core/colour.h
+++ b/include/wx/osx/core/colour.h
@@ -30,7 +30,7 @@ public:
     // default copy ctor and dtor are ok
 
     // accessors
-    virtual bool IsOk() const { return m_cgColour; }
+    virtual bool IsOk() const { return m_cgColour != NULL; }
 
     virtual WXDLLIMPEXP_INLINE_CORE ChannelType Red() const { return m_red; }
     virtual WXDLLIMPEXP_INLINE_CORE ChannelType Green() const { return m_green; }

diff --git a/include/wx/weakref.h b/include/wx/weakref.h
index 00e7fa122931b8d8b7317cf33849cc07c7953051..b8324d07ec7248eabe2464175ee67b73784526db 100644 (file)
--- a/include/wx/weakref.h
+++ b/include/wx/weakref.h
@@ -202,7 +202,7 @@ class wxWeakRef : public
 #ifdef USE_ONLY_STATIC_WEAKREF
                   wxWeakRefStatic<T>
 #else
-                  wxWeakRefImpl<T, wxIsStaticTrackable<T>::value>
+                  wxWeakRefImpl<T, wxIsStaticTrackable<T>::value != 0>
 #endif
 {
 public:

diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp
index af7af1f127e4e8bc600079e8c4ef96bad90d280d..ae545bf49aa704fb4eda7917b0e225cc4fa23205 100644 (file)
--- a/src/gtk/window.cpp
+++ b/src/gtk/window.cpp
@@ -1074,15 +1074,15 @@ template<typename T> void InitMouseEvent(wxWindowGTK *win,
                                          T *gdk_event)
 {
     event.SetTimestamp( gdk_event->time );
-    event.m_shiftDown = gdk_event->state & GDK_SHIFT_MASK;
-    event.m_controlDown = gdk_event->state & GDK_CONTROL_MASK;
-    event.m_altDown = gdk_event->state & GDK_MOD1_MASK;
-    event.m_metaDown = gdk_event->state & GDK_META_MASK;
-    event.m_leftDown = gdk_event->state & GDK_BUTTON1_MASK;
-    event.m_middleDown = gdk_event->state & GDK_BUTTON2_MASK;
-    event.m_rightDown = gdk_event->state & GDK_BUTTON3_MASK;
-    event.m_aux1Down = gdk_event->state & GDK_BUTTON4_MASK;
-    event.m_aux2Down = gdk_event->state & GDK_BUTTON5_MASK;
+    event.m_shiftDown = (gdk_event->state & GDK_SHIFT_MASK) != 0;
+    event.m_controlDown = (gdk_event->state & GDK_CONTROL_MASK) != 0;
+    event.m_altDown = (gdk_event->state & GDK_MOD1_MASK) != 0;
+    event.m_metaDown = (gdk_event->state & GDK_META_MASK) != 0;
+    event.m_leftDown = (gdk_event->state & GDK_BUTTON1_MASK) != 0;
+    event.m_middleDown = (gdk_event->state & GDK_BUTTON2_MASK) != 0;
+    event.m_rightDown = (gdk_event->state & GDK_BUTTON3_MASK) != 0;
+    event.m_aux1Down = (gdk_event->state & GDK_BUTTON4_MASK) != 0;
+    event.m_aux2Down = (gdk_event->state & GDK_BUTTON5_MASK) != 0;
 
     wxPoint pt = win->GetClientAreaOrigin();
     event.m_x = (wxCoord)gdk_event->x - pt.x;
@@ -1992,16 +1992,16 @@ wxMouseState wxGetMouseState()
 
     ms.SetX(x);
     ms.SetY(y);
-    ms.SetLeftDown(mask & GDK_BUTTON1_MASK);
-    ms.SetMiddleDown(mask & GDK_BUTTON2_MASK);
-    ms.SetRightDown(mask & GDK_BUTTON3_MASK);
-    ms.SetAux1Down(mask & GDK_BUTTON4_MASK);
-    ms.SetAux2Down(mask & GDK_BUTTON5_MASK);
-
-    ms.SetControlDown(mask & GDK_CONTROL_MASK);
-    ms.SetShiftDown(mask & GDK_SHIFT_MASK);
-    ms.SetAltDown(mask & GDK_MOD1_MASK);
-    ms.SetMetaDown(mask & GDK_META_MASK);
+    ms.SetLeftDown((mask & GDK_BUTTON1_MASK) != 0);
+    ms.SetMiddleDown((mask & GDK_BUTTON2_MASK) != 0);
+    ms.SetRightDown((mask & GDK_BUTTON3_MASK) != 0);
+    ms.SetAux1Down((mask & GDK_BUTTON4_MASK) != 0);
+    ms.SetAux2Down((mask & GDK_BUTTON5_MASK) != 0);
+
+    ms.SetControlDown((mask & GDK_CONTROL_MASK) != 0);
+    ms.SetShiftDown((mask & GDK_SHIFT_MASK) != 0);
+    ms.SetAltDown((mask & GDK_MOD1_MASK) != 0);
+    ms.SetMetaDown((mask & GDK_META_MASK) != 0);
 
     return ms;
 }

diff --git a/src/osx/checklst_osx.cpp b/src/osx/checklst_osx.cpp
index be06c9f289fc9ba2e7a969361bd1c3853b6f7a1f..1c3a1d581513613ab32be4d01e3297bae2240d18 100644 (file)
--- a/src/osx/checklst_osx.cpp
+++ b/src/osx/checklst_osx.cpp
@@ -117,7 +117,7 @@ void wxCheckListBox::SetValueCallback( unsigned int n, wxListWidgetColumn* col ,
 {
     if ( col == m_checkColumn )
     {
-        Check( n, value.GetIntValue() );
+        Check( n, value.GetIntValue() != 0 );
         
         wxCommandEvent event( wxEVT_COMMAND_CHECKLISTBOX_TOGGLED, GetId() );
         event.SetInt( n );

diff --git a/src/osx/radiobut_osx.cpp b/src/osx/radiobut_osx.cpp
index 1ffcc72750547a63c1cb26c1cf65883f9288d9d6..c85c62e8bd5eaff740c9c4ba76732550d96c12cc 100644 (file)
--- a/src/osx/radiobut_osx.cpp
+++ b/src/osx/radiobut_osx.cpp
@@ -97,7 +97,7 @@ void wxRadioButton::SetValue(bool val)
 
 bool wxRadioButton::GetValue() const
 {
-    return m_peer->GetValue();
+    return m_peer->GetValue() != 0;
 }
 
 void wxRadioButton::Command(wxCommandEvent& event)