From d110378748cac4cb761ef34e2fdf849ff588fd3b Mon Sep 17 00:00:00 2001 From: =?utf8?q?W=C5=82odzimierz=20Skiba?= Date: Thu, 25 Aug 2005 19:10:47 +0000 Subject: [PATCH] [ 1273159 ] logical vs. bitwise operators, part 2 git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35312 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/mac/carbon/slider.cpp | 6 +++--- src/msw/slider95.cpp | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/mac/carbon/slider.cpp b/src/mac/carbon/slider.cpp index 3a12b89008..bdde387534 100644 --- 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) ) @@ -365,7 +365,7 @@ wxSize wxSlider::DoGetBestSize() const 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); - + if(ht > textheight) { textheight = ht; } diff --git a/src/msw/slider95.cpp b/src/msw/slider95.cpp index 39ee05810a..f6ce131dfc 100644 --- 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") ); -- 2.49.0