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

changed background color reference from light gray to assigned bkgd color

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36276 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Surovell
2005-11-28 15:27:09 +00:00
parent 4292eeb4eb
commit a8cb1a4947
1 changed files with 8 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/msw/tbar95.cpp
View File

@@ -239,8 +239,7 @@ bool wxToolBar::Create(wxWindow *parent,
SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT)); SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));
// workaround for flat toolbar on Windows XP classic style: we have to set // workaround for flat toolbar on Windows XP classic style: we have to set
// the style after creating the control, doing it at creation time doesn't // the style after creating the control; doing it at creation time doesn't work
// work
#if wxUSE_UXTHEME #if wxUSE_UXTHEME
if ( style & wxTB_FLAT ) if ( style & wxTB_FLAT )
{ {
@@ -300,8 +299,8 @@ void wxToolBar::Recreate()
::SetParent(GetHwndOf(win), GetHwnd()); ::SetParent(GetHwndOf(win), GetHwnd());
} }
// only destroy the old toolbar now -- after all the children had been // only destroy the old toolbar now --
// reparented // after all the children had been reparented
::DestroyWindow(hwndOld); ::DestroyWindow(hwndOld);
// it is for the old bitmap control and can't be used with the new one // it is for the old bitmap control and can't be used with the new one
@@ -327,14 +326,10 @@ wxToolBar::~wxToolBar()
// is not - otherwise toolbar leaves a hole in the place it used to occupy // is not - otherwise toolbar leaves a hole in the place it used to occupy
wxFrame *frame = wxDynamicCast(GetParent(), wxFrame); wxFrame *frame = wxDynamicCast(GetParent(), wxFrame);
if ( frame && !frame->IsBeingDeleted() ) if ( frame && !frame->IsBeingDeleted() )
{
frame->SendSizeEvent(); frame->SendSizeEvent();
}
if ( m_hBitmap ) if ( m_hBitmap )
{
::DeleteObject((HBITMAP) m_hBitmap); ::DeleteObject((HBITMAP) m_hBitmap);
}
delete m_disabledImgList; delete m_disabledImgList;
} }
@@ -393,14 +388,10 @@ WXDWORD wxToolBar::MSWGetStyle(long style, WXDWORD *exstyle) const
// incorrect background colour - and not using it still results in the // incorrect background colour - and not using it still results in the
// correct (flat) toolbar, so don't use it there // correct (flat) toolbar, so don't use it there
if ( s_verComCtl > 400 && s_verComCtl < 600 ) if ( s_verComCtl > 400 && s_verComCtl < 600 )
{
msStyle |= TBSTYLE_FLAT | TBSTYLE_TRANSPARENT; msStyle |= TBSTYLE_FLAT | TBSTYLE_TRANSPARENT;
}
if ( s_verComCtl >= 470 && style & wxTB_HORZ_LAYOUT ) if ( s_verComCtl >= 470 && style & wxTB_HORZ_LAYOUT )
{
msStyle |= TBSTYLE_LIST; msStyle |= TBSTYLE_LIST;
}
} }
if ( style & wxTB_NODIVIDER ) if ( style & wxTB_NODIVIDER )
@@ -451,9 +442,7 @@ bool wxToolBar::DoDeleteTool(size_t pos, wxToolBarToolBase *tool)
} }
if ( tool2->IsControl() ) if ( tool2->IsControl() )
{
pos += ((wxToolBarTool *)tool2)->GetSeparatorsCount() - 1; pos += ((wxToolBarTool *)tool2)->GetSeparatorsCount() - 1;
}
} }
// now determine the number of buttons to delete and the area taken by them // now determine the number of buttons to delete and the area taken by them
@@ -609,13 +598,13 @@ bool wxToolBar::Realize()
wxBitmap bitmap(totalBitmapWidth, totalBitmapHeight); wxBitmap bitmap(totalBitmapWidth, totalBitmapHeight);
dcAllButtons.SelectObject(bitmap); dcAllButtons.SelectObject(bitmap);
#ifdef __WXWINCE__ #ifndef __WXWINCE__
dcAllButtons.SetBackground(wxBrush(wxColour(192,192,192)));
#else
if (doTransparent) if (doTransparent)
dcAllButtons.SetBackground(*wxTRANSPARENT_BRUSH); dcAllButtons.SetBackground(*wxTRANSPARENT_BRUSH);
else else
dcAllButtons.SetBackground(*wxLIGHT_GREY_BRUSH); dcAllButtons.SetBackground(wxBrush(GetBackgroundColour()));
#else
dcAllButtons.SetBackground(wxBrush(wxColour(192,192,192)));
#endif #endif
dcAllButtons.Clear(); dcAllButtons.Clear();
@@ -701,9 +690,7 @@ bool wxToolBar::Realize()
#endif // wxUSE_IMAGE #endif // wxUSE_IMAGE
if (doRemap) if (doRemap)
{
MapBitmap(bmpDisabled.GetHBITMAP(), w, h); MapBitmap(bmpDisabled.GetHBITMAP(), w, h);
}
m_disabledImgList->Add(bmpDisabled); m_disabledImgList->Add(bmpDisabled);
} }
@@ -885,9 +872,8 @@ bool wxToolBar::Realize()
break; break;
if ( tool->Toggle(false) ) if ( tool->Toggle(false) )
{
DoToggleTool(tool, false); DoToggleTool(tool, false);
}
prevButton.fsState = TBSTATE_ENABLED; prevButton.fsState = TBSTATE_ENABLED;
nodePrev = nodePrev->GetPrevious(); nodePrev = nodePrev->GetPrevious();
prevIndex--; prevIndex--;
@@ -960,7 +946,6 @@ bool wxToolBar::Realize()
} }
wxControl *control = tool->GetControl(); wxControl *control = tool->GetControl();
wxSize size = control->GetSize(); wxSize size = control->GetSize();
// the position of the leftmost controls corner // the position of the leftmost controls corner