1. added wxNcPaintEvent and generate it under GTK/use under wxUniv

2. minor fixes to wxCheck/Radio/wxCheckList/Box appearance - now seems fine


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/wxUNIVERSAL@8368 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2000-09-15 14:35:31 +00:00
parent 07e9834fca
commit ebd161b6c8
12 changed files with 71 additions and 10 deletions

View File

@@ -59,6 +59,7 @@ BEGIN_EVENT_TABLE(wxWindow, wxWindowNative)
EVT_SIZE(wxWindow::OnSize)
EVT_PAINT(wxWindow::OnPaint)
EVT_NC_PAINT(wxWindow::OnNcPaint)
EVT_ERASE_BACKGROUND(wxWindow::OnErase)
END_EVENT_TABLE()
@@ -168,7 +169,20 @@ void wxWindow::OnErase(wxEraseEvent& event)
}
}
// the event handler executed when the window must be repainted
// the event handlers executed when the window must be repainted
void wxWindow::OnNcPaint(wxPaintEvent& event)
{
if ( m_renderer )
{
// get the DC to use and create renderer on it
wxWindowDC dc(this);
wxControlRenderer renderer(this, dc, m_renderer);
// draw the border
DoDrawBorder(&renderer);
}
}
void wxWindow::OnPaint(wxPaintEvent& event)
{
if ( !m_renderer )
@@ -182,10 +196,7 @@ void wxWindow::OnPaint(wxPaintEvent& event)
wxPaintDC dc(this);
wxControlRenderer renderer(this, dc, m_renderer);
// first, draw the border
DoDrawBorder(&renderer);
// and then draw the control
// draw the control
DoDraw(&renderer);
}
}