check that the version of __sync_sub_and_fetch that returns a value is supported...

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

diff --git a/src/dfb/overlay.cpp b/src/dfb/overlay.cpp
index 740b3c169b2295b1deb9a0e95f119278c1794c54..80ee371efecb660ffbf3c2c3fa2d8ef1babbbdba 100644 (file)
--- a/src/dfb/overlay.cpp
+++ b/src/dfb/overlay.cpp
@@ -23,6 +23,11 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#ifndef WX_PRECOMP
+    #include "wx/window.h"
+    #include "wx/dcclient.h"
+#endif
+

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


@@ -57,7 +62,8 @@ void wxOverlayImpl::Init(wxWindowDC *dc, int x, int y, int width, int height)
     m_window = dc->GetWindow();
 
     m_rect = wxRect(x, y, width, height);
     m_window = dc->GetWindow();
 
     m_rect = wxRect(x, y, width, height);

-    m_rect.Offset(m_window->GetClientAreaOrigin());
+    if ( wxDynamicCast(dc, wxClientDC) )
+        m_rect.Offset(m_window->GetClientAreaOrigin());

 
     // FIXME: create surface with transparency or key color (?)
     m_surface =
 
     // FIXME: create surface with transparency or key color (?)
     m_surface =


@@ -72,13 +78,15 @@ void wxOverlayImpl::Init(wxWindowDC *dc, int x, int y, int width, int height)
 
 void wxOverlayImpl::BeginDrawing(wxWindowDC *dc)
 {
 
 void wxOverlayImpl::BeginDrawing(wxWindowDC *dc)
 {

-    wxPoint origin(m_rect.GetPosition() - m_window->GetClientAreaOrigin());
+    wxPoint origin(m_rect.GetPosition());
+    if ( wxDynamicCast(dc, wxClientDC) )
+        origin -= m_window->GetClientAreaOrigin();

 
     // drawing on overlay "hijacks" existing wxWindowDC rather then using
     // another DC, so we have to change the DC to draw on the overlay's surface.
     // Setting m_shouldFlip is done to avoid flipping and drawing of overlays
     // in ~wxWindowDC (we do it EndDrawing).
 
     // drawing on overlay "hijacks" existing wxWindowDC rather then using
     // another DC, so we have to change the DC to draw on the overlay's surface.
     // Setting m_shouldFlip is done to avoid flipping and drawing of overlays
     // in ~wxWindowDC (we do it EndDrawing).

-    dc->Init(m_surface);
+    dc->DFBInit(m_surface);

     dc->SetDeviceOrigin(-origin.x, -origin.y);
     dc->m_shouldFlip = false;
 
     dc->SetDeviceOrigin(-origin.x, -origin.y);
     dc->m_shouldFlip = false;
 


@@ -93,7 +101,7 @@ void wxOverlayImpl::EndDrawing(wxWindowDC *dc)
 void wxOverlayImpl::Clear(wxWindowDC *dc)
 {
     wxASSERT_MSG( IsOk(),
 void wxOverlayImpl::Clear(wxWindowDC *dc)
 {
     wxASSERT_MSG( IsOk(),

-                  _T("You cannot Clear an overlay that is not initialized") );
+                  "You cannot Clear an overlay that is not initialized" );

 
     m_isEmpty = true;
 }
 
     m_isEmpty = true;
 }