Remove several hack from PS code, use high resolution code from GNOME print, invert...

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

diff --git a/src/dfb/overlay.cpp b/src/dfb/overlay.cpp
index 64ae7eff539575eb5d5283ac12dd1ee49a047288..80ee371efecb660ffbf3c2c3fa2d8ef1babbbdba 100644 (file)
--- a/src/dfb/overlay.cpp
+++ b/src/dfb/overlay.cpp
@@ -23,6 +23,11 @@
     #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"
 
@@ -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_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 =
@@ -72,7 +78,9 @@ void wxOverlayImpl::Init(wxWindowDC *dc, int x, int y, int width, int height)
 
 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.
@@ -93,7 +101,7 @@ void wxOverlayImpl::EndDrawing(wxWindowDC *dc)
 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;
 }