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

compilation fix for WXWIN_COMPATIBILITY_2_2 == 0 case

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14451 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2002-03-05 16:38:08 +00:00
parent 7d1f4c3ff0
commit bfe9b3dac0
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/generic/tbarsmpl.cpp
View File

@@ -202,10 +202,10 @@ bool wxToolBarSimple::DoInsertTool(size_t WXUNUSED(pos),
if ( tool->IsButton() ) if ( tool->IsButton() )
{ {
// Calculate reasonable max size in case Layout() not called // Calculate reasonable max size in case Layout() not called
if ((tool->m_x + tool->GetBitmap1().GetWidth() + m_xMargin) > m_maxWidth) if ((tool->m_x + tool->GetNormalBitmap().GetWidth() + m_xMargin) > m_maxWidth)
m_maxWidth = (wxCoord)((tool->m_x + tool->GetWidth() + m_xMargin)); m_maxWidth = (wxCoord)((tool->m_x + tool->GetWidth() + m_xMargin));
if ((tool->m_y + tool->GetBitmap1().GetHeight() + m_yMargin) > m_maxHeight) if ((tool->m_y + tool->GetNormalBitmap().GetHeight() + m_yMargin) > m_maxHeight)
m_maxHeight = (wxCoord)((tool->m_y + tool->GetHeight() + m_yMargin)); m_maxHeight = (wxCoord)((tool->m_y + tool->GetHeight() + m_yMargin));
} }
@@ -573,14 +573,14 @@ void wxToolBarSimple::DrawTool(wxDC& dc, wxToolBarToolBase *toolBase)
if (!drawBorder) if (!drawBorder)
{ {
memDC.SelectObject(tool->GetBitmap1()); memDC.SelectObject(tool->GetNormalBitmap());
dc.Blit(tool->m_x, tool->m_y, tool->GetWidth(), tool->GetHeight(), dc.Blit(tool->m_x, tool->m_y, tool->GetWidth(), tool->GetHeight(),
&memDC, 0, 0, wxSRC_INVERT); &memDC, 0, 0, wxSRC_INVERT);
memDC.SelectObject(wxNullBitmap); memDC.SelectObject(wxNullBitmap);
} }
else else
{ {
bitmap = tool->GetBitmap1(); bitmap = tool->GetNormalBitmap();
if (m_windowStyle & wxTB_3DBUTTONS) if (m_windowStyle & wxTB_3DBUTTONS)
{ {

4
src/msw/tbar95.cpp
View File

@@ -448,12 +448,12 @@ bool wxToolBar::Realize()
wxToolBarToolBase *tool = node->GetData(); wxToolBarToolBase *tool = node->GetData();
if ( tool->IsButton() ) if ( tool->IsButton() )
{ {
const wxBitmap& bmp = tool->GetBitmap1(); const wxBitmap& bmp = tool->GetNormalBitmap();
if ( bmp.Ok() ) if ( bmp.Ok() )
{ {
#if USE_BITMAP_MASKS #if USE_BITMAP_MASKS
// notice the last parameter: do use mask // notice the last parameter: do use mask
dcAllButtons.DrawBitmap(tool->GetBitmap1(), x, 0, TRUE); dcAllButtons.DrawBitmap(bmp, x, 0, TRUE);
#else // !USE_BITMAP_MASKS #else // !USE_BITMAP_MASKS
HBITMAP hbmp = GetHbitmapOf(bmp); HBITMAP hbmp = GetHbitmapOf(bmp);
HBITMAP oldBitmap2 = (HBITMAP)::SelectObject(memoryDC2, hbmp); HBITMAP oldBitmap2 = (HBITMAP)::SelectObject(memoryDC2, hbmp);