compilation fixes after adding wxMemoryDCBase::Init(): renamed wxDC::Init() in wxDFB to DFBInit()

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42783 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

include/wx/dfb/dc.h

@@ -117,7 +117,7 @@ public:
 protected:
     // initializes the DC from a surface, must be called if default ctor
     // was used
-    void Init(const wxIDirectFBSurfacePtr& surface);
+    void DFBInit(const wxIDirectFBSurfacePtr& surface);
 
     virtual bool DoFloodFill(wxCoord x, wxCoord y, const wxColour& col,
                              int style = wxFLOOD_SURFACE);

src/dfb/dc.cpp

@@ -53,10 +53,10 @@ wxDC::wxDC()
 
 wxDC::wxDC(const wxIDirectFBSurfacePtr& surface)
 {
-    Init(surface);
+    DFBInit(surface);
 }
 
-void wxDC::Init(const wxIDirectFBSurfacePtr& surface)
+void wxDC::DFBInit(const wxIDirectFBSurfacePtr& surface)
 {
     m_ok = (surface != NULL);
     wxCHECK_RET( surface != NULL, _T("invalid surface") );

src/dfb/dcclient.cpp

@@ -179,7 +179,7 @@ void wxWindowDC::InitForWin(wxWindow *win, const wxRect *rect)
                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:

src/dfb/dcmemory.cpp

@@ -59,5 +59,5 @@ void wxMemoryDC::DoSelect(const wxBitmap& bitmap)
     }
 
     // init the DC for drawing to this bitmap
-    Init(bitmap.GetDirectFBSurface());
+    DFBInit(bitmap.GetDirectFBSurface());
 }

src/dfb/dcscreen.cpp

@@ -38,7 +38,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxScreenDC, wxDC)
 
 wxScreenDC::wxScreenDC()
 {
-    Init(wxIDirectFB::Get()->GetPrimarySurface());
+    DFBInit(wxIDirectFB::Get()->GetPrimarySurface());
 }
 
 #warning "FIXME: does wxScreenDC need Flip call in dtor?"

src/dfb/overlay.cpp

@@ -78,7 +78,7 @@ void wxOverlayImpl::BeginDrawing(wxWindowDC *dc)
     // 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;