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

Compilation fix

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71827 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2012-06-21 18:39:34 +00:00
parent 5da0507745
commit 59c9dd5c61
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/ribbon/art_msw.cpp
View File

@@ -294,13 +294,14 @@ wxRibbonArtProvider* wxRibbonMSWArtProvider::Clone() const
void wxRibbonMSWArtProvider::CloneTo(wxRibbonMSWArtProvider* copy) const void wxRibbonMSWArtProvider::CloneTo(wxRibbonMSWArtProvider* copy) const
{ {
for(int i = 0; i < 4; ++i) int i;
for(i = 0; i < 4; ++i)
{ {
copy->m_gallery_up_bitmap[i] = m_gallery_up_bitmap[i]; copy->m_gallery_up_bitmap[i] = m_gallery_up_bitmap[i];
copy->m_gallery_down_bitmap[i] = m_gallery_down_bitmap[i]; copy->m_gallery_down_bitmap[i] = m_gallery_down_bitmap[i];
copy->m_gallery_extension_bitmap[i] = m_gallery_extension_bitmap[i]; copy->m_gallery_extension_bitmap[i] = m_gallery_extension_bitmap[i];
} }
for(int i = 0; i < 2; ++i) for(i = 0; i < 2; ++i)
{ {
copy->m_panel_extension_bitmap[i] = m_panel_extension_bitmap[i]; copy->m_panel_extension_bitmap[i] = m_panel_extension_bitmap[i];
} }
@@ -1187,10 +1188,10 @@ void wxRibbonMSWArtProvider::DrawPartialPageBackground(wxDC& dc,
{ {
wxRect background; wxRect background;
// Expanded panels need a background - the expanded panel at // Expanded panels need a background - the expanded panel at
// best size may have a greater Y dimension higher than when // best size may have a greater Y dimension higher than when
// on the bar if it has a sizer. AUI art provider does not need this // on the bar if it has a sizer. AUI art provider does not need this
// because it paints the panel without reference to its parent's size. // because it paints the panel without reference to its parent's size.
// Expanded panels use a wxFrame as parent (not a wxRibbonPage). // Expanded panels use a wxFrame as parent (not a wxRibbonPage).
if(wnd->GetSizer() && wnd->GetParent() != page) if(wnd->GetSizer() && wnd->GetParent() != page)
{ {