AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixes for compilation with wxUSE_PALETTE=0

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11819 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2001-10-04 01:50:17 +00:00
parent 50563ef1bd
commit 80806624f8
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/generic/tbarsmpl.cpp
View File

@ -516,10 +516,12 @@ void wxToolBarSimple::DrawTool(wxDC& dc, wxToolBarToolBase *toolBase)
if ( bitmap.Ok() ) if ( bitmap.Ok() )
{ {
#if wxUSE_PALETTE
#ifndef __WXGTK__ #ifndef __WXGTK__
if (bitmap.GetPalette()) if (bitmap.GetPalette())
memDC.SetPalette(*bitmap.GetPalette()); memDC.SetPalette(*bitmap.GetPalette());
#endif #endif
#endif // wxUSE_PALETTE
int ax = (int)tool->m_x, int ax = (int)tool->m_x,
ay = (int)tool->m_y, ay = (int)tool->m_y,
@ -552,9 +554,12 @@ void wxToolBarSimple::DrawTool(wxDC& dc, wxToolBarToolBase *toolBase)
&memDC, 0, 0); &memDC, 0, 0);
} }
memDC.SelectObject(wxNullBitmap); memDC.SelectObject(wxNullBitmap);
#if wxUSE_PALETTE
#ifndef __WXGTK__ #ifndef __WXGTK__
memDC.SetPalette(wxNullPalette); memDC.SetPalette(wxNullPalette);
#endif #endif
#endif // wxUSE_PALETTE
} }
// No second bitmap, so draw a thick line around bitmap, or invert if mono // No second bitmap, so draw a thick line around bitmap, or invert if mono
else if ( tool->IsToggled() ) else if ( tool->IsToggled() )