projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use shared pointers throughout when managing history with the ie backend, simplifying...
[wxWidgets.git]
/
src
/
dfb
/
dcmemory.cpp
diff --git
a/src/dfb/dcmemory.cpp
b/src/dfb/dcmemory.cpp
index eb83b923d3672fb822e7c051632cb457fd90cab4..5c777710591294e0badaa1448005951e69cb9220 100644
(file)
--- a/
src/dfb/dcmemory.cpp
+++ b/
src/dfb/dcmemory.cpp
@@
-1,6
+1,6
@@
/////////////////////////////////////////////////////////////////////////////
// Name: src/dfb/dcmemory.cpp
/////////////////////////////////////////////////////////////////////////////
// Name: src/dfb/dcmemory.cpp
-// Purpose: wxMemoryDC implementation
+// Purpose: wxMemoryDC
Impl
implementation
// Author: Vaclav Slavik
// Created: 2006-08-16
// RCS-ID: $Id$
// Author: Vaclav Slavik
// Created: 2006-08-16
// RCS-ID: $Id$
@@
-19,12
+19,12
@@
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
-#include "wx/dcmemory.h"
-
#ifndef WX_PRECOMP
#include "wx/bitmap.h"
#endif
#ifndef WX_PRECOMP
#include "wx/bitmap.h"
#endif
+#include "wx/dcmemory.h"
+#include "wx/dfb/dcmemory.h"
#include "wx/dfb/private.h"
// ===========================================================================
#include "wx/dfb/private.h"
// ===========================================================================
@@
-32,22
+32,36
@@
// ===========================================================================
//-----------------------------------------------------------------------------
// ===========================================================================
//-----------------------------------------------------------------------------
-// wxMemoryDC
+// wxMemoryDC
Impl
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
-#warning "FIXME: verify/fix that wxMemoryDC works correctly with mono bitmaps"
+#warning "FIXME: verify/fix that wxMemoryDC
Impl
works correctly with mono bitmaps"
-IMPLEMENT_DYNAMIC_CLASS(wxMemoryDC, wxDC)
+IMPLEMENT_ABSTRACT_CLASS(wxMemoryDCImpl, wxDFBDCImpl)
+
+void wxMemoryDCImpl::Init()
+{
+}
+
+wxMemoryDCImpl::wxMemoryDCImpl(wxMemoryDC *owner)
+ : wxDFBDCImpl(owner)
+{
+ Init();
+}
-void wxMemoryDC::Init()
+wxMemoryDCImpl::wxMemoryDCImpl(wxMemoryDC *owner, wxBitmap& bitmap)
+ : wxDFBDCImpl(owner)
{
{
+ Init();
+ DoSelect(bitmap);
}
}
-wxMemoryDC::wxMemoryDC(wxDC *WXUNUSED(dc))
+wxMemoryDCImpl::wxMemoryDCImpl(wxMemoryDC *owner, wxDC *WXUNUSED(dc))
+ : wxDFBDCImpl(owner)
{
}
{
}
-void wxMemoryDC::DoSelect(const wxBitmap& bitmap)
+void wxMemoryDC
Impl
::DoSelect(const wxBitmap& bitmap)
{
m_bmp = bitmap;
{
m_bmp = bitmap;
@@
-59,5
+73,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());
+
DFB
Init(bitmap.GetDirectFBSurface());
}
}