1. clip the DC from wxEraseEvent under GTK - now redrawing works there too

2. added wxColourScheme::GetBackground() - still testing
3. implemented (but it is slightly broken) extended listbox interface


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/wxUNIVERSAL@8278 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2000-09-06 22:12:27 +00:00
parent d0b9653f6c
commit e90a2986c7
18 changed files with 360 additions and 113 deletions

View File

@@ -38,7 +38,9 @@
#include "wx/image.h"
#include "wx/univ/theme.h"
#include "wx/univ/renderer.h"
#include "wx/univ/colschem.h"
// ============================================================================
// implementation
@@ -376,13 +378,7 @@ void wxControlRenderer::DrawButtonBorder()
m_renderer->DrawButtonBorder(m_dc, m_rect, flags, &m_rect);
wxColour colBg;
if ( !(flags & wxCONTROL_CURRENT) )
{
colBg = m_window->GetBackgroundColour();
}
m_renderer->DrawBackground(m_dc, colBg, m_rect, flags);
m_renderer->DrawBackground(m_dc, wxTHEME_BG_COLOUR(m_window), m_rect, flags);
}
void wxControlRenderer::DrawBitmap(const wxBitmap& bitmap)
@@ -405,7 +401,7 @@ void wxControlRenderer::DrawBackgroundBitmap()
}
else // just fill it with bg colour if no bitmap
{
m_renderer->DrawBackground(m_dc, m_window->GetBackgroundColour(),
m_renderer->DrawBackground(m_dc, wxTHEME_BG_COLOUR(m_window),
m_rect, m_window->GetStateFlags());
}
}