[ 1273159 ] logical vs. bitwise operators, part 2

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

diff --git a/src/mac/carbon/slider.cpp b/src/mac/carbon/slider.cpp
index 3a12b890081c0b40eea8b12488ebab18a08f9fbe..bdde387534e07a6c2b3cec60ed4dfed211ce838a 100644 (file)
--- a/src/mac/carbon/slider.cpp
+++ b/src/mac/carbon/slider.cpp
@@ -84,7 +84,7 @@ bool wxSlider::Create(wxWindow *parent, wxWindowID id,
             }
     };
 
             }
     };
 

-    wxASSERT_MSG( !(style & wxSL_VERTICAL) | !(style & wxSL_HORIZONTAL),
+    wxASSERT_MSG( !(style & wxSL_VERTICAL) || !(style & wxSL_HORIZONTAL),

         _T("incompatible slider direction and orientation") );
 
     if ( !wxControl::Create(parent, id, pos, size, style, validator, name) )
         _T("incompatible slider direction and orientation") );
 
     if ( !wxControl::Create(parent, id, pos, size, style, validator, name) )


@@ -365,7 +365,7 @@ wxSize wxSlider::DoGetBestSize() const
             textwidth = maxtwidth;
         }
         else {
             textwidth = maxtwidth;
         }
         else {

-            textwidth = mintwidth; 
+            textwidth = mintwidth;

         }
     }
 
         }
     }
 


@@ -421,7 +421,7 @@ void wxSlider::DoSetSize(int x, int y, int w, int h, int sizeFlags)
         GetTextExtent(text, &minValWidth, &textheight);
         text.Printf(wxT("%d"), ValueInvertOrNot( m_rangeMax ) );
         GetTextExtent(text, &maxValWidth, &ht);
         GetTextExtent(text, &minValWidth, &textheight);
         text.Printf(wxT("%d"), ValueInvertOrNot( m_rangeMax ) );
         GetTextExtent(text, &maxValWidth, &ht);

- 
+

         if(ht > textheight) {
             textheight = ht;
         }
         if(ht > textheight) {
             textheight = ht;
         }

diff --git a/src/msw/slider95.cpp b/src/msw/slider95.cpp
index 39ee05810acd7f793df6a7acfee6f0ba60d38433..f6ce131dfcff3be148998d87188fab7a0ec09d46 100644 (file)
--- a/src/msw/slider95.cpp
+++ b/src/msw/slider95.cpp
@@ -188,7 +188,7 @@ wxSlider::Create(wxWindow *parent,
             }
     };
 
             }
     };
 

-    wxASSERT_MSG( !(style & wxSL_VERTICAL) | !(style & wxSL_HORIZONTAL),
+    wxASSERT_MSG( !(style & wxSL_VERTICAL) || !(style & wxSL_HORIZONTAL),

                     _T("incompatible slider direction and orientation") );
 
 
                     _T("incompatible slider direction and orientation") );