Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42783 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2006-10-30 22:42:34 +00:00
parent 27e6d74649
commit c16db850cd
6 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/dfb/dc.h
View File

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

4
src/dfb/dc.cpp
View File

@@ -53,10 +53,10 @@ wxDC::wxDC()
wxDC::wxDC(const wxIDirectFBSurfacePtr& surface) 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); m_ok = (surface != NULL);
wxCHECK_RET( surface != NULL, _T("invalid surface") ); wxCHECK_RET( surface != NULL, _T("invalid surface") );

2
src/dfb/dcclient.cpp
View File

@@ -179,7 +179,7 @@ void wxWindowDC::InitForWin(wxWindow *win, const wxRect *rect)
r.x, r.y, r.GetRight(), r.GetBottom(), r.x, r.y, r.GetRight(), r.GetBottom(),
origin.x, origin.y); origin.x, origin.y);
Init(surface); DFBInit(surface);
SetFont(win->GetFont()); SetFont(win->GetFont());
// offset coordinates to account for subsurface's origin coordinates: // offset coordinates to account for subsurface's origin coordinates:

2
src/dfb/dcmemory.cpp
View File

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

2
src/dfb/dcscreen.cpp
View File

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

2
src/dfb/overlay.cpp
View File

@@ -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. // 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 // Setting m_shouldFlip is done to avoid flipping and drawing of overlays
// in ~wxWindowDC (we do it EndDrawing). // in ~wxWindowDC (we do it EndDrawing).
dc->Init(m_surface); dc->DFBInit(m_surface);
dc->SetDeviceOrigin(-origin.x, -origin.y); dc->SetDeviceOrigin(-origin.x, -origin.y);
dc->m_shouldFlip = false; dc->m_shouldFlip = false;