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

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

diff --git a/include/wx/dfb/dc.h b/include/wx/dfb/dc.h
index 686bbea2a2ce4e20759e21ec7e7c45726e1f97d0..b5cfff51d9c27cf8983c42d479413f14e4d5e61c 100644 (file)
--- a/include/wx/dfb/dc.h
+++ b/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);

diff --git a/src/dfb/dc.cpp b/src/dfb/dc.cpp
index 60b3782b9275015f480aef7620e1b718f8dfaffc..d8d9176e836d8e73cf6828a4c83bbe93f1fee12d 100644 (file)
--- a/src/dfb/dc.cpp
+++ b/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") );

diff --git a/src/dfb/dcclient.cpp b/src/dfb/dcclient.cpp
index 149067554f243c5079c3467379e86caa07302897..1045b6305eca8100159593f950b453308a4792ec 100644 (file)
--- a/src/dfb/dcclient.cpp
+++ b/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:

diff --git a/src/dfb/dcmemory.cpp b/src/dfb/dcmemory.cpp
index eb83b923d3672fb822e7c051632cb457fd90cab4..5ab26cb37f844ac3105b34effb26e99566f35217 100644 (file)
--- a/src/dfb/dcmemory.cpp
+++ b/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());
 }

diff --git a/src/dfb/dcscreen.cpp b/src/dfb/dcscreen.cpp
index 4d9ba71e76cecfc08babf676500b30d1d7602d7a..114f30ba0b4942011521e1e49202445f0788f113 100644 (file)
--- a/src/dfb/dcscreen.cpp
+++ b/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?"

diff --git a/src/dfb/overlay.cpp b/src/dfb/overlay.cpp
index 740b3c169b2295b1deb9a0e95f119278c1794c54..64ae7eff539575eb5d5283ac12dd1ee49a047288 100644 (file)
--- a/src/dfb/overlay.cpp
+++ b/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;