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

Commented out the bitmap-greying code until I have time to debug it

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14402 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2002-02-25 11:01:31 +00:00
parent c18ac572db
commit 8262f9aecb
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/univ/toolbar.cpp
View File

@@ -90,6 +90,10 @@ bool wxToolBar::DoDeleteTool(size_t pos, wxToolBarToolBase *tool)
void wxToolBar::DoEnableTool(wxToolBarToolBase *tool, bool enable) void wxToolBar::DoEnableTool(wxToolBarToolBase *tool, bool enable)
{ {
// TODO: figure out why it gives a BadMatch when
// creating the bitmap (out.ConvertToBitmap).
// Possibly we should ensure all depths match.
#if 0
// Created disabled-state bitmap on demand // Created disabled-state bitmap on demand
if (!enable && !tool->GetBitmap2().Ok()) if (!enable && !tool->GetBitmap2().Ok())
{ {
@@ -101,6 +105,7 @@ void wxToolBar::DoEnableTool(wxToolBarToolBase *tool, bool enable)
tool->SetBitmap2(out.ConvertToBitmap()); tool->SetBitmap2(out.ConvertToBitmap());
} }
RefreshTool((wxToolBarTool*) tool); RefreshTool((wxToolBarTool*) tool);
#endif
} }
void wxToolBar::DoToggleTool(wxToolBarToolBase *tool, bool toggle) void wxToolBar::DoToggleTool(wxToolBarToolBase *tool, bool toggle)
@@ -146,7 +151,7 @@ void wxToolBar::RefreshTool( wxToolBarTool *tool )
void wxToolBar::DrawToolBarTool( wxToolBarTool *tool, wxDC &dc, bool down ) void wxToolBar::DrawToolBarTool( wxToolBarTool *tool, wxDC &dc, bool down )
{ {
const wxBitmap& bitmap = (tool->IsEnabled() || !tool->GetBitmap1().Ok()) ? tool->GetBitmap1() : tool->GetBitmap2() ; const wxBitmap& bitmap = (tool->IsEnabled() || !tool->GetBitmap2().Ok()) ? tool->GetBitmap1() : tool->GetBitmap2() ;
if (down) if (down)
{ {
dc.DrawBitmap( bitmap, tool->m_x+4, tool->m_y+4, TRUE ); dc.DrawBitmap( bitmap, tool->m_x+4, tool->m_y+4, TRUE );