Merge in from trunk r64802 - r68625

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

diff --git a/src/dfb/overlay.cpp b/src/dfb/overlay.cpp
index f5f367de7f65cab91f7d8b941b10fcf30bfd1e4a..cee282298ac87e6b51f65c0ce9a4efece5f809af 100644 (file)
--- a/src/dfb/overlay.cpp
+++ b/src/dfb/overlay.cpp
@@ -56,7 +56,7 @@ bool wxOverlayImpl::IsOk()
     return m_window != NULL;
 }
 
-void wxOverlayImpl::Init(wxWindowDC *dc, int x, int y, int width, int height)
+void wxOverlayImpl::Init(wxDC *dc, int x, int y, int width, int height)
 {
     wxCHECK_RET( dc, "NULL dc pointer" );
     wxASSERT_MSG( !IsOk() , _("You cannot Init an overlay twice") );
@@ -80,7 +80,7 @@ void wxOverlayImpl::Init(wxWindowDC *dc, int x, int y, int width, int height)
     m_window->AddOverlay(this);
 }
 
-void wxOverlayImpl::BeginDrawing(wxWindowDC *dc)
+void wxOverlayImpl::BeginDrawing(wxDC *dc)
 {
     wxCHECK_RET( dc, "NULL dc pointer" );
 
@@ -102,12 +102,12 @@ void wxOverlayImpl::BeginDrawing(wxWindowDC *dc)
     m_isEmpty = false;
 }
 
-void wxOverlayImpl::EndDrawing(wxWindowDC *WXUNUSED(dc))
+void wxOverlayImpl::EndDrawing(wxDC *WXUNUSED(dc))
 {
     m_window->RefreshWindowRect(m_rect);
 }
 
-void wxOverlayImpl::Clear(wxWindowDC *WXUNUSED(dc))
+void wxOverlayImpl::Clear(wxDC *WXUNUSED(dc))
 {
     wxASSERT_MSG( IsOk(),
                   "You cannot Clear an overlay that is not initialized" );