Use the data scheme to load resources in the WebKitGTK+ implementation, rather than...

[wxWidgets.git] / src / dfb / dcclient.cpp

diff --git a/src/dfb/dcclient.cpp b/src/dfb/dcclient.cpp
index 149067554f243c5079c3467379e86caa07302897..2a13ea7e2b1f07f51b9a297d4ea89106bd237eaa 100644 (file)
--- a/src/dfb/dcclient.cpp
+++ b/src/dfb/dcclient.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        src/dfb/dcclient.cpp
 /////////////////////////////////////////////////////////////////////////////
 // Name:        src/dfb/dcclient.cpp

-// Purpose:     wxWindowDC, wxClientDC and wxPaintDC
+// Purpose:     wxWindowDCImpl, wxClientDCImpl and wxPaintDC

 // Author:      Vaclav Slavik
 // Created:     2006-08-10
 // RCS-ID:      $Id$
 // Author:      Vaclav Slavik
 // Created:     2006-08-10
 // RCS-ID:      $Id$


@@ -23,15 +23,15 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

-#include "wx/dcclient.h"
-

 #ifndef WX_PRECOMP
     #include "wx/window.h"
 #ifndef WX_PRECOMP
     #include "wx/window.h"

+    #include "wx/nonownedwnd.h"

 #endif
 
 #endif
 

+#include "wx/dfb/dcclient.h"

 #include "wx/dfb/private.h"
 
 #include "wx/dfb/private.h"
 

-#define TRACE_PAINT  _T("paint")
+#define TRACE_PAINT  "paint"

 
 // ===========================================================================
 // implementation
 
 // ===========================================================================
 // implementation


@@ -58,6 +58,11 @@ static wxRect GetUncoveredWindowArea(wxWindow *win)
     // coordinates; this will remove parts of 'r' that are outside of the
     // parent's area:
     wxRect rp(GetUncoveredWindowArea(parent));
     // 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);
     rp.Offset(-win->GetPosition());
     rp.Offset(-parent->GetClientAreaOrigin());
     r.Intersect(rp);


@@ -71,9 +76,14 @@ static wxRect GetUncoveredWindowArea(wxWindow *win)
 static
 wxIDirectFBSurfacePtr CreateDummySurface(wxWindow *win, const wxRect *rect)
 {
 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());
                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,
     return win->GetDfbSurface()->CreateCompatible
            (
              size,


@@ -82,21 +92,22 @@ wxIDirectFBSurfacePtr CreateDummySurface(wxWindow *win, const wxRect *rect)
 }
 
 //-----------------------------------------------------------------------------
 }
 
 //-----------------------------------------------------------------------------

-// wxWindowDC
+// wxWindowDCImpl

 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 

-IMPLEMENT_DYNAMIC_CLASS(wxWindowDC, wxDC)
+IMPLEMENT_ABSTRACT_CLASS(wxWindowDCImpl, wxDFBDCImpl)

 
 

-wxWindowDC::wxWindowDC(wxWindow *win)
+wxWindowDCImpl::wxWindowDCImpl(wxDC *owner, wxWindow *win)
+              : wxDFBDCImpl(owner)

 {
     InitForWin(win, NULL);
 }
 
 {
     InitForWin(win, NULL);
 }
 

-void wxWindowDC::InitForWin(wxWindow *win, const wxRect *rect)
+void wxWindowDCImpl::InitForWin(wxWindow *win, const wxRect *rect)

 {
 {

-    wxCHECK_RET( win, _T("invalid window") );
+    wxCHECK_RET( win, "invalid window" );

 
 

-    m_win = win;
+    m_window = win;

 
     // obtain the surface used for painting:
     wxPoint origin;
 
     // obtain the surface used for painting:
     wxPoint origin;


@@ -120,7 +131,7 @@ void wxWindowDC::InitForWin(wxWindow *win, const wxRect *rect)
         if ( win->GetTLW()->IsPainting() && !updateRegion.IsEmpty() )
         {
             r.Intersect(updateRegion.AsRect());
         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;
 
             // parent TLW will flip the entire surface when painting is done
             m_shouldFlip = false;


@@ -173,20 +184,20 @@ void wxWindowDC::InitForWin(wxWindow *win, const wxRect *rect)
         return;
 
     wxLogTrace(TRACE_PAINT,
         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);
 
                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:
     SetDeviceOrigin(origin.x, origin.y);
 }
 
     SetFont(win->GetFont());
 
     // offset coordinates to account for subsurface's origin coordinates:
     SetDeviceOrigin(origin.x, origin.y);
 }
 

-wxWindowDC::~wxWindowDC()
+wxWindowDCImpl::~wxWindowDCImpl()

 {
     wxIDirectFBSurfacePtr surface(GetDirectFBSurface());
     if ( !surface )
 {
     wxIDirectFBSurfacePtr surface(GetDirectFBSurface());
     if ( !surface )


@@ -200,7 +211,7 @@ wxWindowDC::~wxWindowDC()
     {
         // paint overlays on top of the surface being drawn to by this DC
         // before showing anything on the screen:
     {
         // paint overlays on top of the surface being drawn to by this DC
         // before showing anything on the screen:

-        m_win->PaintOverlays(m_winRect);
+        GetWindow()->PaintOverlays(m_winRect);

 
         DFBSurfaceCapabilities caps = DSCAPS_NONE;
         surface->GetCapabilities(&caps);
 
         DFBSurfaceCapabilities caps = DSCAPS_NONE;
         surface->GetCapabilities(&caps);


@@ -216,14 +227,15 @@ wxWindowDC::~wxWindowDC()
 }
 
 //-----------------------------------------------------------------------------
 }
 
 //-----------------------------------------------------------------------------

-// wxClientDC
+// wxClientDCImpl

 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 

-IMPLEMENT_DYNAMIC_CLASS(wxClientDC, wxWindowDC)
+IMPLEMENT_ABSTRACT_CLASS(wxClientDCImpl, wxWindowDCImpl)

 
 

-wxClientDC::wxClientDC(wxWindow *win)
+wxClientDCImpl::wxClientDCImpl(wxDC *owner, wxWindow *win)
+              : wxWindowDCImpl(owner, win)

 {
 {

-    wxCHECK_RET( win, _T("invalid window") );
+    wxCHECK_RET( win, "invalid window" );

 
     wxRect rect = win->GetClientRect();
     InitForWin(win, &rect);
 
     wxRect rect = win->GetClientRect();
     InitForWin(win, &rect);


@@ -233,4 +245,4 @@ wxClientDC::wxClientDC(wxWindow *win)
 // wxPaintDC
 //-----------------------------------------------------------------------------
 
 // wxPaintDC
 //-----------------------------------------------------------------------------
 

-IMPLEMENT_DYNAMIC_CLASS(wxPaintDC, wxWindowDC)
+IMPLEMENT_ABSTRACT_CLASS(wxPaintDCImpl, wxWindowDCImpl)