Olly Betts' typo patch
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34439 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -136,8 +136,8 @@ public:
|
||||
Arrow_Normal,
|
||||
Arrow_Disabled,
|
||||
Arrow_Pressed,
|
||||
Arrow_Inversed,
|
||||
Arrow_InversedDisabled,
|
||||
Arrow_Inverted,
|
||||
Arrow_InvertedDisabled,
|
||||
Arrow_StateMax
|
||||
};
|
||||
|
||||
@@ -1677,31 +1677,31 @@ wxWin32Renderer::wxWin32Renderer(const wxColourScheme *scheme)
|
||||
|
||||
}
|
||||
|
||||
// create the inversed bitmap but only for the right arrow as we only
|
||||
// create the inverted bitmap but only for the right arrow as we only
|
||||
// use it for the menus
|
||||
if ( n == Arrow_Right )
|
||||
{
|
||||
m_bmpArrows[Arrow_Inversed][n].Create(w, h);
|
||||
dcInverse.SelectObject(m_bmpArrows[Arrow_Inversed][n]);
|
||||
m_bmpArrows[Arrow_Inverted][n].Create(w, h);
|
||||
dcInverse.SelectObject(m_bmpArrows[Arrow_Inverted][n]);
|
||||
dcInverse.Clear();
|
||||
dcInverse.Blit(0, 0, w, h,
|
||||
&dcNormal, 0, 0,
|
||||
wxXOR);
|
||||
dcInverse.SelectObject(wxNullBitmap);
|
||||
|
||||
mask = new wxMask(m_bmpArrows[Arrow_Inversed][n], *wxBLACK);
|
||||
m_bmpArrows[Arrow_Inversed][n].SetMask(mask);
|
||||
mask = new wxMask(m_bmpArrows[Arrow_Inverted][n], *wxBLACK);
|
||||
m_bmpArrows[Arrow_Inverted][n].SetMask(mask);
|
||||
|
||||
m_bmpArrows[Arrow_InversedDisabled][n].Create(w, h);
|
||||
dcInverse.SelectObject(m_bmpArrows[Arrow_InversedDisabled][n]);
|
||||
m_bmpArrows[Arrow_InvertedDisabled][n].Create(w, h);
|
||||
dcInverse.SelectObject(m_bmpArrows[Arrow_InvertedDisabled][n]);
|
||||
dcInverse.Clear();
|
||||
dcInverse.Blit(0, 0, w, h,
|
||||
&dcDisabled, 0, 0,
|
||||
wxXOR);
|
||||
dcInverse.SelectObject(wxNullBitmap);
|
||||
|
||||
mask = new wxMask(m_bmpArrows[Arrow_InversedDisabled][n], *wxBLACK);
|
||||
m_bmpArrows[Arrow_InversedDisabled][n].SetMask(mask);
|
||||
mask = new wxMask(m_bmpArrows[Arrow_InvertedDisabled][n], *wxBLACK);
|
||||
m_bmpArrows[Arrow_InvertedDisabled][n].SetMask(mask);
|
||||
}
|
||||
|
||||
dcNormal.SelectObject(wxNullBitmap);
|
||||
@@ -2843,7 +2843,7 @@ void wxWin32Renderer::DrawSliderThumb(wxDC& dc,
|
||||
H D B
|
||||
H D B
|
||||
H D B
|
||||
H D B where H is hightlight colour
|
||||
H D B where H is highlight colour
|
||||
H D B D dark grey
|
||||
H D B B black
|
||||
H D B
|
||||
@@ -3197,10 +3197,10 @@ void wxWin32Renderer::DrawMenuItem(wxDC& dc,
|
||||
|
||||
wxArrowStyle arrowStyle;
|
||||
if ( flags & wxCONTROL_DISABLED )
|
||||
arrowStyle = flags & wxCONTROL_SELECTED ? Arrow_InversedDisabled
|
||||
arrowStyle = flags & wxCONTROL_SELECTED ? Arrow_InvertedDisabled
|
||||
: Arrow_Disabled;
|
||||
else if ( flags & wxCONTROL_SELECTED )
|
||||
arrowStyle = Arrow_Inversed;
|
||||
arrowStyle = Arrow_Inverted;
|
||||
else
|
||||
arrowStyle = Arrow_Normal;
|
||||
|
||||
|
Reference in New Issue
Block a user