#ifndef WX_PRECOMP
#include "wx/window.h"
+ #include "wx/nonownedwnd.h"
#endif
#include "wx/dfb/private.h"
-#define TRACE_PAINT _T("paint")
+#define TRACE_PAINT "paint"
// ===========================================================================
// implementation
// coordinates; this will remove parts of 'r' that are outside of the
// parent's area:
wxRect rp(GetUncoveredWindowArea(parent));
+
+ // normal windows cannot extend out of its parent's client area:
+ if ( !win->CanBeOutsideClientArea() )
+ rp.Intersect(parent->GetClientRect());
+
rp.Offset(-win->GetPosition());
rp.Offset(-parent->GetClientAreaOrigin());
r.Intersect(rp);
static
wxIDirectFBSurfacePtr CreateDummySurface(wxWindow *win, const wxRect *rect)
{
- wxLogTrace(TRACE_PAINT, _T("%p ('%s'): creating dummy DC surface"),
+ wxLogTrace(TRACE_PAINT, "%p ('%s'): creating dummy DC surface",
win, win->GetName().c_str());
wxSize size(rect ? rect->GetSize() : win->GetSize());
+
+ // we can't create a surface of 0 size but the size of the window may be 0,
+ // so ensure that we have at least a single pixel to draw on
+ size.IncTo(wxSize(1, 1));
+
return win->GetDfbSurface()->CreateCompatible
(
size,
void wxWindowDC::InitForWin(wxWindow *win, const wxRect *rect)
{
- wxCHECK_RET( win, _T("invalid window") );
+ wxCHECK_RET( win, "invalid window" );
+
+ m_win = win;
// obtain the surface used for painting:
wxPoint origin;
if ( win->GetTLW()->IsPainting() && !updateRegion.IsEmpty() )
{
r.Intersect(updateRegion.AsRect());
- wxCHECK_RET( !r.IsEmpty(), _T("invalid painting rectangle") );
+ wxCHECK_RET( !r.IsEmpty(), "invalid painting rectangle" );
// parent TLW will flip the entire surface when painting is done
m_shouldFlip = false;
}
else
{
+ m_winRect = r;
DFBRectangle dfbrect = { r.x, r.y, r.width, r.height };
surface = win->GetDfbSurface()->GetSubSurface(&dfbrect);
return;
wxLogTrace(TRACE_PAINT,
- _T("%p ('%s'): creating DC for area [%i,%i,%i,%i], clipped to [%i,%i,%i,%i], origin [%i,%i]"),
+ "%p ('%s'): creating DC for area [%i,%i,%i,%i], clipped to [%i,%i,%i,%i], origin [%i,%i]",
win, win->GetName().c_str(),
rectOrig.x, rectOrig.y, rectOrig.GetRight(), rectOrig.GetBottom(),
r.x, r.y, r.GetRight(), r.GetBottom(),
origin.x, origin.y);
- Init(surface);
+ DFBInit(surface);
SetFont(win->GetFont());
// offset coordinates to account for subsurface's origin coordinates:
if ( m_shouldFlip )
{
+ // paint overlays on top of the surface being drawn to by this DC
+ // before showing anything on the screen:
+ m_win->PaintOverlays(m_winRect);
+
DFBSurfaceCapabilities caps = DSCAPS_NONE;
surface->GetCapabilities(&caps);
if ( caps & DSCAPS_DOUBLE )
wxClientDC::wxClientDC(wxWindow *win)
{
- wxCHECK_RET( win, _T("invalid window") );
+ wxCHECK_RET( win, "invalid window" );
wxRect rect = win->GetClientRect();
InitForWin(win, &rect);