Left/right arrows were swapped.
Fix wxSP_WRAP handling. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18629 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -279,10 +279,10 @@ bool wxSpinButton::Create( wxWindow *parent, wxWindowID id,
|
|||||||
wxPoint pt1, pt2;
|
wxPoint pt1, pt2;
|
||||||
wxSize sz1, sz2;
|
wxSize sz1, sz2;
|
||||||
CalcSizes( wxPoint(0,0), newSize, pt1, sz1, pt2, sz2, isVert );
|
CalcSizes( wxPoint(0,0), newSize, pt1, sz1, pt2, sz2, isVert );
|
||||||
m_up = new wxArrowButton( this, -1, isVert ? wxARROW_UP : wxARROW_LEFT,
|
m_up = new wxArrowButton( this, -1, isVert ? wxARROW_UP : wxARROW_RIGHT,
|
||||||
pt1, sz1, 1 );
|
pt1, sz1, 1 );
|
||||||
m_down = new wxArrowButton( this, -1,
|
m_down = new wxArrowButton( this, -1,
|
||||||
isVert ? wxARROW_DOWN : wxARROW_RIGHT,
|
isVert ? wxARROW_DOWN : wxARROW_LEFT,
|
||||||
pt2, sz2, -1 );
|
pt2, sz2, -1 );
|
||||||
|
|
||||||
return TRUE;
|
return TRUE;
|
||||||
@@ -331,14 +331,14 @@ void wxSpinButton::Increment( int delta )
|
|||||||
|
|
||||||
if( npos < m_min )
|
if( npos < m_min )
|
||||||
{
|
{
|
||||||
if( GetWindowStyle() && wxSP_WRAP )
|
if( GetWindowStyle() & wxSP_WRAP )
|
||||||
npos = m_max;
|
npos = m_max;
|
||||||
else
|
else
|
||||||
npos = m_min;
|
npos = m_min;
|
||||||
}
|
}
|
||||||
if( npos > m_max )
|
if( npos > m_max )
|
||||||
{
|
{
|
||||||
if( GetWindowStyle() && wxSP_WRAP )
|
if( GetWindowStyle() & wxSP_WRAP )
|
||||||
npos = m_min;
|
npos = m_min;
|
||||||
else
|
else
|
||||||
npos = m_max;
|
npos = m_max;
|
||||||
|
Reference in New Issue
Block a user