Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[ 1273159 ] logical vs. bitwise operators, part 2

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35312 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2005-08-25 19:10:47 +00:00
parent 3b9b80c0e2
commit d110378748
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/mac/carbon/slider.cpp
View File

@@ -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;
}

2
src/msw/slider95.cpp
View File

@@ -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") );